Skip to content

Commit 730c576

Browse files
zakdmazakdma
committed
MC-15406: [FT] [MFTF] StorefrontPurchaseProductCustomOptionsDifferentStoreViewsTest fails because of bad design
1 parent f3d7a0d commit 730c576

File tree

4 files changed

+53
-43
lines changed

4 files changed

+53
-43
lines changed

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

Lines changed: 49 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,12 @@
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"/>
7072
</after>
7173

7274
<!-- Open Product Grid, Filter product and open -->
@@ -78,8 +80,9 @@
7880
<argument name="product" value="_defaultProduct"/>
7981
</actionGroup>
8082

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

8487
<!-- Update Product with Option Value DropDown 1-->
8588
<conditionalClick selector="{{AdminProductCustomizableOptionsSection.customizableOptions}}" dependentSelector="{{AdminProductCustomizableOptionsSection.checkIfCustomizableOptionsTabOpen}}" visible="true" stepKey="clickIfContentTabCloses2"/>
@@ -101,15 +104,12 @@
101104
<click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton1"/>
102105

103106
<!-- 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"/>
107+
<actionGroup ref="AdminSwitchStoreViewActionGroup" stepKey="switchToStoreFR">
108+
<argument name="storeView" value="customStoreFR.name"/>
109+
</actionGroup>
109110

110111
<!-- Open tab Customizable Options -->
111112

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

115115
<!-- Update Option Customizable Options and Option Value 1-->
@@ -129,11 +129,9 @@
129129

130130
<!-- Login Customer Storefront -->
131131

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"/>
132+
<actionGroup ref="LoginToStorefrontActionGroup" stepKey="customerLogin">
133+
<argument name="Customer" value="$$createCustomer$$" />
134+
</actionGroup>
137135

138136
<!-- Go to Product Page -->
139137

@@ -176,24 +174,29 @@
176174

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

182178
<!-- Place Order -->
183179

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

187193
<grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber22}}" stepKey="grabOrderNumber"/>
188194

189195
<!-- Open Order -->
190196

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"/>
197+
<actionGroup ref="filterOrderGridById" stepKey="openOrdersGrid">
198+
<argument name="orderId" value="{$grabOrderNumber}"/>
199+
</actionGroup>
197200
<click selector="{{AdminOrdersGridSection.firstRow}}" stepKey="clickOrderRow"/>
198201
<waitForPageLoad time="30" stepKey="waitForPageLoad10"/>
199202

@@ -205,14 +208,12 @@
205208
<!-- Switch to FR Store View Storefront -->
206209

207210
<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"/>
213211

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

217218
<seeElement selector="{{StorefrontProductInfoMainSection.productOptionDropDownTitle('FR Custom Options 1')}}" stepKey="seeProductFrOptionDropDownTitle"/>
218219
<seeElement selector="{{StorefrontProductInfoMainSection.productOptionDropDownOptionTitle('FR Custom Options 1', 'FR option1')}}" stepKey="productFrOptionDropDownOptionTitle1"/>
@@ -250,13 +251,22 @@
250251

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

256255
<!-- Place Order -->
257256

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

261271
<!-- Open Product Grid, Filter product and open -->
262272

@@ -296,8 +306,7 @@
296306

297307
<!--Go to Product Page-->
298308

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

302311
<seeElement selector="{{StorefrontProductInfoMainSection.productOptionDropDownTitle('Custom Options 1')}}" stepKey="seeProductOptionDropDownTitle1"/>
303312
<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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
<waitForElementVisible selector="{{AdminConfirmationModalSection.ok}}" stepKey="waitForModal" />
2626
<see selector="{{AdminConfirmationModalSection.title}}" userInput="Warning message" stepKey="seeWarningAboutTakingALongTimeToComplete" />
2727
<click selector="{{AdminConfirmationModalSection.ok}}" stepKey="confirmModal" />
28-
<waitForPageLoad stepKey="waitForStorePageLoad" />
29-
<waitForElementNotVisible selector="{{AdminNewStoreViewActionsSection.loadingMask}}" stepKey="waitForElementVisible"/>
28+
<waitForElementVisible selector="{{AdminMessagesSection.success}}" stepKey="waitForPageReolad"/>
29+
<see selector="{{AdminMessagesSection.success}}" userInput="You saved the store view." stepKey="seeSavedMessage" />
3030
</actionGroup>
3131
<!--Save the Store view-->
3232
<actionGroup name="AdminCreateStoreViewActionSaveGroup">

‎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">

0 commit comments

Comments
 (0)