Skip to content

Commit e7e3377

Browse files
zakdmazakdma
authored
Merge pull request #4845 from magento-tsg/2.3-develop-pr76
[TSG] Fixes for 2.3 (pr76) (2.3-develop)
2 parents f1910f0 + 71c76f0 commit e7e3377

11 files changed

+96
-22
lines changed

Diff for: ‎app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontOpenProductPageActionGroup.xml

+11
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,15 @@
1818
<amOnPage url="{{StorefrontProductPage.url(productUrl)}}" stepKey="openProductPage"/>
1919
<waitForPageLoad stepKey="waitForProductPageLoaded"/>
2020
</actionGroup>
21+
<actionGroup name="StorefrontOpenProductPageOnSecondStore">
22+
<annotations>
23+
<description>Goes to the Storefront Product page for the provided store code and Product URL.</description>
24+
</annotations>
25+
<arguments>
26+
<argument name="storeCode" type="string"/>
27+
<argument name="productUrl" type="string"/>
28+
</arguments>
29+
30+
<amOnPage url="{{StorefrontStoreViewProductPage.url(storeCode,productUrl)}}" stepKey="openProductPage"/>
31+
</actionGroup>
2132
</actionGroups>

Diff for: ‎app/code/Magento/Catalog/Test/Mftf/Data/CatalogConfigurationData.xml

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
11+
<!-- Catalog > Price -->
12+
<entity name="GlobalCatalogPriceScopeConfigData">
13+
<!-- Default configuration -->
14+
<data key="path">catalog/price/scope</data>
15+
<data key="scope_id">0</data>
16+
<data key="label">Global</data>
17+
<data key="value">0</data>
18+
</entity>
19+
<entity name="WebsiteCatalogPriceScopeConfigData">
20+
<data key="path">catalog/price/scope</data>
21+
<data key="scope_id">0</data>
22+
<data key="label">Website</data>
23+
<data key="value">1</data>
24+
</entity>
25+
</entities>

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

+9
Original file line numberDiff line numberDiff line change
@@ -1224,4 +1224,13 @@
12241224
<requiredEntity type="product_extension_attribute">EavStock1</requiredEntity>
12251225
<requiredEntity type="custom_attribute">CustomAttributeProductAttribute</requiredEntity>
12261226
</entity>
1227+
<entity name="SimpleProductUpdatePrice11" type="product2">
1228+
<data key="price">11.00</data>
1229+
</entity>
1230+
<entity name="SimpleProductUpdatePrice14" type="product2">
1231+
<data key="price">14.00</data>
1232+
</entity>
1233+
<entity name="SimpleProductUpdatePrice16" type="product2">
1234+
<data key="price">16.00</data>
1235+
</entity>
12271236
</entities>

Diff for: ‎app/code/Magento/Catalog/Test/Mftf/Page/StorefrontStoreViewProductPage.xml

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
11+
<!-- It is created to open product page with store code setting-->
12+
<page name="StorefrontStoreViewProductPage" url="/{{storeCode}}/{{productUrlKey}}.html" area="storefront" module="Magento_Catalog" parameterized="true">
13+
</page>
14+
</pages>

Diff for: ‎app/code/Magento/Checkout/Test/Mftf/ActionGroup/AssertStorefrontMiniCartItemsActionGroup.xml

+15-3
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,24 @@
1818
<argument name="cartSubtotal" type="string"/>
1919
<argument name="qty" type="string"/>
2020
</arguments>
21-
22-
<see selector="{{StorefrontMinicartSection.miniCartItemsText}}" userInput="{{productName}}" stepKey="seeProductNameInMiniCart"/>
23-
<see selector="{{StorefrontMinicartSection.miniCartItemsText}}" userInput="{{productPrice}}" stepKey="seeProductPriceInMiniCart"/>
21+
22+
<see selector="{{StorefrontMinicartSection.productPriceByName(productName)}}" userInput="{{productPrice}}" stepKey="seeProductPriceInMiniCart"/>
2423
<seeElement selector="{{StorefrontMinicartSection.goToCheckout}}" stepKey="seeCheckOutButtonInMiniCart"/>
2524
<seeElement selector="{{StorefrontMinicartSection.productQuantity(productName, qty)}}" stepKey="seeProductQuantity1"/>
2625
<seeElement selector="{{StorefrontMinicartSection.productImage}}" stepKey="seeProductImage"/>
2726
<see selector="{{StorefrontMinicartSection.productSubTotal}}" userInput="{{cartSubtotal}}" stepKey="seeSubTotal"/>
2827
</actionGroup>
28+
29+
<actionGroup name="AssertStorefrontMiniCartProductDetailsAbsentActionGroup">
30+
<annotations>
31+
<description>Validates that the provided Product details (Name, Price) are
32+
not present in the Storefront Mini Shopping Cart.</description>
33+
</annotations>
34+
<arguments>
35+
<argument name="productName" type="string"/>
36+
<argument name="productPrice" type="string"/>
37+
</arguments>
38+
39+
<dontSee selector="{{StorefrontMinicartSection.productPriceByName(productName)}}" userInput="{{productPrice}}" stepKey="dontSeeProductPriceInMiniCart"/>
40+
</actionGroup>
2941
</actionGroups>

Diff for: ‎app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontCheckCartDiscountAndSummaryActionGroup.xml

+5-6
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,12 @@
1717
<argument name="total" type="string"/>
1818
<argument name="discount" type="string"/>
1919
</arguments>
20-
2120
<waitForPageLoad stepKey="waitForPageLoad"/>
22-
<waitForLoadingMaskToDisappear stepKey="waitForPrices"/>
21+
<waitForElement time="30" selector="{{CheckoutCartSummarySection.estimateShippingAndTaxForm}}" stepKey="waitForEstimateShippingAndTaxForm"/>
22+
<waitForElement time="30" selector="{{CheckoutCartSummarySection.shippingMethodForm}}" stepKey="waitForShippingMethodForm"/>
23+
<waitForElementVisible time="30" selector="{{CheckoutCartSummarySection.total}}" stepKey="waitForTotalElement"/>
24+
<see selector="{{CheckoutCartSummarySection.total}}" userInput="${{total}}" stepKey="assertTotal"/>
25+
<waitForElementVisible selector="{{CheckoutCartSummarySection.discountAmount}}" stepKey="waitForDiscountElement"/>
2326
<see selector="{{CheckoutCartSummarySection.discountAmount}}" userInput="-${{discount}}" stepKey="assertDiscount"/>
24-
<wait time="10" stepKey="waitForTotalPrice"/>
25-
<reloadPage stepKey="reloadPage" after="waitForTotalPrice" />
26-
<waitForPageLoad after="reloadPage" stepKey="WaitForPageLoaded" />
27-
<see selector="{{CheckoutCartSummarySection.total}}" userInput="${{total}}" stepKey="assertTotal" after="WaitForPageLoaded"/>
2827
</actionGroup>
2928
</actionGroups>

Diff for: ‎app/code/Magento/Checkout/Test/Mftf/Section/CheckoutCartSummarySection.xml

+1
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,6 @@
3333
<element name="methodName" type="text" selector="#co-shipping-method-form label"/>
3434
<element name="shippingPrice" type="text" selector="#co-shipping-method-form span .price"/>
3535
<element name="shippingMethodElementId" type="radio" selector="#s_method_{{carrierCode}}_{{methodCode}}" parameterized="true"/>
36+
<element name="estimateShippingAndTaxForm" type="block" selector="#shipping-zip-form"/>
3637
</section>
3738
</sections>

Diff for: ‎app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckCartItemDisplayWhenMoreItemsAddedToTheCartThanDefaultDisplayLimitTest.xml

+4-5
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@
1515
<testCaseId value="MC-14720"/>
1616
<severity value="CRITICAL"/>
1717
<group value="mtf_migrated"/>
18-
<skip>
19-
<issueId value="MC-17140"/>
20-
</skip>
2118
</annotations>
2219

2320
<before>
@@ -280,7 +277,9 @@
280277
</actionGroup>
281278

282279
<!-- Verify Product11 is not displayed in Mini Cart -->
283-
<dontSee selector="{{StorefrontMinicartSection.miniCartItemsText}}" userInput="$$simpleProduct11.name$$" stepKey="dontSeeProduct11NameInMiniCart"/>
284-
<dontSee selector="{{StorefrontMinicartSection.miniCartItemsText}}" userInput="110" stepKey="dontSeeProduct11PriceInMiniCart"/>
280+
<actionGroup ref="AssertStorefrontMiniCartProductDetailsAbsentActionGroup" stepKey="assertSimpleProduct11IsNotInMiniCart">
281+
<argument name="productName" value="$$simpleProduct11.name$$"/>
282+
<argument name="productPrice" value="$110.00"/>
283+
</actionGroup>
285284
</test>
286285
</tests>

Diff for: ‎app/code/Magento/Newsletter/Test/Mftf/Test/AdminAddWidgetToWYSIWYGNewsletterTest.xml

+3-5
Original file line numberDiff line numberDiff line change
@@ -15,24 +15,22 @@
1515
<title value="Admin should be able to add widget to WYSIWYG Editor of Newsletter"/>
1616
<description value="Admin should be able to add widget to WYSIWYG Editor Newsletter"/>
1717
<severity value="CRITICAL"/>
18-
<testCaseId value="MAGETWO-84682"/>
19-
<skip>
20-
<issueId value="MC-17140"/>
21-
</skip>
18+
<testCaseId value="MC-6070"/>
2219
</annotations>
2320
<before>
2421
<actionGroup ref="LoginActionGroup" stepKey="login"/>
2522
<actionGroup ref="EnabledWYSIWYG" stepKey="enableWYSIWYG"/>
2623
<actionGroup ref="SwitchToVersion4ActionGroup" stepKey="switchToTinyMCE4" />
2724
</before>
2825
<amOnPage url="{{NewsletterTemplateForm.url}}" stepKey="amOnNewsletterTemplatePage"/>
29-
<waitForPageLoad stepKey="waitForPageLoad1"/>
26+
<waitForElementVisible selector="{{BasicFieldNewsletterSection.templateName}}" stepKey="waitForTemplateName"/>
3027
<fillField selector="{{BasicFieldNewsletterSection.templateName}}" userInput="{{_defaultNewsletter.name}}" stepKey="fillTemplateName" />
3128
<fillField selector="{{BasicFieldNewsletterSection.templateSubject}}" userInput="{{_defaultNewsletter.subject}}" stepKey="fillTemplateSubject" />
3229
<fillField selector="{{BasicFieldNewsletterSection.senderName}}" userInput="{{_defaultNewsletter.senderName}}" stepKey="fillSenderName" />
3330
<fillField selector="{{BasicFieldNewsletterSection.senderEmail}}" userInput="{{_defaultNewsletter.senderEmail}}" stepKey="fillSenderEmail" />
3431
<conditionalClick selector="{{NewsletterWYSIWYGSection.ShowHideBtn}}" dependentSelector="{{NewsletterWYSIWYGSection.TinyMCE4}}" visible="false" stepKey="toggleEditorIfHidden"/>
3532
<waitForElementVisible selector="{{TinyMCESection.TinyMCE4}}" stepKey="waitForTinyMCE" />
33+
<waitForElementVisible selector="{{NewsletterWYSIWYGSection.InsertWidgetIcon}}" stepKey="waitForInsertWidgerIconButton"/>
3634
<click selector="{{NewsletterWYSIWYGSection.InsertWidgetIcon}}" stepKey="clickInsertWidgetIcon" />
3735
<wait time="10" stepKey="waitForPageLoad" />
3836
<see userInput="Inserting a widget does not create a widget instance." stepKey="seeMessage" />

Diff for: ‎app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminDeleteCartPriceRuleActionGroup.xml

+5-2
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,16 @@
1515
<arguments>
1616
<argument name="ruleName" type="entity"/>
1717
</arguments>
18-
18+
1919
<amOnPage url="{{AdminCartPriceRulesPage.url}}" stepKey="goToCartPriceRules"/>
2020
<waitForPageLoad stepKey="waitForCartPriceRules"/>
21+
<click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="resetFilterBeforeDelete"/>
22+
<waitForPageLoad stepKey="waitForCartPriceRulesResetFilter"/>
2123
<fillField selector="{{AdminCartPriceRulesSection.filterByNameInput}}" userInput="{{ruleName.name}}" stepKey="filterByName"/>
2224
<click selector="{{AdminCartPriceRulesSection.searchButton}}" stepKey="doFilter"/>
2325
<click selector="{{AdminCartPriceRulesSection.rowByIndex('1')}}" stepKey="goToEditRulePage"/>
2426
<click selector="{{AdminCartPriceRulesFormSection.delete}}" stepKey="clickDeleteButton"/>
25-
<click selector="{{AdminCartPriceRulesFormSection.modalAcceptButton}}" stepKey="confirmDelete"/>
27+
<waitForElementVisible selector="{{AdminConfirmationModalSection.ok}}" stepKey="waitForConfirmModal"/>
28+
<click selector="{{AdminConfirmationModalSection.ok}}" stepKey="confirmDelete"/>
2629
</actionGroup>
2730
</actionGroups>

Diff for: ‎app/code/Magento/Store/Test/Mftf/Data/StoreData.xml

+4-1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@
1111
<data key="code">default</data>
1212
<data key="is_active">1</data>
1313
</entity>
14+
<entity name="DefaultAllStoreView" type="store">
15+
<data key="name">All Store Views</data>
16+
</entity>
1417
<entity name="customStore" type="store">
1518
<!--data key="group_id">customStoreGroup.id</data-->
1619
<data key="name" unique="suffix">store</data>
@@ -194,4 +197,4 @@
194197
<data key="name">third_store_view</data>
195198
<data key="code">third_store_view</data>
196199
</entity>
197-
</entities>
200+
</entities>

0 commit comments

Comments
 (0)