Skip to content

Commit 6027245

Browse files
amolina-adobeamolina-adobe
committed
Merge branch 'MC-20534' into MC-19451
2 parents bac7650 + 2fe6639 commit 6027245

6 files changed

+29
-46
lines changed

‎app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -559,6 +559,20 @@
559559
<requiredEntity type="custom_attribute_array">ApiProductDescription</requiredEntity>
560560
<requiredEntity type="custom_attribute_array">ApiProductShortDescription</requiredEntity>
561561
</entity>
562+
<entity name="ApiVirtualProductWithDescriptionAndUnderscoredSku" type="product">
563+
<data key="sku" unique="suffix">api_virtual_product</data>
564+
<data key="type_id">virtual</data>
565+
<data key="attribute_set_id">4</data>
566+
<data key="visibility">4</data>
567+
<data key="name" unique="suffix">Api Virtual Product</data>
568+
<data key="price">123.00</data>
569+
<data key="urlKey" unique="suffix">api-virtual-product</data>
570+
<data key="status">1</data>
571+
<data key="quantity">100</data>
572+
<requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
573+
<requiredEntity type="custom_attribute_array">ApiProductDescription</requiredEntity>
574+
<requiredEntity type="custom_attribute_array">ApiProductShortDescription</requiredEntity>
575+
</entity>
562576
<entity name="SimpleProductWithNewFromDate" type="product">
563577
<data key="sku" unique="suffix">SimpleProduct</data>
564578
<data key="type_id">simple</data>

‎app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithCustomOptionsSuiteAndImportOptionsTest.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,8 @@
117117

118118
<!-- Verify we see success message -->
119119
<see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertVirtualProductSuccessMessage"/>
120+
<magentoCLI command="indexer:reindex" stepKey="reindex"/>
121+
<magentoCLI command="cache:flush" stepKey="flushCache"/>
120122

121123
<!-- Verify customer see created virtual product with custom options suite and import options(from above step) on storefront page and is searchable by sku -->
122124
<amOnPage url="{{StorefrontProductPage.url(virtualProductCustomImportOptions.urlKey)}}" stepKey="goToProductPage"/>

‎app/code/Magento/Catalog/Test/Mftf/Test/AdminSimpleProductImagesTest.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,8 @@
144144

145145
<!-- Save the second product -->
146146
<click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveProduct2"/>
147+
<magentoCLI command="indexer:reindex" stepKey="reindex"/>
148+
<magentoCLI command="cache:flush" stepKey="flushCache"/>
147149

148150
<!-- Go to the admin grid and see the uploaded image -->
149151
<amOnPage url="{{AdminProductIndexPage.url}}" stepKey="goToProductIndex3"/>

‎app/code/Magento/Catalog/Test/Mftf/Test/StorefrontProductNameWithDoubleQuote.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,7 @@
117117
<waitForPageLoad stepKey="waitforCategoryPageToLoad2"/>
118118

119119
<!--Open product display page-->
120-
<click selector="{{StorefrontCategoryProductSection.ProductTitleByNumber('1')}}" stepKey="goToProduct2DisplayPage"/>
121-
<!--<click selector="{{StorefrontCategoryProductSection.ProductTitleByName(productWithHTMLEntityOne.name)}}" stepKey="clickProductToGoProductPage"/>-->
120+
<click selector="{{StorefrontCategoryProductSection.ProductTitleByName(productWithHTMLEntityTwo.name)}}" stepKey="clickProductToGoSecondProductPage"/>
122121
<waitForPageLoad stepKey="waitForProductDisplayPageLoad3"/>
123122

124123
<!--Verify the breadcrumbs on Product Display page-->

‎app/code/Magento/CatalogRule/Test/Mftf/Test/ApplyCatalogRuleForSimpleProductWithCustomOptionsTest.xml

Lines changed: 8 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -77,63 +77,27 @@
7777
<actionGroup ref="SaveAndApplyCatalogPriceRuleActionGroup" stepKey="saveAndApplyCatalogPriceRule"/>
7878
<magentoCLI command="indexer:reindex" stepKey="reindex"/>
7979
<magentoCLI command="cache:flush" stepKey="flushCache"/>
80-
80+
8181
<!-- Navigate to category on store front -->
8282
<amOnPage url="{{StorefrontProductPage.url($createCategory.name$)}}" stepKey="goToCategoryPage"/>
83-
84-
<!-- Check product 1 name on store front category page -->
85-
<actionGroup ref="AssertProductDetailsOnStorefrontActionGroup" stepKey="storefrontProduct1Name">
86-
<argument name="productInfo" value="$createProduct1.name$"/>
87-
<argument name="productNumber" value="3"/>
88-
</actionGroup>
8983

9084
<!-- Check product 1 price on store front category page -->
91-
<actionGroup ref="AssertProductDetailsOnStorefrontActionGroup" stepKey="storefrontProduct1Price">
92-
<argument name="productInfo" value="$51.10"/>
93-
<argument name="productNumber" value="3"/>
94-
</actionGroup>
85+
<see selector="{{StorefrontCategoryProductSection.ProductInfoByName($createProduct1.name$)}}" userInput="$51.10" stepKey="storefrontProduct1Price"/>
9586

9687
<!-- Check product 1 regular price on store front category page -->
97-
<actionGroup ref="AssertProductDetailsOnStorefrontActionGroup" stepKey="storefrontProduct1RegularPrice">
98-
<argument name="productInfo" value="$56.78"/>
99-
<argument name="productNumber" value="3"/>
100-
</actionGroup>
101-
102-
<!-- Check product 2 name on store front category page -->
103-
<actionGroup ref="AssertProductDetailsOnStorefrontActionGroup" stepKey="storefrontProduct2Name">
104-
<argument name="productInfo" value="$createProduct2.name$"/>
105-
<argument name="productNumber" value="2"/>
106-
</actionGroup>
88+
<see selector="{{StorefrontCategoryProductSection.ProductInfoByName($createProduct1.name$)}}" userInput="$56.78" stepKey="storefrontProduct1RegularPrice"/>
10789

10890
<!-- Check product 2 price on store front category page -->
109-
<actionGroup ref="AssertProductDetailsOnStorefrontActionGroup" stepKey="storefrontProduct2Price">
110-
<argument name="productInfo" value="$51.10"/>
111-
<argument name="productNumber" value="2"/>
112-
</actionGroup>
91+
<see selector="{{StorefrontCategoryProductSection.ProductInfoByName($createProduct2.name$)}}" userInput="$51.10" stepKey="storefrontProduct2Price"/>
11392

114-
<!-- Check product 2 price on store front category page -->
115-
<actionGroup ref="AssertProductDetailsOnStorefrontActionGroup" stepKey="storefrontProduct2RegularPrice">
116-
<argument name="productInfo" value="$56.78"/>
117-
<argument name="productNumber" value="2"/>
118-
</actionGroup>
119-
120-
<!-- Check product 3 name on store front category page -->
121-
<actionGroup ref="AssertProductDetailsOnStorefrontActionGroup" stepKey="storefrontProduct3Name">
122-
<argument name="productInfo" value="$createProduct3.name$"/>
123-
<argument name="productNumber" value="1"/>
124-
</actionGroup>
93+
<!-- Check product 2 regular price on store front category page -->
94+
<see selector="{{StorefrontCategoryProductSection.ProductInfoByName($createProduct2.name$)}}" userInput="$56.78" stepKey="storefrontProduct2RegularPrice"/>
12595

12696
<!-- Check product 3 price on store front category page -->
127-
<actionGroup ref="AssertProductDetailsOnStorefrontActionGroup" stepKey="storefrontProduct3Price">
128-
<argument name="productInfo" value="$51.10"/>
129-
<argument name="productNumber" value="1"/>
130-
</actionGroup>
97+
<see selector="{{StorefrontCategoryProductSection.ProductInfoByName($createProduct3.name$)}}" userInput="$51.10" stepKey="storefrontProduct3Price"/>
13198

13299
<!-- Check product 3 regular price on store front category page -->
133-
<actionGroup ref="AssertProductDetailsOnStorefrontActionGroup" stepKey="storefrontProduct3RegularPrice">
134-
<argument name="productInfo" value="$56.78"/>
135-
<argument name="productNumber" value="1"/>
136-
</actionGroup>
100+
<see selector="{{StorefrontCategoryProductSection.ProductInfoByName($createProduct3.name$)}}" userInput="$56.78" stepKey="storefrontProduct3RegularPrice"/>
137101

138102
<!-- Navigate to product 1 on store front -->
139103
<amOnPage url="{{StorefrontProductPage.url($createProduct1.name$)}}" stepKey="goToProductPage1"/>

‎app/code/Magento/Checkout/Test/Mftf/Test/NoErrorCartCheckoutForProductsDeletedFromMiniCartTest.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@
2626
<field key="price">100.00</field>
2727
<requiredEntity createDataKey="createCategory"/>
2828
</createData>
29+
<magentoCLI command="indexer:reindex" stepKey="reindex"/>
30+
<magentoCLI command="cache:flush" stepKey="flushCache"/>
2931
</before>
3032
<after>
3133
<deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>

0 commit comments

Comments
 (0)