Skip to content

Commit fca39b5

Browse files
zakdmazakdma
committed
Merge remote-tracking branch 'origin/MC-33699-CE-1' into MC-33699
2 parents a38919a + c86ba9a commit fca39b5

File tree

525 files changed

+13244
-2667
lines changed

Some content is hidden

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

525 files changed

+13244
-2667
lines changed

‎app/code/Magento/AsynchronousOperations/composer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
},
77
"require": {
88
"magento/framework": "*",
9+
"magento/framework-message-queue": "*",
910
"magento/framework-bulk": "*",
1011
"magento/module-authorization": "*",
1112
"magento/module-backend": "*",

‎app/code/Magento/Backend/Test/Mftf/ActionGroup/AssertAdminSuccessLoginActionGroup.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,6 @@
1414
</annotations>
1515

1616
<waitForElementVisible selector="{{AdminHeaderSection.adminUserAccountText}}" stepKey="waitForAdminAccountTextVisible"/>
17+
<seeElement selector="{{AdminHeaderSection.adminUserAccountText}}" stepKey="assertAdminAccountTextElement"/>
1718
</actionGroup>
1819
</actionGroups>

‎app/code/Magento/Backup/Model/ResourceModel/View/CreateViewsBackup.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,6 @@ public function getViewHeader(string $viewName): string
111111
public function getDropViewSql(string $viewName): string
112112
{
113113
$quotedViewName = $this->getConnection()->quoteIdentifier($viewName);
114-
return sprintf('DROP VIEW IF EXISTS %s;\n', $quotedViewName);
114+
return sprintf("DROP VIEW IF EXISTS %s;\n", $quotedViewName);
115115
}
116116
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
<seeOptionIsSelected selector="{{AdminProductFormBundleSection.taxClassDropDown}}" userInput="Taxable Goods" stepKey="seeCorrectTaxClass"/>
6767

6868
<!--Fill out price-->
69-
<seeInField selector="{{AdminProductFormBundleSection.priceField}}" userInput="10" stepKey="seePrice"/>
69+
<seeInField selector="{{AdminProductFormBundleSection.priceField}}" userInput="10.00" stepKey="seePrice"/>
7070

7171
<!--Stock status-->
7272
<seeOptionIsSelected selector="{{AdminProductFormBundleSection.stockStatusField}}" userInput="In Stock" stepKey="seeStockStatus"/>
@@ -165,7 +165,7 @@
165165
<seeOptionIsSelected selector="{{AdminProductFormBundleSection.taxClassDropDown}}" userInput="Taxable Goods" stepKey="seeCorrectTaxClass2"/>
166166

167167
<!--Price-->
168-
<seeInField selector="{{AdminProductFormBundleSection.priceField}}" userInput="20" stepKey="seePrice2"/>
168+
<seeInField selector="{{AdminProductFormBundleSection.priceField}}" userInput="20.00" stepKey="seePrice2"/>
169169

170170
<!--Stock status-->
171171
<seeOptionIsSelected selector="{{AdminProductFormBundleSection.stockStatusField}}" userInput="Out of Stock" stepKey="seeStockStatus2"/>

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,7 @@
8080
<waitForPageLoad stepKey="waitForElementAdded"/>
8181

8282
<!-- Go to the shopping cart page and grab the value of the option title -->
83-
<amOnPage url="{{CheckoutCartPage.url}}" stepKey="onPageShoppingCart"/>
84-
<waitForPageLoad stepKey="waitForCartPageLoad"/>
83+
<actionGroup ref="StorefrontCartPageOpenActionGroup" stepKey="onPageShoppingCart"/>
8584
<grabTextFrom selector="{{CheckoutCartProductSection.nthBundleOptionName('1')}}" stepKey="grabTotalBefore"/>
8685

8786
<!-- Find the product that we just created using the product grid -->
@@ -101,8 +100,7 @@
101100
<see stepKey="assertSuccess2" selector="{{AdminProductMessagesSection.successMessage}}" userInput="You saved the product."/>
102101

103102
<!-- Go to the shopping cart page and make sure the title has changed -->
104-
<amOnPage url="{{CheckoutCartPage.url}}" stepKey="onPageShoppingCart1"/>
105-
<waitForPageLoad stepKey="waitForCartPageLoad1"/>
103+
<actionGroup ref="StorefrontCartPageOpenActionGroup" stepKey="onPageShoppingCart1"/>
106104
<grabTextFrom selector="{{CheckoutCartProductSection.nthBundleOptionName('1')}}" stepKey="grabTotalAfter"/>
107105
<assertNotEquals stepKey="assertNotEquals">
108106
<actualResult type="string">{$grabTotalAfter}</actualResult>

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,7 @@
100100
<see selector="{{StorefrontMessagesSection.success}}" userInput="You added {{BundleProduct.name}} to your shopping cart." stepKey="seeAddToCartSuccessMessage"/>
101101

102102
<!-- Verify cart contents -->
103-
<amOnPage url="{{CheckoutCartPage.url}}" stepKey="goToCart"/>
104-
<waitForPageLoad stepKey="waitForCart"/>
103+
<actionGroup ref="StorefrontCartPageOpenActionGroup" stepKey="goToCart"/>
105104
<see selector="{{StorefrontBundledSection.nthItemOptionsTitle('1')}}" userInput="Option One" stepKey="seeOption1"/>
106105
<see selector="{{StorefrontBundledSection.nthItemOptionsTitle('2')}}" userInput="Option Two" stepKey="seeOption2"/>
107106
<see selector="{{StorefrontBundledSection.nthItemOptionsTitle('3')}}" userInput="Option Three" stepKey="seeOption3"/>

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,7 @@
3636
<deleteData createDataKey="simpleProduct4" stepKey="deleteSimpleProduct4"/>
3737
</after>
3838
<!--Make category-->
39-
<amOnPage url="{{AdminCategoryPage.url}}" stepKey="goToCategoryPage"/>
40-
<waitForPageLoad stepKey="waitForCategoryPageLoad"/>
39+
<actionGroup ref="AdminOpenCategoryPageActionGroup" stepKey="goToCategoryPage"/>
4140
<actionGroup ref="CreateCategoryActionGroup" stepKey="createASubcategory">
4241
<argument name="categoryEntity" value="SimpleSubCategory"/>
4342
</actionGroup>

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -65,45 +65,45 @@
6565
<selectOption selector="{{StorefrontBundledSection.dropDownOptionOneProducts('Drop-down Option')}}" userInput="$$simpleProduct1CreateBundleProduct.sku$$ +$$$simpleProduct1CreateBundleProduct.price$$.00" stepKey="selectDropDownOptionProduct1"/>
6666
<seeOptionIsSelected selector="{{StorefrontBundledSection.dropDownOptionOneProducts('Drop-down Option')}}" userInput="$$simpleProduct1CreateBundleProduct.sku$$ +$$$simpleProduct1CreateBundleProduct.price$$.00" stepKey="checkDropDownOptionProduct1"/>
6767
<grabTextFrom selector="{{StorefrontBundledSection.dropDownOptionTierPrices('Drop-down Option')}}" stepKey="DropDownTierPriceTextProduct1"/>
68-
<assertContains stepKey="assertDropDownTierPriceTextProduct1">
68+
<assertStringContainsString stepKey="assertDropDownTierPriceTextProduct1">
6969
<expectedResult type="string">Buy 5 for $5.00 each and save 50%</expectedResult>
7070
<actualResult type="variable">DropDownTierPriceTextProduct1</actualResult>
71-
</assertContains>
71+
</assertStringContainsString>
7272
<!-- Check Tier Prices for product 2 -->
7373
<selectOption selector="{{StorefrontBundledSection.dropDownOptionOneProducts('Drop-down Option')}}" userInput="$$simpleProduct2CreateBundleProduct.sku$$ +$$$simpleProduct2CreateBundleProduct.price$$.00" stepKey="selectDropDownOptionProduct2"/>
7474
<seeOptionIsSelected selector="{{StorefrontBundledSection.dropDownOptionOneProducts('Drop-down Option')}}" userInput="$$simpleProduct2CreateBundleProduct.sku$$ +$$$simpleProduct2CreateBundleProduct.price$$.00" stepKey="checkDropDownOptionProduct2"/>
7575
<grabTextFrom selector="{{StorefrontBundledSection.dropDownOptionTierPrices('Drop-down Option')}}" stepKey="dropDownTierPriceTextProduct2"/>
76-
<assertContains stepKey="assertDropDownTierPriceTextProduct2">
76+
<assertStringContainsString stepKey="assertDropDownTierPriceTextProduct2">
7777
<expectedResult type="string">Buy 7 for $15.00 each and save 25%</expectedResult>
7878
<actualResult type="variable">dropDownTierPriceTextProduct2</actualResult>
79-
</assertContains>
79+
</assertStringContainsString>
8080

8181
<!--"Radio Buttons" type option-->
8282
<!-- Check Tier Prices for product 1 -->
8383
<grabTextFrom selector="{{StorefrontBundledSection.radioButtonOptionLabel('Radio Buttons Option', '$$simpleProduct1CreateBundleProduct.sku$$')}}" stepKey="radioButtonsOptionTierPriceTextProduct1"/>
84-
<assertContains stepKey="assertRadioButtonsOptionTierPriceTextProduct1">
84+
<assertStringContainsString stepKey="assertRadioButtonsOptionTierPriceTextProduct1">
8585
<expectedResult type="string">Buy 5 for $5.00 each and save 50%</expectedResult>
8686
<actualResult type="variable">radioButtonsOptionTierPriceTextProduct1</actualResult>
87-
</assertContains>
87+
</assertStringContainsString>
8888
<!-- Check Tier Prices for product 2 -->
8989
<grabTextFrom selector="{{StorefrontBundledSection.radioButtonOptionLabel('Radio Buttons Option', '$$simpleProduct2CreateBundleProduct.sku$$')}}" stepKey="radioButtonsOptionTierPriceTextProduct2"/>
90-
<assertContains stepKey="assertRadioButtonsOptionTierPriceTextProduct2">
90+
<assertStringContainsString stepKey="assertRadioButtonsOptionTierPriceTextProduct2">
9191
<expectedResult type="string">Buy 7 for $15.00 each and save 25%</expectedResult>
9292
<actualResult type="variable">radioButtonsOptionTierPriceTextProduct2</actualResult>
93-
</assertContains>
93+
</assertStringContainsString>
9494

9595
<!--"Checkbox" type option-->
9696
<!-- Check Tier Prices for product 1 -->
9797
<grabTextFrom selector="{{StorefrontBundledSection.checkboxOptionLabel('Checkbox Option', '$$simpleProduct1CreateBundleProduct.sku$$')}}" stepKey="checkBoxOptionTierPriceTextProduct1"/>
98-
<assertContains stepKey="assertCheckBoxOptionTierPriceTextProduct1">
98+
<assertStringContainsString stepKey="assertCheckBoxOptionTierPriceTextProduct1">
9999
<expectedResult type="string">Buy 5 for $5.00 each and save 50%</expectedResult>
100100
<actualResult type="variable">checkBoxOptionTierPriceTextProduct1</actualResult>
101-
</assertContains>
101+
</assertStringContainsString>
102102
<!-- Check Tier Prices for product 2 -->
103103
<grabTextFrom selector="{{StorefrontBundledSection.checkboxOptionLabel('Checkbox Option', '$$simpleProduct2CreateBundleProduct.sku$$')}}" stepKey="checkBoxOptionTierPriceTextProduct2"/>
104-
<assertContains stepKey="assertCheckBoxOptionTierPriceTextProduct2">
104+
<assertStringContainsString stepKey="assertCheckBoxOptionTierPriceTextProduct2">
105105
<expectedResult type="string">Buy 7 for $15.00 each and save 25%</expectedResult>
106106
<actualResult type="variable">checkBoxOptionTierPriceTextProduct2</actualResult>
107-
</assertContains>
107+
</assertStringContainsString>
108108
</test>
109109
</tests>

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -105,23 +105,23 @@
105105
<selectOption selector="{{StorefrontBundledSection.dropDownOptionOneProducts('Option One')}}" userInput="$$simpleProduct1.sku$$ +$$$simpleProduct1.price$$.00" stepKey="selectOption0Product0"/>
106106
<seeOptionIsSelected selector="{{StorefrontBundledSection.dropDownOptionOneProducts('Option One')}}" userInput="$$simpleProduct1.sku$$ +$$$simpleProduct1.price$$.00" stepKey="checkOption0Product0"/>
107107
<fillField selector="{{StorefrontBundledSection.dropDownOptionOneQuantity('Option One')}}" userInput="3" stepKey="fillQuantity00"/>
108-
<seeInField selector="{{StorefrontBundledSection.dropDownOptionOneQuantity('Option One')}}" userInput="3" stepKey="checkQuantity00"/>
108+
<seeInField selector="{{StorefrontBundledSection.dropDownOptionOneQuantity('Option One')}}" userInput="03" stepKey="checkQuantity00"/>
109109

110110
<selectOption selector="{{StorefrontBundledSection.dropDownOptionOneProducts('Option One')}}" userInput="$$simpleProduct2.sku$$ +$$$simpleProduct2.price$$.00" stepKey="selectOption0Product1"/>
111111
<seeOptionIsSelected selector="{{StorefrontBundledSection.dropDownOptionOneProducts('Option One')}}" userInput="$$simpleProduct2.sku$$ +$$$simpleProduct2.price$$.00" stepKey="checkOption0Product1"/>
112112
<fillField selector="{{StorefrontBundledSection.dropDownOptionOneQuantity('Option One')}}" userInput="3" stepKey="fillQuantity01"/>
113-
<seeInField selector="{{StorefrontBundledSection.dropDownOptionOneQuantity('Option One')}}" userInput="3" stepKey="checkQuantity01"/>
113+
<seeInField selector="{{StorefrontBundledSection.dropDownOptionOneQuantity('Option One')}}" userInput="03" stepKey="checkQuantity01"/>
114114

115115
<!--"Radio Buttons" type option-->
116116
<checkOption selector="{{StorefrontBundledSection.radioButtonOptionTwoProducts('Option Two', '1')}}" stepKey="selectOption1Product0"/>
117117
<seeCheckboxIsChecked selector="{{StorefrontBundledSection.radioButtonOptionTwoProducts('Option Two', '1')}}" stepKey="checkOption1Product0"/>
118118
<fillField selector="{{StorefrontBundledSection.radioButtonOptionTwoQuantity('Option Two')}}" userInput="3" stepKey="fillQuantity10"/>
119-
<seeInField selector="{{StorefrontBundledSection.radioButtonOptionTwoQuantity('Option Two')}}" userInput="3" stepKey="checkQuantity10"/>
119+
<seeInField selector="{{StorefrontBundledSection.radioButtonOptionTwoQuantity('Option Two')}}" userInput="03" stepKey="checkQuantity10"/>
120120

121121
<checkOption selector="{{StorefrontBundledSection.radioButtonOptionTwoProducts('Option Two', '2')}}" stepKey="selectOption1Product1"/>
122122
<seeCheckboxIsChecked selector="{{StorefrontBundledSection.radioButtonOptionTwoProducts('Option Two', '2')}}" stepKey="checkOption1Product1"/>
123123
<fillField selector="{{StorefrontBundledSection.radioButtonOptionTwoQuantity('Option Two')}}" userInput="3" stepKey="fillQuantity11"/>
124-
<seeInField selector="{{StorefrontBundledSection.radioButtonOptionTwoQuantity('Option Two')}}" userInput="3" stepKey="checkQuantity11"/>
124+
<seeInField selector="{{StorefrontBundledSection.radioButtonOptionTwoQuantity('Option Two')}}" userInput="03" stepKey="checkQuantity11"/>
125125

126126
<!--"Checkbox" type option-->
127127
<!--This option does not support user defined quantities-->

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,7 @@
8989
<waitForPageLoad stepKey="waitForElementAdded2"/>
9090

9191
<!-- Go to the shopping cart page and edit the first product -->
92-
<amOnPage url="{{CheckoutCartPage.url}}" stepKey="onPageShoppingCart"/>
93-
<waitForPageLoad stepKey="waitForCartPageLoad"/>
92+
<actionGroup ref="StorefrontCartPageOpenActionGroup" stepKey="onPageShoppingCart"/>
9493
<waitForElementVisible stepKey="waitForInfoDropdown" selector="{{CheckoutCartSummarySection.total}}"/>
9594
<waitForPageLoad stepKey="waitForCartPageLoad3"/>
9695
<grabTextFrom selector="{{CheckoutCartSummarySection.total}}" stepKey="grabTotalBefore"/>
@@ -107,8 +106,7 @@
107106
<waitForPageLoad stepKey="waitForElementAdded3"/>
108107

109108
<!-- Go to the shopping cart page -->
110-
<amOnPage url="{{CheckoutCartPage.url}}" stepKey="onPageShoppingCart2"/>
111-
<waitForPageLoad stepKey="waitForCartPageLoad2"/>
109+
<actionGroup ref="StorefrontCartPageOpenActionGroup" stepKey="onPageShoppingCart2"/>
112110

113111
<!-- Assert that the options are both there and the proce no longer matches -->
114112
<see stepKey="assertBothOptions" selector="{{CheckoutCartProductSection.nthItemOption('2')}}" userInput="$$simpleProduct1.sku$$"/>

0 commit comments

Comments
 (0)