Skip to content

Commit 351a90c

Browse files
vzabaznovvzabaznov
committed
Merge remote-tracking branch 'dnyomo/storefront-issue_104_default_sort_order_b' into MC-35903
2 parents 0c6de1d + d0c5577 commit 351a90c

File tree

173 files changed

+2132
-790
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

173 files changed

+2132
-790
lines changed

‎app/code/Magento/Bundle/Test/Mftf/Test/AdminAddBundleItemsTest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
</actionGroup>
7171

7272
<!--Save the product-->
73-
<click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton"/>
73+
<actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickSaveButton"/>
7474
<see userInput="You saved the product." stepKey="messageYouSavedTheProductIsShown"/>
7575

7676
<!--Checking on admin side-->
@@ -117,7 +117,7 @@
117117
<fillField selector="{{AdminProductFormBundleSection.bundleOptionXProductYQuantity('0', '3')}}" userInput="{{BundleProduct.defaultQuantity}}" stepKey="fillNewProductDefaultQty2"/>
118118

119119
<!--Save the product-->
120-
<click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButtonAgain"/>
120+
<actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickSaveButtonAgain"/>
121121
<see userInput="You saved the product." stepKey="messageYouSavedTheProductIsShownAgain"/>
122122

123123
<!--Checking on admin side-->

‎app/code/Magento/Bundle/Test/Mftf/Test/AdminAttributeSetSelectionTest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
<fillField selector="{{AdminProductFormBundleSection.productSku}}" userInput="{{BundleProduct.sku}}" stepKey="fillProductSku"/>
5050

5151
<!--save the product/published by default-->
52-
<click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton"/>
52+
<actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickSaveButton"/>
5353
<seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="messageYouSavedTheProductIsShown"/>
5454

5555
<!--Testing that price appears correctly in admin catalog-->
@@ -70,7 +70,7 @@
7070
<click selector="{{AdminProductFormSection.attributeSetFilterResult}}" stepKey="selectAttrSet2"/>
7171

7272
<!--save the product/published by default-->
73-
<click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton2"/>
73+
<actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickSaveButton2"/>
7474
<seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="messageYouSavedTheProductIsShown2"/>
7575

7676
<!--Testing that price appears correctly in admin catalog-->

‎app/code/Magento/Bundle/Test/Mftf/Test/AdminBasicBundleProductAttributesTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@
143143
<selectOption selector="{{AdminProductFormBundleSection.countryOfManufactureDropDown}}" userInput="France" stepKey="countryOfManufactureDropDown"/>
144144

145145
<!--Save the product-->
146-
<click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton"/>
146+
<actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickSaveButton"/>
147147
<seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="messageYouSavedTheProductIsShown"/>
148148

149149
<!--Verify form was filled out correctly after edit-->

‎app/code/Magento/Bundle/Test/Mftf/Test/AdminCreateAndEditBundleProductOptionsNegativeTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@
111111

112112
<!-- Save product form -->
113113
<actionGroup ref="SaveProductFormActionGroup" stepKey="clickSaveProduct"/>
114-
<click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveWithTwoOptions"/>
114+
<actionGroup ref="AdminProductFormSaveActionGroup" stepKey="saveWithTwoOptions"/>
115115
<seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="messageYouSavedTheProductIsShown"/>
116116

117117
<!-- Delete created bundle product -->

‎app/code/Magento/Bundle/Test/Mftf/Test/AdminDeleteABundleProductTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
<actionGroup ref="AncillaryPrepBundleProductActionGroup" stepKey="createBundledProductForTwoSimpleProducts"/>
5858

5959
<!--Save the product-->
60-
<click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton"/>
60+
<actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickSaveButton"/>
6161
<seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="messageYouSavedTheProductIsShown"/>
6262

6363
<!--Go to catalog deletion page-->

‎app/code/Magento/Bundle/Test/Mftf/Test/AdminEditRelatedBundleProductTest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
</actionGroup>
5252

5353
<!--Save the product-->
54-
<click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton"/>
54+
<actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickSaveButton"/>
5555
<see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the product." stepKey="messageYouSavedTheProductIsShown"/>
5656

5757
<actionGroup ref="AddRelatedProductBySkuActionGroup" stepKey="addRelatedProduct1">
@@ -62,7 +62,7 @@
6262
<click selector="{{AdminProductFormRelatedUpSellCrossSellSection.removeRelatedProduct($$simpleProduct0.sku$$)}}" stepKey="removeRelatedProduct"/>
6363

6464
<!--Save the product-->
65-
<click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButtonAfterEdit"/>
65+
<actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickSaveButtonAfterEdit"/>
6666
<see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the product." stepKey="messageYouSavedTheProductIsShownAgain"/>
6767

6868
<!--See related product in admin-->

‎app/code/Magento/Bundle/Test/Mftf/Test/AdminFilterProductListByBundleProductTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
<actionGroup ref="AncillaryPrepBundleProductActionGroup" stepKey="createBundledProductForTwoSimpleProducts"/>
5858

5959
<!--Save the product-->
60-
<click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton"/>
60+
<actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickSaveButton"/>
6161
<seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="messageYouSavedTheProductIsShown"/>
6262

6363
<!--Apply Bundle Product Filter-->

‎app/code/Magento/Bundle/Test/Mftf/Test/AdminMassDeleteBundleProductsTest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
</actionGroup>
6868

6969
<!--Save the product-->
70-
<click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton"/>
70+
<actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickSaveButton"/>
7171
<seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="messageYouSavedTheProductIsShown"/>
7272

7373
<!--Creating Second bundle product-->
@@ -107,7 +107,7 @@
107107
<fillField userInput="{{BundleProduct.urlKey2}}" selector="{{AdminProductFormBundleSection.urlKey}}" stepKey="FillsinSEOlinkExtension2"/>
108108

109109
<!--Save the product-->
110-
<click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton2"/>
110+
<actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickSaveButton2"/>
111111
<see userInput="You saved the product." stepKey="messageYouSavedTheProductIsShown2"/>
112112

113113
<!--Mass delete bundle products-->

‎app/code/Magento/Bundle/Test/Mftf/Test/AdminProductBundleCreationTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
</actionGroup>
6767

6868
<!--save the product/published by default-->
69-
<click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton"/>
69+
<actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickSaveButton"/>
7070
<seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="messageYouSavedTheProductIsShown"/>
7171

7272
<!-- go to page-->

‎app/code/Magento/Bundle/Test/Mftf/Test/BundleProductFixedPricingTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
<fillField userInput="{{BundleProduct.fixedPrice}}" selector="{{AdminProductFormBundleSection.priceField}}" stepKey="fillPrice"/>
7474

7575
<!--Save the product-->
76-
<click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton"/>
76+
<actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickSaveButton"/>
7777
<seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="messageYouSavedTheProductIsShown"/>
7878

7979
<!--Testing that price appears correctly in admin catalog-->

0 commit comments

Comments
 (0)