Skip to content

Commit beb0274

Browse files
xmavxmav
authored
Merge pull request magento#3654 from magento-tsg/2.3-develop-mftf-pr12
[TSG] MFTF for 2.3 (pr12) (2.3.1)
2 parents da1173a + 02b5ff6 commit beb0274

11 files changed

+177
-16
lines changed

‎app/code/Magento/Catalog/Test/Mftf/ActionGroup/SearchForProductOnBackendActionGroup.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,14 @@
1919
<click selector="{{AdminProductFiltersSection.apply}}" stepKey="clickApplyFiltersButton"/>
2020
</actionGroup>
2121

22+
<actionGroup name="SearchForProductOnBackendByNameActionGroup" extends="SearchForProductOnBackendActionGroup">
23+
<arguments>
24+
<argument name="productName" type="string"/>
25+
</arguments>
26+
<remove keyForRemoval="fillSkuFieldOnFiltersSection"/>
27+
<fillField userInput="{{productName}}" selector="{{AdminProductFiltersSection.nameInput}}" after="cleanFiltersIfTheySet" stepKey="fillNameFieldOnFiltersSection"/>
28+
</actionGroup>
29+
2230
<actionGroup name="ClearProductsFilterActionGroup">
2331
<amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
2432
<waitForPageLoad time="30" stepKey="waitForProductsPageToLoad"/>

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

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,12 @@
1919
<group value="checkout"/>
2020
</annotations>
2121
<before>
22-
<createData entity="_defaultCategory" stepKey="createCategory"/>
23-
<createData entity="defaultVirtualProduct" stepKey="createVirtualProduct">
24-
<requiredEntity createDataKey="createCategory"/>
25-
</createData>
26-
<createData entity="Simple_US_Customer_CA" stepKey="createCustomer">
27-
<field key="group_id">1</field>
28-
</createData>
22+
<createData entity="VirtualProduct" stepKey="createVirtualProduct"/>
23+
<createData entity="Customer_With_Different_Default_Billing_Shipping_Addresses" stepKey="createCustomer"/>
2924
</before>
3025
<after>
3126
<actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="customerLogout"/>
3227
<deleteData createDataKey="createVirtualProduct" stepKey="deleteVirtualProduct"/>
33-
<deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
3428
<deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
3529
</after>
3630
<!-- Steps -->
@@ -48,8 +42,8 @@
4842
<actionGroup ref="clickViewAndEditCartFromMiniCart" stepKey="goToShoppingcart"/>
4943
<!-- Step 4: Open Estimate Tax section -->
5044
<click selector="{{CheckoutCartSummarySection.estimateShippingAndTax}}" stepKey="openEstimateTaxSection"/>
51-
<see selector="{{CheckoutCartSummarySection.country}}" userInput="{{US_Address_CA.country_id}}" stepKey="checkCountry"/>
52-
<see selector="{{CheckoutCartSummarySection.stateProvince}}" userInput="{{US_Address_CA.state}}" stepKey="checkState"/>
45+
<seeOptionIsSelected selector="{{CheckoutCartSummarySection.country}}" userInput="{{US_Address_CA.country}}" stepKey="checkCountry"/>
46+
<seeOptionIsSelected selector="{{CheckoutCartSummarySection.stateProvince}}" userInput="{{US_Address_CA.state}}" stepKey="checkState"/>
5347
<scrollTo selector="{{CheckoutCartSummarySection.postcode}}" stepKey="scrollToPostCodeField"/>
5448
<grabValueFrom selector="{{CheckoutCartSummarySection.postcode}}" stepKey="grabTextPostCode"/>
5549
<assertEquals message="Customer postcode is invalid" stepKey="checkCustomerPostcode">

‎app/code/Magento/Customer/Test/Mftf/Data/AddressData.xml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,7 @@
129129
<data key="city">Los Angeles</data>
130130
<data key="state">California</data>
131131
<data key="country_id">US</data>
132+
<data key="country">United States</data>
132133
<data key="postcode">90001</data>
133134
<data key="telephone">512-345-6789</data>
134135
<data key="default_billing">Yes</data>
@@ -182,4 +183,12 @@
182183
</array>
183184
<data key="state">California</data>
184185
</entity>
186+
<entity name="US_Default_Billing_Address_TX" type="address" extends="US_Address_TX">
187+
<data key="default_billing">false</data>
188+
<data key="default_shipping">true</data>
189+
</entity>
190+
<entity name="US_Default_Shipping_Address_CA" type="address" extends="US_Address_CA">
191+
<data key="default_billing">true</data>
192+
<data key="default_shipping">false</data>
193+
</entity>
185194
</entities>

‎app/code/Magento/Customer/Test/Mftf/Data/CustomerData.xml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,4 +166,16 @@
166166
<data key="website_id">0</data>
167167
<requiredEntity type="address">UK_Not_Default_Address</requiredEntity>
168168
</entity>
169+
<entity name="Customer_With_Different_Default_Billing_Shipping_Addresses" type="customer">
170+
<data key="group_id">1</data>
171+
<data key="email" unique="prefix">[email protected]</data>
172+
<data key="firstname">John</data>
173+
<data key="lastname">Doe</data>
174+
<data key="fullname">John Doe</data>
175+
<data key="password">pwdTest123!</data>
176+
<data key="store_id">0</data>
177+
<data key="website_id">0</data>
178+
<requiredEntity type="address">US_Default_Billing_Address_TX</requiredEntity>
179+
<requiredEntity type="address">US_Default_Shipping_Address_CA</requiredEntity>
180+
</entity>
169181
</entities>

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

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,24 @@
3939
<data key="store_type">group</data>
4040
<requiredEntity type="storeGroup">customStoreGroup</requiredEntity>
4141
</entity>
42+
<entity name="customStoreENNotUnique" type="store">
43+
<data key="name">EN</data>
44+
<data key="code">en</data>
45+
<data key="is_active">1</data>
46+
<data key="store_id">null</data>
47+
<data key="store_action">add</data>
48+
<data key="store_type">store</data>
49+
<requiredEntity type="storeGroup">customStoreGroup</requiredEntity>
50+
</entity>
51+
<entity name="customStoreNLNotUnique" type="store">
52+
<data key="name">NL</data>
53+
<data key="code">nl</data>
54+
<data key="is_active">1</data>
55+
<data key="store_id">null</data>
56+
<data key="store_action">add</data>
57+
<data key="store_type">store</data>
58+
<requiredEntity type="storeGroup">customStoreGroup</requiredEntity>
59+
</entity>
4260
<entity name="staticStore" type="store">
4361
<!--data key="group_id">customStoreGroup.id</data-->
4462
<data key="name">Second Store View</data>

‎app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxInformationInShoppingCartForCustomerPhysicalQuoteTest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,8 @@
8989
<actionGroup ref="clickViewAndEditCartFromMiniCart" stepKey="goToShoppingCartFromMinicart"/>
9090
<!-- Step 4: Open Estimate Shipping and Tax section -->
9191
<conditionalClick selector="{{CheckoutCartSummarySection.estimateShippingAndTax}}" dependentSelector="{{CheckoutCartSummarySection.country}}" visible="false" stepKey="expandEstimateShippingandTax" />
92-
<see selector="{{CheckoutCartSummarySection.country}}" userInput="{{US_Address_CA.country_id}}" stepKey="checkCustomerCountry" />
93-
<see selector="{{CheckoutCartSummarySection.stateProvince}}" userInput="{{US_Address_CA.state}}" stepKey="checkCustomerRegion" />
92+
<seeOptionIsSelected selector="{{CheckoutCartSummarySection.country}}" userInput="{{US_Address_CA.country}}" stepKey="checkCustomerCountry" />
93+
<seeOptionIsSelected selector="{{CheckoutCartSummarySection.stateProvince}}" userInput="{{US_Address_CA.state}}" stepKey="checkCustomerRegion" />
9494
<grabValueFrom selector="{{CheckoutCartSummarySection.postcode}}" stepKey="grabTextPostCode"/>
9595
<assertEquals message="Customer postcode is invalid" stepKey="checkCustomerPostcode">
9696
<expectedResult type="string">{{US_Address_CA.postcode}}</expectedResult>

‎app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxInformationInShoppingCartForCustomerVirtualQuoteTest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@
6161
<actionGroup ref="clickViewAndEditCartFromMiniCart" stepKey="goToShoppingCartFromMinicart"/>
6262
<!-- Step 4: Open Estimate Shipping and Tax section -->
6363
<conditionalClick selector="{{CheckoutCartSummarySection.estimateShippingAndTax}}" dependentSelector="{{CheckoutCartSummarySection.country}}" visible="false" stepKey="expandEstimateShippingandTax" />
64-
<see selector="{{CheckoutCartSummarySection.country}}" userInput="{{US_Address_NY.country_id}}" stepKey="checkCustomerCountry" />
65-
<see selector="{{CheckoutCartSummarySection.stateProvince}}" userInput="{{US_Address_NY.state}}" stepKey="checkCustomerRegion" />
64+
<seeOptionIsSelected selector="{{CheckoutCartSummarySection.country}}" userInput="{{US_Address_NY.country}}" stepKey="checkCustomerCountry" />
65+
<seeOptionIsSelected selector="{{CheckoutCartSummarySection.stateProvince}}" userInput="{{US_Address_NY.state}}" stepKey="checkCustomerRegion" />
6666
<grabValueFrom selector="{{CheckoutCartSummarySection.postcode}}" stepKey="grabTextPostCode"/>
6767
<assertEquals message="Customer postcode is invalid" stepKey="checkCustomerPostcode">
6868
<expectedResult type="string">{{US_Address_NY.postcode}}</expectedResult>

‎app/code/Magento/UrlRewrite/Test/Mftf/Section/AdminUrlRewriteIndexSection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
<section name="AdminUrlRewriteIndexSection">
1212
<element name="requestPathFilter" type="input" selector="#urlrewriteGrid_filter_request_path"/>
1313
<element name="requestPathColumnValue" type="text" selector="//*[@id='urlrewriteGrid']//tbody//td[@data-column='request_path' and normalize-space(.)='{{columnValue}}']" parameterized="true"/>
14+
<element name="targetPathColumnValue" type="text" selector="//*[@id='urlrewriteGrid']//tbody//td[@data-column='target_path' and normalize-space(.)='{{columnValue}}']" parameterized="true"/>
1415
<element name="searchButton" type="button" selector="//button[@data-ui-id='widget-button-1']" timeout="30"/>
1516
<element name="emptyRecordMessage" type="text" selector="//*[@class='empty-text']"/>
1617
<element name="requestPathColumn" type="text" selector="//tr[@data-role='row']['{{var1}}']/td[@data-column='request_path']" parameterized="true"/>

‎app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCheckUrlRewritesCorrectlyGeneratedForMultipleStoreviewsDuringProductImportTest.xml

Lines changed: 117 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,117 @@
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+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
10+
<test name="AdminCheckUrlRewritesCorrectlyGeneratedForMultipleStoreviewsDuringProductImportTest">
11+
<annotations>
12+
<features value="Url Rewrite"/>
13+
<stories value="Url Rewrites for Multiple Storeviews"/>
14+
<title value="Url Rewrites Correctly Generated for Multiple Storeviews During Product Import"/>
15+
<description value="Check Url Rewrites Correctly Generated for Multiple Storeviews During Product Import."/>
16+
<severity value="CRITICAL"/>
17+
<testCaseId value="MAGETWO-68980"/>
18+
<group value="urlRewrite"/>
19+
</annotations>
20+
<before>
21+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
22+
<!-- Create Store View EN -->
23+
<actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreViewEn">
24+
<argument name="customStore" value="customStoreENNotUnique"/>
25+
</actionGroup>
26+
<!-- Create Store View NL -->
27+
<actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreViewNl">
28+
<argument name="customStore" value="customStoreNLNotUnique"/>
29+
</actionGroup>
30+
<createData entity="ApiCategory" stepKey="createCategory">
31+
<field key="name">category-admin</field>
32+
</createData>
33+
</before>
34+
<after>
35+
<deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
36+
<actionGroup ref="deleteProductByName" stepKey="deleteImportedProduct">
37+
<argument name="sku" value="productformagetwo68980"/>
38+
<argument name="name" value="productformagetwo68980"/>
39+
</actionGroup>
40+
<actionGroup ref="clearFiltersAdminDataGrid" stepKey="clearFiltersIfSet"/>
41+
<actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreViewEn">
42+
<argument name="customStore" value="customStoreENNotUnique"/>
43+
</actionGroup>
44+
<actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreViewNl">
45+
<argument name="customStore" value="customStoreNLNotUnique"/>
46+
</actionGroup>
47+
<actionGroup ref="logout" stepKey="logout"/>
48+
</after>
49+
<actionGroup ref="switchCategoryStoreView" stepKey="switchToStoreViewEn">
50+
<argument name="Store" value="customStoreENNotUnique.name"/>
51+
<argument name="CatName" value="$$createCategory.name$$"/>
52+
</actionGroup>
53+
<uncheckOption selector="{{AdminCategoryBasicFieldSection.categoryNameUseDefault}}" stepKey="uncheckUseDefaultValueENStoreView"/>
54+
<fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="category-english" stepKey="changeNameField"/>
55+
<click selector="{{AdminCategorySEOSection.SectionHeader}}" stepKey="clickOnSectionHeader"/>
56+
<actionGroup ref="ChangeSeoUrlKeyForSubCategory" stepKey="changeSeoUrlKeyENStoreView">
57+
<argument name="value" value="category-english"/>
58+
</actionGroup>
59+
<actionGroup ref="switchCategoryStoreView" stepKey="switchToStoreViewNl">
60+
<argument name="Store" value="customStoreNLNotUnique.name"/>
61+
<argument name="CatName" value="$$createCategory.name$$"/>
62+
</actionGroup>
63+
<uncheckOption selector="{{AdminCategoryBasicFieldSection.categoryNameUseDefault}}" stepKey="uncheckUseDefaultValue1"/>
64+
<fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="category-dutch" stepKey="changeNameFieldNLStoreView"/>
65+
<click selector="{{AdminCategorySEOSection.SectionHeader}}" stepKey="clickOnSectionHeader2"/>
66+
<actionGroup ref="ChangeSeoUrlKeyForSubCategory" stepKey="changeSeoUrlKeyNLStoreView">
67+
<argument name="value" value="category-dutch"/>
68+
</actionGroup>
69+
<amOnPage url="{{AdminImportIndexPage.url}}" stepKey="navigateToSystemImport"/>
70+
<selectOption selector="{{AdminImportMainSection.entityType}}" userInput="Products" stepKey="selectProductsOption"/>
71+
<waitForElementVisible selector="{{AdminImportMainSection.importBehavior}}" stepKey="waitForImportBehaviorElementVisible"/>
72+
<selectOption selector="{{AdminImportMainSection.importBehavior}}" userInput="Add/Update" stepKey="selectAddUpdateOption"/>
73+
<attachFile selector="{{AdminImportMainSection.selectFileToImport}}" userInput="import_updated.csv" stepKey="attachFileForImport"/>
74+
<click selector="{{AdminImportHeaderSection.checkDataButton}}" stepKey="clickCheckDataButton"/>
75+
<see selector="{{AdminMessagesSection.notice}}" userInput="Checked rows: 3, checked entities: 1, invalid rows: 0, total errors: 0" stepKey="assertNotice"/>
76+
<see selector="{{AdminMessagesSection.successMessage}}" userInput="File is valid! To start import process press &quot;Import&quot; button" stepKey="assertSuccessMessage"/>
77+
<click selector="{{AdminImportMainSection.importButton}}" stepKey="clickImportButton"/>
78+
<see selector="{{AdminMessagesSection.successMessage}}" userInput="Import successfully done" stepKey="assertSuccessMessage1"/>
79+
<see selector="{{AdminMessagesSection.notice}}" userInput="Created: 1, Updated: 0, Deleted: 0" stepKey="assertNotice1"/>
80+
<actionGroup ref="SearchForProductOnBackendByNameActionGroup" stepKey="searchForProductOnBackend">
81+
<argument name="productName" value="productformagetwo68980"/>
82+
</actionGroup>
83+
<click selector="{{AdminProductGridSection.productRowBySku('productformagetwo68980')}}" stepKey="clickOnProductRow"/>
84+
<grabFromCurrentUrl regex="~/id/(\d+)/~" stepKey="grabProductIdFromUrl"/>
85+
<amOnPage url="{{AdminUrlRewriteIndexPage.url}}" stepKey="goToUrlRewritesIndexPage"/>
86+
87+
<fillField selector="{{AdminUrlRewriteIndexSection.requestPathFilter}}" userInput="category-english.html" stepKey="inputCategoryUrlForENStoreView"/>
88+
<click selector="{{AdminDataGridHeaderSection.applyFilters}}" stepKey="clickSearchButton"/>
89+
<seeElement selector="{{AdminUrlRewriteIndexSection.requestPathColumnValue('category-english.html')}}" stepKey="seeUrlInRequestPathColumn"/>
90+
<seeElement selector="{{AdminUrlRewriteIndexSection.targetPathColumnValue(catalog/category/view/id/$$createCategory.id$$)}}" stepKey="seeUrlInTargetPathColumn"/>
91+
92+
<fillField selector="{{AdminUrlRewriteIndexSection.requestPathFilter}}" userInput="category-dutch.html" stepKey="inputCategoryUrlForNLStoreView"/>
93+
<click selector="{{AdminDataGridHeaderSection.applyFilters}}" stepKey="clickSearchButton1"/>
94+
<seeElement selector="{{AdminUrlRewriteIndexSection.requestPathColumnValue('category-dutch.html')}}" stepKey="seeUrlInRequestPathColumn1"/>
95+
<seeElement selector="{{AdminUrlRewriteIndexSection.targetPathColumnValue(catalog/category/view/id/$$createCategory.id$$)}}" stepKey="seeUrlInTargetPathColumn1"/>
96+
97+
<fillField selector="{{AdminUrlRewriteIndexSection.requestPathFilter}}" userInput="productformagetwo68980-english.html" stepKey="inputProductUrlForENStoreView"/>
98+
<click selector="{{AdminDataGridHeaderSection.applyFilters}}" stepKey="clickSearchButton2"/>
99+
<seeElement selector="{{AdminUrlRewriteIndexSection.requestPathColumnValue('productformagetwo68980-english.html')}}" stepKey="seeUrlInRequestPathColumn2"/>
100+
<seeElement selector="{{AdminUrlRewriteIndexSection.targetPathColumnValue('catalog/product/view/id/$grabProductIdFromUrl')}}" stepKey="seeUrlInTargetPathColumn2"/>
101+
102+
<fillField selector="{{AdminUrlRewriteIndexSection.requestPathFilter}}" userInput="productformagetwo68980-dutch.html" stepKey="inputProductUrlForENStoreView1"/>
103+
<click selector="{{AdminDataGridHeaderSection.applyFilters}}" stepKey="clickSearchButton3"/>
104+
<seeElement selector="{{AdminUrlRewriteIndexSection.requestPathColumnValue('productformagetwo68980-dutch.html')}}" stepKey="seeUrlInRequestPathColumn3"/>
105+
<seeElement selector="{{AdminUrlRewriteIndexSection.targetPathColumnValue('catalog/product/view/id/$grabProductIdFromUrl')}}" stepKey="seeUrlInTargetPathColumn3"/>
106+
107+
<fillField selector="{{AdminUrlRewriteIndexSection.requestPathFilter}}" userInput="category-english/productformagetwo68980-english.html" stepKey="inputProductUrlForENStoreView2"/>
108+
<click selector="{{AdminDataGridHeaderSection.applyFilters}}" stepKey="clickSearchButton4"/>
109+
<seeElement selector="{{AdminUrlRewriteIndexSection.requestPathColumnValue('category-english/productformagetwo68980-english.html')}}" stepKey="seeUrlInRequestPathColumn4"/>
110+
<seeElement selector="{{AdminUrlRewriteIndexSection.targetPathColumnValue(catalog/product/view/id/$grabProductIdFromUrl/category/$$createCategory.id$$)}}" stepKey="seeUrlInTargetPathColumn4"/>
111+
112+
<fillField selector="{{AdminUrlRewriteIndexSection.requestPathFilter}}" userInput="category-dutch/productformagetwo68980-dutch.html" stepKey="inputProductUrlForENStoreView3"/>
113+
<click selector="{{AdminDataGridHeaderSection.applyFilters}}" stepKey="clickSearchButton5"/>
114+
<seeElement selector="{{AdminUrlRewriteIndexSection.requestPathColumnValue('category-dutch/productformagetwo68980-dutch.html')}}" stepKey="seeUrlInRequestPathColumn5"/>
115+
<seeElement selector="{{AdminUrlRewriteIndexSection.targetPathColumnValue(catalog/product/view/id/$grabProductIdFromUrl/category/$$createCategory.id$$)}}" stepKey="seeUrlInTargetPathColumn5"/>
116+
</test>
117+
</tests>

‎dev/tests/acceptance/tests/_data/import_updated.csv

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
product_websites,store_view_code,attribute_set_code,product_type,categories,sku,price,name,url_key
2+
base,,Default,simple,Default Category/category-admin,productformagetwo68980,123,productformagetwo68980,productformagetwo68980
3+
,en,Default,simple,,productformagetwo68980,,productformagetwo68980-english,productformagetwo68980-english
4+
,nl,Default,simple,,productformagetwo68980,,productformagetwo68980-dutch,productformagetwo68980-dutch

0 commit comments

Comments
 (0)