-
Notifications
You must be signed in to change notification settings - Fork 9.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/2.4-develop' into storefront-2.4
- Loading branch information
Showing
113 changed files
with
4,395 additions
and
1,170 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
22 changes: 22 additions & 0 deletions
22
...gento/Bundle/Test/Mftf/ActionGroup/AssertStorefrontBundleValidationMessageActionGroup.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!-- | ||
| /** | ||
| * Copyright © Magento, Inc. All rights reserved. | ||
| * See COPYING.txt for license details. | ||
| */ | ||
| --> | ||
|
|
||
| <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd"> | ||
| <actionGroup name="AssertStorefrontBundleValidationMessageActionGroup"> | ||
| <annotations> | ||
| <description>Check error message in validation message box</description> | ||
| </annotations> | ||
| <arguments> | ||
| <argument name="message" type="string"/> | ||
| </arguments> | ||
|
|
||
| <waitForPageLoad stepKey="waitForPageLoad"/> | ||
| <see selector="{{StorefrontBundledSection.validationMessageBox}}" userInput="{{message}}" stepKey="seeErrorHoldMessage"/> | ||
| </actionGroup> | ||
| </actionGroups> |
20 changes: 20 additions & 0 deletions
20
...Bundle/Test/Mftf/ActionGroup/AssertStorefrontBundleValidationMessagesCountActionGroup.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!-- | ||
| /** | ||
| * Copyright © Magento, Inc. All rights reserved. | ||
| * See COPYING.txt for license details. | ||
| */ | ||
| --> | ||
|
|
||
| <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd"> | ||
| <actionGroup name="AssertStorefrontBundleValidationMessagesCountActionGroup"> | ||
| <annotations> | ||
| <description>Check if there's a validation message box on page and asserts the validation messages number</description> | ||
| </annotations> | ||
|
|
||
| <waitForPageLoad stepKey="waitForPageLoad"/> | ||
| <seeElement selector="{{StorefrontBundledSection.validationMessageBox}}" stepKey="seeErrorBox"/> | ||
| <seeNumberOfElements selector="{{StorefrontBundledSection.validationMessageBox}}" userInput="1" stepKey="seeOneErrorBox"/> | ||
| </actionGroup> | ||
| </actionGroups> |
20 changes: 20 additions & 0 deletions
20
app/code/Magento/Bundle/Test/Mftf/ActionGroup/StorefrontAddToTheCartButtonActionGroup.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!-- | ||
| /** | ||
| * Copyright © Magento, Inc. All rights reserved. | ||
| * See COPYING.txt for license details. | ||
| */ | ||
| --> | ||
|
|
||
| <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd"> | ||
| <actionGroup name="StorefrontAddToTheCartButtonActionGroup"> | ||
| <annotations> | ||
| <description>Clicks 'Add to Cart' on a Storefront Bundled Product page.</description> | ||
| </annotations> | ||
|
|
||
| <waitForPageLoad stepKey="waitForPageLoad"/> | ||
| <waitForElementVisible selector="{{StorefrontBundleProductActionSection.addToCartButton}}" stepKey="waitForAddToCartButton"/> | ||
| <click selector="{{StorefrontBundleProductActionSection.addToCartButton}}" stepKey="clickOnAddToCartButton"/> | ||
| </actionGroup> | ||
| </actionGroups> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
57 changes: 57 additions & 0 deletions
57
app/code/Magento/Bundle/Test/Mftf/Test/StorefrontBundleCheckBoxOptionValidationTest.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!-- | ||
| /** | ||
| * Copyright © Magento, Inc. All rights reserved. | ||
| * See COPYING.txt for license details. | ||
| */ | ||
| --> | ||
|
|
||
| <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd"> | ||
| <test name="StorefrontBundleCheckBoxOptionValidationTest"> | ||
| <annotations> | ||
| <features value="Bundle"/> | ||
| <stories value="Bundle product validation before add to cart"/> | ||
| <title value="Customer should be able to see only one validation message for checkbox option group"/> | ||
| <description value="Customer should be able to see only one validation message for checkbox option group"/> | ||
| <testCaseId value="MC-35133"/> | ||
| <severity value="MINOR"/> | ||
| <group value="Bundle"/> | ||
| </annotations> | ||
| <before> | ||
| <createData entity="ApiProductWithDescription" stepKey="simpleProduct1" before="bundleProduct"/> | ||
| <createData entity="ApiProductWithDescription" stepKey="simpleProduct2" after="simpleProduct1"/> | ||
| <createData entity="ApiBundleProduct" stepKey="bundleProduct"/> | ||
| <createData entity="CheckboxOption" stepKey="checkboxBundleOption"> | ||
| <requiredEntity createDataKey="bundleProduct"/> | ||
| </createData> | ||
| <createData entity="ApiBundleLink" stepKey="createBundleLink1"> | ||
| <requiredEntity createDataKey="bundleProduct"/> | ||
| <requiredEntity createDataKey="checkboxBundleOption"/> | ||
| <requiredEntity createDataKey="simpleProduct1"/> | ||
| <field key="qty">2</field> | ||
| </createData> | ||
| <createData entity="ApiBundleLink" stepKey="createBundleLink2"> | ||
| <requiredEntity createDataKey="bundleProduct"/> | ||
| <requiredEntity createDataKey="checkboxBundleOption"/> | ||
| <requiredEntity createDataKey="simpleProduct2"/> | ||
| <field key="qty">4</field> | ||
| </createData> | ||
| <magentoCron stepKey="runCronIndex" groups="index"/> | ||
| </before> | ||
| <after> | ||
| <deleteData createDataKey="bundleProduct" stepKey="deleteBundleProduct"/> | ||
| <deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/> | ||
| <deleteData createDataKey="simpleProduct2" stepKey="deleteSimpleProduct2"/> | ||
| </after> | ||
| <actionGroup ref="StorefrontOpenProductPageActionGroup" stepKey="openProductStorefront"> | ||
| <argument name="productUrl" value="$$bundleProduct.custom_attributes[url_key]$$"/> | ||
| </actionGroup> | ||
| <actionGroup ref="StorefrontSelectCustomizeAndAddToTheCartButtonActionGroup" stepKey="customizeBundleProduct"/> | ||
| <actionGroup ref="StorefrontAddToTheCartButtonActionGroup" stepKey="addToCartBundleProduct"/> | ||
| <actionGroup ref="AssertStorefrontBundleValidationMessagesCountActionGroup" stepKey="assertBundleValidationCount"/> | ||
| <actionGroup ref="AssertStorefrontBundleValidationMessageActionGroup" stepKey="assertBundleValidationMessage"> | ||
| <argument name="message" value="Please select one of the options."/> | ||
| </actionGroup> | ||
| </test> | ||
| </tests> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
57 changes: 0 additions & 57 deletions
57
app/code/Magento/Catalog/Model/Product/SalabilityChecker.php
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
20 changes: 20 additions & 0 deletions
20
app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminChangeCategoryNameActionGroup.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!-- | ||
| /** | ||
| * Copyright © Magento, Inc. All rights reserved. | ||
| * See COPYING.txt for license details. | ||
| */ | ||
| --> | ||
|
|
||
| <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd"> | ||
| <actionGroup name="AdminChangeCategoryNameActionGroup"> | ||
| <annotations> | ||
| <description>Switch the Storefront to the provided Store.</description> | ||
| </annotations> | ||
| <arguments> | ||
| <argument name="categoryName" type="string" defaultValue="{{_defaultCategory.name}}"/> | ||
| </arguments> | ||
| <fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{categoryName}}" stepKey="updateCategoryName"/> | ||
| </actionGroup> | ||
| </actionGroups> |
23 changes: 23 additions & 0 deletions
23
...ento/Catalog/Test/Mftf/ActionGroup/AdminChangeCategoryNameOnStoreViewLevelActionGroup.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!-- | ||
| /** | ||
| * Copyright © Magento, Inc. All rights reserved. | ||
| * See COPYING.txt for license details. | ||
| */ | ||
| --> | ||
|
|
||
| <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd"> | ||
| <actionGroup name="AdminChangeCategoryNameOnStoreViewLevelActionGroup"> | ||
| <annotations> | ||
| <description>Updates the Category Name for proper Store View.</description> | ||
| </annotations> | ||
| <arguments> | ||
| <argument name="categoryName" type="string"/> | ||
| </arguments> | ||
|
|
||
| <uncheckOption selector="{{AdminCategoryBasicFieldSection.categoryNameUseDefault}}" stepKey="uncheckUseDefaultValueENStoreView"/> | ||
| <fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{categoryName}}" stepKey="changeNameField"/> | ||
| <click selector="{{AdminCategorySEOSection.SectionHeader}}" stepKey="clickOnSectionHeader"/> | ||
| </actionGroup> | ||
| </actionGroups> |
Oops, something went wrong.