Skip to content

Commit aa80b26

Browse files
committed
Merge remote-tracking branch 'origin/MC-15406' into 2.3-develop-pr44
2 parents deee893 + 1688e1e commit aa80b26

File tree

6 files changed

+82
-69
lines changed

6 files changed

+82
-69
lines changed

app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductCustomOptionsDifferentStoreViewsTest.xml

Lines changed: 51 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,6 @@
5252
<deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
5353
<deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
5454

55-
<!-- Reset Product filter -->
56-
57-
<actionGroup ref="ClearProductsFilterActionGroup" stepKey="clearProductsFilter"/>
58-
5955
<!-- Delete Store View EN -->
6056

6157
<actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreView1">
@@ -67,6 +63,14 @@
6763
<actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreView2">
6864
<argument name="customStore" value="customStoreFR"/>
6965
</actionGroup>
66+
<actionGroup ref="clearFiltersAdminDataGrid" stepKey="clearWebsitesGridFilters"/>
67+
68+
<actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrdersGridFilter"/>
69+
70+
<amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductGridPage"/>
71+
<actionGroup ref="clearFiltersAdminDataGrid" stepKey="clearProductsGridFilters"/>
72+
<actionGroup ref="logout" stepKey="logout"/>
73+
<actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="customerLogoutStorefront"/>
7074
</after>
7175

7276
<!-- Open Product Grid, Filter product and open -->
@@ -78,8 +82,9 @@
7882
<argument name="product" value="_defaultProduct"/>
7983
</actionGroup>
8084

81-
<click selector="{{AdminProductGridSection.productGridXRowYColumnButton('1', '2')}}" stepKey="openProductForEdit"/>
82-
<waitForPageLoad time="30" stepKey="waitForPageLoad2"/>
85+
<actionGroup ref="OpenEditProductOnBackendActionGroup" stepKey="openEditProductPage">
86+
<argument name="product" value="$$createProduct$$"/>
87+
</actionGroup>
8388

8489
<!-- Update Product with Option Value DropDown 1-->
8590
<conditionalClick selector="{{AdminProductCustomizableOptionsSection.customizableOptions}}" dependentSelector="{{AdminProductCustomizableOptionsSection.checkIfCustomizableOptionsTabOpen}}" visible="true" stepKey="clickIfContentTabCloses2"/>
@@ -101,15 +106,12 @@
101106
<click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton1"/>
102107

103108
<!-- Switcher to Store FR-->
104-
<scrollToTopOfPage stepKey="scrollToTopOfPage1"/>
105-
106-
<click selector="{{AdminProductFormActionSection.changeStoreButton}}" stepKey="clickStoreSwitcher"/>
107-
<click selector="{{AdminProductFormActionSection.selectStoreView(customStoreFR.name)}}" stepKey="clickStoreView"/>
108-
<click selector="{{AdminConfirmationModalSection.ok}}" stepKey="acceptMessage"/>
109+
<actionGroup ref="AdminSwitchStoreViewActionGroup" stepKey="switchToStoreFR">
110+
<argument name="storeView" value="customStoreFR.name"/>
111+
</actionGroup>
109112

110113
<!-- Open tab Customizable Options -->
111114

112-
<waitForPageLoad time="10" stepKey="waitForPageLoad4"/>
113115
<conditionalClick selector="{{AdminProductCustomizableOptionsSection.customizableOptions}}" dependentSelector="{{AdminProductCustomizableOptionsSection.checkIfCustomizableOptionsTabOpen}}" visible="true" stepKey="clickIfContentTabCloses3"/>
114116

115117
<!-- Update Option Customizable Options and Option Value 1-->
@@ -129,11 +131,9 @@
129131

130132
<!-- Login Customer Storefront -->
131133

132-
<amOnPage url="{{StorefrontCustomerSignInPage.url}}" stepKey="amOnSignInPage"/>
133-
<waitForPageLoad time="30" stepKey="waitForPageLoad6"/>
134-
<fillField userInput="$$createCustomer.email$$" selector="{{StorefrontCustomerSignInFormSection.emailField}}" stepKey="fillEmail"/>
135-
<fillField userInput="$$createCustomer.password$$" selector="{{StorefrontCustomerSignInFormSection.passwordField}}" stepKey="fillPassword"/>
136-
<click selector="{{StorefrontCustomerSignInFormSection.signInAccountButton}}" stepKey="clickSignInAccountButton"/>
134+
<actionGroup ref="LoginToStorefrontActionGroup" stepKey="customerLogin">
135+
<argument name="Customer" value="$$createCustomer$$" />
136+
</actionGroup>
137137

138138
<!-- Go to Product Page -->
139139

@@ -176,24 +176,29 @@
176176

177177
<conditionalClick selector="{{CheckoutPaymentSection.productOptionsByProductItemPrice('150')}}" dependentSelector="{{CheckoutPaymentSection.productOptionsActiveByProductItemPrice('150')}}" visible="false" stepKey="exposeProductOptions1"/>
178178
<see selector="{{CheckoutPaymentSection.productOptionsActiveByProductItemPrice('150')}}" userInput="option2" stepKey="seeProductOptionValueDropdown1Input2"/>
179-
<click selector="{{CheckoutShippingSection.next}}" stepKey="clickNext"/>
180-
<waitForPageLoad time="30" stepKey="waitForPageLoad8"/>
181179

182180
<!-- Place Order -->
183181

184-
<actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyOrder1"/>
185-
<click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrder"/>
182+
<!--Select shipping method-->
183+
<actionGroup ref="CheckoutSelectFlatRateShippingMethodActionGroup" stepKey="selectFlatRateShippingMethod"/>
184+
<waitForElementVisible selector="{{CheckoutShippingSection.next}}" time="30" stepKey="waitForNextButton"/>
185+
<click selector="{{CheckoutShippingSection.next}}" stepKey="clickNext"/>
186+
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskAfterClickNext"/>
187+
<!--Select payment method-->
188+
<actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectPaymentMethod"/>
189+
<!-- Place Order -->
190+
<actionGroup ref="CheckoutPlaceOrderActionGroup" stepKey="customerPlaceOrder">
191+
<argument name="orderNumberMessage" value="CONST.successCheckoutOrderNumberMessage"/>
192+
<argument name="emailYouMessage" value="CONST.successCheckoutEmailYouMessage"/>
193+
</actionGroup>
186194

187195
<grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber22}}" stepKey="grabOrderNumber"/>
188196

189197
<!-- Open Order -->
190198

191-
<amOnPage url="{{AdminOrdersPage.url}}" stepKey="onOrdersPage"/>
192-
<waitForPageLoad stepKey="waitForPageLoadOrdersPage"/>
193-
<conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="clearFilters" />
194-
<fillField selector="{{AdminOrdersGridSection.search}}" userInput="{$grabOrderNumber}" stepKey="fillOrderNum"/>
195-
<click selector="{{AdminOrdersGridSection.submitSearch}}" stepKey="submitSearchOrderNum"/>
196-
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappearOnSearch"/>
199+
<actionGroup ref="filterOrderGridById" stepKey="openOrdersGrid">
200+
<argument name="orderId" value="{$grabOrderNumber}"/>
201+
</actionGroup>
197202
<click selector="{{AdminOrdersGridSection.firstRow}}" stepKey="clickOrderRow"/>
198203
<waitForPageLoad time="30" stepKey="waitForPageLoad10"/>
199204

@@ -205,14 +210,12 @@
205210
<!-- Switch to FR Store View Storefront -->
206211

207212
<amOnPage url="{{StorefrontHomePage.url}}" stepKey="amOnProduct4Page"/>
208-
<waitForPageLoad time="30" stepKey="waitForPageLoad11"/>
209-
<click selector="{{StorefrontHeaderSection.storeViewSwitcher}}" stepKey="clickStoreViewSwitcher1"/>
210-
<waitForElementVisible selector="{{StorefrontHeaderSection.storeViewDropdown}}" stepKey="waitForStoreViewDropdown1"/>
211-
<click selector="{{StorefrontHeaderSection.storeViewOption(customStoreFR.code)}}" stepKey="selectStoreView1"/>
212-
<waitForPageLoad stepKey="waitForPageLoad12"/>
213213

214-
<amOnPage url="{{StorefrontHomePage.url}}$$createProduct.custom_attributes[url_key]$$.html" stepKey="amOnProduct2Page"/>
215-
<waitForPageLoad time="30" stepKey="waitForPageLoad13"/>
214+
<actionGroup ref="StorefrontSwitchStoreViewActionGroup" stepKey="switchStore">
215+
<argument name="storeView" value="customStoreFR"/>
216+
</actionGroup>
217+
218+
<amOnPage url="{{StorefrontProductPage.url($$createProduct.custom_attributes[url_key]$$)}}" stepKey="amOnProduct2Page"/>
216219

217220
<seeElement selector="{{StorefrontProductInfoMainSection.productOptionDropDownTitle('FR Custom Options 1')}}" stepKey="seeProductFrOptionDropDownTitle"/>
218221
<seeElement selector="{{StorefrontProductInfoMainSection.productOptionDropDownOptionTitle('FR Custom Options 1', 'FR option1')}}" stepKey="productFrOptionDropDownOptionTitle1"/>
@@ -250,13 +253,22 @@
250253

251254
<conditionalClick selector="{{CheckoutPaymentSection.productOptionsByProductItemPrice('150')}}" dependentSelector="{{CheckoutPaymentSection.productOptionsActiveByProductItemPrice('150')}}" visible="false" stepKey="exposeProductOptions3"/>
252255
<see selector="{{CheckoutPaymentSection.productOptionsActiveByProductItemPrice('150')}}" userInput="FR option2" stepKey="seeProductFrOptionValueDropdown1Input3"/>
253-
<click selector="{{CheckoutShippingSection.next}}" stepKey="clickNext1"/>
254-
<waitForPageLoad time="30" stepKey="waitForPageLoad14"/>
255256

256257
<!-- Place Order -->
257258

258-
<actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyOrder2"/>
259-
<click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrder1"/>
259+
<!--Select shipping method-->
260+
<actionGroup ref="CheckoutSelectFlatRateShippingMethodActionGroup" stepKey="selectFlatRateShippingMethod2"/>
261+
<waitForElementVisible selector="{{CheckoutShippingSection.next}}" time="30" stepKey="waitForNextButton2"/>
262+
<click selector="{{CheckoutShippingSection.next}}" stepKey="clickNext2"/>
263+
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskAfterClickNext2"/>
264+
265+
<!--Select payment method-->
266+
<actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectPaymentMethod2"/>
267+
<!-- Place Order -->
268+
<actionGroup ref="CheckoutPlaceOrderActionGroup" stepKey="customerPlaceOrder2">
269+
<argument name="orderNumberMessage" value="CONST.successCheckoutOrderNumberMessage"/>
270+
<argument name="emailYouMessage" value="CONST.successCheckoutEmailYouMessage"/>
271+
</actionGroup>
260272

261273
<!-- Open Product Grid, Filter product and open -->
262274

@@ -296,8 +308,7 @@
296308

297309
<!--Go to Product Page-->
298310

299-
<amOnPage url="{{StorefrontHomePage.url}}$$createProduct.custom_attributes[url_key]$$.html" stepKey="amOnProduct2Page2"/>
300-
<waitForPageLoad time="30" stepKey="waitForPageLoad20"/>
311+
<amOnPage url="{{StorefrontProductPage.url($$createProduct.custom_attributes[url_key]$$)}}" stepKey="amOnProduct2Page2"/>
301312

302313
<seeElement selector="{{StorefrontProductInfoMainSection.productOptionDropDownTitle('Custom Options 1')}}" stepKey="seeProductOptionDropDownTitle1"/>
303314
<seeElement selector="{{StorefrontProductInfoMainSection.productOptionDropDownOptionTitle('Custom Options 1', 'option1')}}" stepKey="seeProductOptionDropDownOptionTitle3"/>

app/code/Magento/Checkout/Test/Mftf/ActionGroup/CheckoutActionGroup.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@
263263
<argument name="orderNumberMessage"/>
264264
<argument name="emailYouMessage"/>
265265
</arguments>
266-
<waitForElement selector="{{CheckoutPaymentSection.placeOrder}}" time="30" stepKey="waitForPlaceOrderButton"/>
266+
<waitForElementVisible selector="{{CheckoutPaymentSection.placeOrder}}" time="30" stepKey="waitForPlaceOrderButton"/>
267267
<click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrder"/>
268268
<see selector="{{CheckoutSuccessMainSection.success}}" userInput="{{orderNumberMessage}}" stepKey="seeOrderNumber"/>
269269
<see selector="{{CheckoutSuccessMainSection.success}}" userInput="{{emailYouMessage}}" stepKey="seeEmailYou"/>

app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateStoreViewActionGroup.xml

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
<!-- Test XML Example -->
99
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
1112
<actionGroup name="AdminCreateStoreViewActionGroup">
1213
<arguments>
1314
<argument name="StoreGroup" defaultValue="_defaultStoreGroup"/>
@@ -25,20 +26,15 @@
2526
<waitForElementVisible selector="{{AdminConfirmationModalSection.ok}}" stepKey="waitForModal" />
2627
<see selector="{{AdminConfirmationModalSection.title}}" userInput="Warning message" stepKey="seeWarningAboutTakingALongTimeToComplete" />
2728
<click selector="{{AdminConfirmationModalSection.ok}}" stepKey="confirmModal" />
28-
<waitForPageLoad stepKey="waitForStorePageLoad" />
29-
<waitForElementNotVisible selector="{{AdminNewStoreViewActionsSection.loadingMask}}" stepKey="waitForElementVisible"/>
29+
<waitForElementVisible selector="{{AdminMessagesSection.success}}" stepKey="waitForPageReload"/>
30+
<see selector="{{AdminMessagesSection.success}}" userInput="You saved the store view." stepKey="seeSavedMessage" />
3031
</actionGroup>
31-
<!--Save the Store view-->
32-
<actionGroup name="AdminCreateStoreViewActionSaveGroup">
33-
<waitForLoadingMaskToDisappear stepKey="waitForGridLoad"/>
34-
<waitForElementVisible selector="{{AdminStoresGridSection.websiteFilterTextField}}" stepKey="waitForStoreGridToReload2"/>
35-
<see userInput="You saved the store view." stepKey="seeSavedMessage" />
36-
</actionGroup>
37-
<!--Save the same Store view code for code validation-->
38-
<actionGroup name="AdminCreateStoreViewCodeUniquenessActionGroup">
39-
<waitForLoadingMaskToDisappear stepKey="waitForForm"/>
40-
<see userInput="Store with the same code already exists." stepKey="seeMessage" />
32+
33+
<actionGroup name="AdminCreateStoreViewWithoutCheckActionGroup" extends="AdminCreateStoreViewActionGroup">
34+
<remove keyForRemoval="waitForPageReload"/>
35+
<remove keyForRemoval="seeSavedMessage"/>
4136
</actionGroup>
37+
4238
<actionGroup name="navigateToAdminContentManagementPage">
4339
<amOnPage url="{{AdminContentManagementPage.url}}" stepKey="navigateToConfigurationPage"/>
4440
<waitForPageLoad stepKey="waitForPageLoad1"/>

app/code/Magento/Store/Test/Mftf/ActionGroup/AdminSwitchStoreViewActionGroup.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
<waitForElementVisible selector="{{AdminConfirmationModalSection.ok}}" stepKey="waitingForInformationModal"/>
1919
<click selector="{{AdminConfirmationModalSection.ok}}" stepKey="confirmStoreSwitch"/>
2020
<waitForPageLoad stepKey="waitForStoreViewSwitched"/>
21+
<scrollToTopOfPage stepKey="scrollToStoreSwitcher"/>
2122
<see userInput="{{storeView}}" selector="{{AdminMainActionsSection.storeSwitcher}}" stepKey="seeNewStoreViewName"/>
2223
</actionGroup>
2324
<actionGroup name="AdminSwitchToAllStoreViewActionGroup" extends="AdminSwitchStoreViewActionGroup">

app/code/Magento/Store/Test/Mftf/Section/AdminStoresGridSection.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,6 @@
2424
<element name="successMessage" type="text" selector="//div[@class='message message-success success']/div"/>
2525
<element name="emptyText" type="text" selector="//tr[@class='data-grid-tr-no-data even']/td[@class='empty-text']"/>
2626
<element name="websiteName" type="text" selector="//td[@class='a-left col-website_title ']/a[contains(.,'{{websiteName}}')]" parameterized="true"/>
27+
<element name="gridCell" type="text" selector="//table[@class='data-grid']//tr[{{row}}]//td[count(//table[@class='data-grid']//tr//th[contains(., '{{column}}')]/preceding-sibling::th) +1 ]" parameterized="true"/>
2728
</section>
28-
</sections>
29+
</sections>

app/code/Magento/Store/Test/Mftf/Test/AdminCreateStoreViewTest.xml

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -11,32 +11,36 @@
1111
<annotations>
1212
<features value="Store"/>
1313
<stories value="Create a store view in admin"/>
14-
<title value="Admin should be able to create a store view"/>
15-
<description value="Admin should be able to create a store view"/>
14+
<title value="Admin shouldn't be able to create a Store View with the same code"/>
15+
<description value="Admin shouldn't be able to create a Store View with the same code"/>
1616
<group value="storeView"/>
1717
<severity value="AVERAGE"/>
18-
<testCaseId value="MAGETWO-95111"/>
18+
<useCaseId value="MAGETWO-95111"/>
19+
<testCaseId value="MC-15422"/>
1920
</annotations>
21+
2022
<before>
21-
<actionGroup ref="LoginActionGroup" stepKey="login"/>
23+
<actionGroup ref="LoginActionGroup" stepKey="loginAsAdmin"/>
2224
<actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreView" />
23-
<!--<createData stepKey="b2" entity="customStoreGroup"/>-->
2425
</before>
25-
<!--Save store view on Store Grid-->
26-
<actionGroup ref="AdminCreateStoreViewActionSaveGroup" stepKey="createStoreViewSave" />
27-
<!--Confirm new store view created on Store Grid-->
28-
<fillField selector="{{AdminStoresGridSection.storeFilterTextField}}" userInput="{{customStore.name}}" stepKey="fillStoreViewFilter"/>
29-
<click selector="{{AdminStoresGridSection.searchButton}}" stepKey="clickSearch" />
30-
<waitForPageLoad stepKey="waitForPageLoad"/>
31-
<see selector="{{AdminStoresGridSection.storeNameInFirstRow}}" userInput="{{customStore.name}}" stepKey="seeNewStoreView" />
32-
<!--Creating the same store view to validate the code uniqueness on store form-->
33-
<actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreView2" />
34-
<actionGroup ref="AdminCreateStoreViewCodeUniquenessActionGroup" stepKey="createStoreViewCode" />
26+
3527
<after>
3628
<actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreView">
3729
<argument name="customStore" value="customStore"/>
3830
</actionGroup>
31+
<click selector="{{AdminStoresGridSection.resetButton}}" stepKey="resetSearchFilter"/>
3932
<actionGroup ref="logout" stepKey="logout"/>
4033
</after>
34+
35+
<!--Filter grid and see created store view-->
36+
<amOnPage url="{{AdminSystemStorePage.url}}" stepKey="navigateToStoresIndex"/>
37+
<click selector="{{AdminStoresGridSection.resetButton}}" stepKey="resetSearchFilter"/>
38+
<fillField selector="{{AdminStoresGridSection.storeFilterTextField}}" userInput="{{customStore.name}}" stepKey="fillStoreViewFilterField"/>
39+
<click selector="{{AdminStoresGridSection.searchButton}}" stepKey="clickSearch"/>
40+
<see selector="{{AdminStoresGridSection.gridCell('1', 'Store View')}}" userInput="{{customStore.name}}" stepKey="seeNewStoreView"/>
41+
<!--Try to create store view with the same code-->
42+
<actionGroup ref="AdminCreateStoreViewWithoutCheckActionGroup" stepKey="createSameStoreView"/>
43+
<dontSeeElement selector="{{AdminMessagesSection.success}}" stepKey="dontSeeSuccessMessage"/>
44+
<see selector="{{AdminMessagesSection.error}}" userInput="Store with the same code already exists." stepKey="seeErrorMessage"/>
4145
</test>
4246
</tests>

0 commit comments

Comments
 (0)