Skip to content

Commit 7559c68

Browse files
ameysarameysar
committed
Merge remote-tracking branch 'origin/2.2-develop-pr40' into 2.2-develop-pr40
2 parents 0034c37 + e5ebfc3 commit 7559c68

File tree

2 files changed

+26
-17
lines changed

2 files changed

+26
-17
lines changed

‎app/code/Magento/Catalog/Test/Mftf/Section/AdminProductCustomizableOptionsSection.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<element name="addOptionBtn" type="button" selector="button[data-index='button_add']"/>
1717
<element name="fillOptionTitle" type="input" selector="//span[text()='{{var1}}']/parent::div/parent::div/parent::div//label[text()='Option Title']/parent::span/parent::div//input[@class='admin__control-text']" parameterized="true"/>
1818
<element name="checkSelect" type="select" selector="//span[text()='{{var1}}']/parent::div/parent::div/parent::div//label[text()='Option Type']/parent::span/parent::div//div[@data-role='selected-option']" parameterized="true"/>
19-
<element name="checkDropDown" type="select" selector="//span[text()='{{var1}}']/parent::div/parent::div/parent::div//parent::label/parent::div//li[@class='admin__action-multiselect-menu-inner-item']//label[text()='Drop-down']" parameterized="true"/>
19+
<element name="checkDropDown" type="select" selector="//span[text()='{{var1}}']/ancestor::div[@class='fieldset-wrapper-title']/following-sibling::div[@data-role='collapsible-content']//div[@data-index='type']//div[contains(@class, 'action-menu')]//li[@class='admin__action-multiselect-menu-inner-item']//label[text()='Drop-down']" parameterized="true"/>
2020
<element name="clickAddValue" type="button" selector="//span[text()='{{var1}}']/parent::div/parent::div/parent::div//tfoot//button" parameterized="true"/>
2121
<element name="fillOptionValueTitle" type="input" selector="//span[text()='{{var1}}']/parent::div/parent::div/parent::div//tbody/tr[@data-repeat-index='{{var2}}']//label[text()='Title']/parent::span/parent::div//div[@class='admin__field-control']/input" parameterized="true"/>
2222
<element name="fillOptionValuePrice" type="input" selector="//span[text()='{{var1}}']/parent::div/parent::div/parent::div//tbody/tr[@data-repeat-index='{{var2}}']//span[text()='Price']/parent::label/parent::div//div[@class='admin__control-addon']/input" parameterized="true"/>

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

Lines changed: 25 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
<severity value="CRITICAL"/>
1717
<testCaseId value="MAGETWO-77831"/>
1818
<group value="product"/>
19-
<group value="skip"/><!-- MAGETWO-91215 -->
2019
</annotations>
2120

2221
<before>
@@ -68,19 +67,19 @@
6867
<!-- Open Product Grid, Filter product and open -->
6968

7069
<amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductGridPage"/>
71-
<waitForPageLoad time="30" stepKey="waitForPageLoad"/>
70+
<waitForPageLoad time="30" stepKey="waitForPageLoad1"/>
7271

7372
<actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="filterGroupedProductOptions">
7473
<argument name="product" value="_defaultProduct"/>
7574
</actionGroup>
7675
<click selector="{{AdminProductGridSection.productGridXRowYColumnButton('1', '2')}}" stepKey="openProductForEdit"/>
77-
<waitForPageLoad time="30" stepKey="waitForPageLoad1"/>
76+
<waitForPageLoad time="30" stepKey="waitForPageLoad2"/>
7877

7978
<!-- Update Product with Option Value DropDown 1-->
8079

8180
<conditionalClick selector="{{AdminProductCustomizableOptionsSection.customizableOptions}}" dependentSelector="{{AdminProductCustomizableOptionsSection.checkIfCustomizableOptionsTabOpen}}" visible="true" stepKey="clickIfContentTabCloses2"/>
8281
<click selector="{{AdminProductCustomizableOptionsSection.addOptionBtn}}" stepKey="checkAddOption1"/>
83-
<waitForPageLoad time="10" stepKey="waitForPageLoad7"/>
82+
<waitForPageLoad time="10" stepKey="waitForPageLoad3"/>
8483
<fillField selector="{{AdminProductCustomizableOptionsSection.fillOptionTitle('New Option')}}" userInput="Custom Options 1" stepKey="fillOptionTitle1"/>
8584
<click selector="{{AdminProductCustomizableOptionsSection.checkSelect('Custom Options 1')}}" stepKey="clickSelect1"/>
8685
<click selector="{{AdminProductCustomizableOptionsSection.checkDropDown('Custom Options 1')}}" stepKey="clickDropDown1"/>
@@ -98,18 +97,20 @@
9897

9998
<!-- Switcher to Store FR-->
10099

100+
<scrollToTopOfPage stepKey="scrollToTopOfPage1"/>
101+
101102
<click selector="{{AdminProductFormActionSection.changeStoreButton}}" stepKey="clickStoreSwitcher"/>
102103
<click selector="{{AdminProductFormActionSection.selectStoreView(customStoreFR.name)}}" stepKey="clickStoreView"/>
103104
<click selector="{{AdminConfirmationModalSection.ok}}" stepKey="acceptMessage"/>
104105

105106
<!-- Open tab Customizable Options -->
106107

107-
<waitForPageLoad time="10" stepKey="waitForPageLoad2"/>
108+
<waitForPageLoad time="10" stepKey="waitForPageLoad4"/>
108109
<conditionalClick selector="{{AdminProductCustomizableOptionsSection.customizableOptions}}" dependentSelector="{{AdminProductCustomizableOptionsSection.checkIfCustomizableOptionsTabOpen}}" visible="true" stepKey="clickIfContentTabCloses3"/>
109110

110111
<!-- Update Option Customizable Options and Option Value 1-->
111112

112-
<waitForPageLoad time="30" stepKey="waitForPageLoad8"/>
113+
<waitForPageLoad time="30" stepKey="waitForPageLoad5"/>
113114
<uncheckOption selector="{{AdminProductCustomizableOptionsSection.useDefaultOptionTitle}}" stepKey="uncheckUseDefaultOptionTitle"/>
114115
<fillField selector="{{AdminProductCustomizableOptionsSection.fillOptionTitle('Custom Options 1')}}" userInput="FR Custom Options 1" stepKey="fillOptionTitle2"/>
115116
<uncheckOption selector="{{AdminProductCustomizableOptionsSection.useDefaultOptionValueTitleByIndex('0')}}" stepKey="uncheckUseDefaultOptionValueTitle1"/>
@@ -125,13 +126,15 @@
125126
<!-- Login Customer Storefront -->
126127

127128
<amOnPage url="{{StorefrontCustomerSignInPage.url}}" stepKey="amOnSignInPage"/>
129+
<waitForPageLoad time="30" stepKey="waitForPageLoad6"/>
128130
<fillField userInput="$$createCustomer.email$$" selector="{{StorefrontCustomerSignInFormSection.emailField}}" stepKey="fillEmail"/>
129131
<fillField userInput="$$createCustomer.password$$" selector="{{StorefrontCustomerSignInFormSection.passwordField}}" stepKey="fillPassword"/>
130132
<click selector="{{StorefrontCustomerSignInFormSection.signInAccountButton}}" stepKey="clickSignInAccountButton"/>
131133

132134
<!-- Go to Product Page -->
133135

134136
<amOnPage url="{{StorefrontHomePage.url}}$$createProduct.custom_attributes[url_key]$$.html" stepKey="amOnProduct1Page"/>
137+
<waitForPageLoad time="30" stepKey="waitForPageLoad7"/>
135138

136139
<seeElement selector="{{StorefrontProductInfoMainSection.productOptionDropDownTitle('Custom Options 1')}}" stepKey="seeProductOptionDropDownTitle"/>
137140
<seeElement selector="{{StorefrontProductInfoMainSection.productOptionDropDownOptionTitle('Custom Options 1', 'option1')}}" stepKey="seeproductOptionDropDownOptionTitle1"/>
@@ -172,22 +175,24 @@
172175
<conditionalClick selector="{{CheckoutPaymentSection.productOptionsByProductItemPrice('150')}}" dependentSelector="{{CheckoutPaymentSection.productOptionsActiveByProductItemPrice('150')}}" visible="false" stepKey="exposeProductOptions1"/>
173176
<see selector="{{CheckoutPaymentSection.productOptionsActiveByProductItemPrice('150')}}" userInput="option2" stepKey="seeProductOptionValueDropdown1Input2"/>
174177
<click selector="{{CheckoutShippingSection.next}}" stepKey="clickNext"/>
178+
<waitForPageLoad time="30" stepKey="waitForPageLoad8"/>
175179

176180
<!-- Place Order -->
177181

178-
<waitForElement selector="{{CheckoutPaymentSection.placeOrder}}" time="30" stepKey="waitForPlaceOrderButton"/>
182+
<actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyOrder1"/>
179183
<click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrder"/>
180184

181185
<grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber22}}" stepKey="grabOrderNumber"/>
182186

183187
<!-- Open Order -->
184188

185189
<amOnPage url="{{AdminOrdersPage.url}}" stepKey="onOrdersPage"/>
186-
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMask3"/>
190+
<waitForPageLoad time="30" stepKey="waitForPageLoad9"/>
187191
<fillField selector="{{OrdersGridSection.search}}" userInput="{$grabOrderNumber}" stepKey="fillOrderNum"/>
188192
<click selector="{{OrdersGridSection.submitSearch}}" stepKey="submitSearch"/>
189193
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMask4"/>
190194
<click selector="{{OrdersGridSection.firstRow}}" stepKey="clickOrderRow"/>
195+
<waitForPageLoad time="30" stepKey="waitForPageLoad10"/>
191196

192197
<!-- Checking the correctness of displayed custom options for user parameters on Order -->
193198

@@ -197,12 +202,14 @@
197202
<!-- Switch to FR Store View Storefront -->
198203

199204
<amOnPage url="{{StorefrontHomePage.url}}" stepKey="amOnProduct4Page"/>
205+
<waitForPageLoad time="30" stepKey="waitForPageLoad11"/>
200206
<click selector="{{StorefrontHeaderSection.storeViewSwitcher}}" stepKey="clickStoreViewSwitcher1"/>
201207
<waitForElementVisible selector="{{StorefrontHeaderSection.storeViewDropdown}}" stepKey="waitForStoreViewDropdown1"/>
202208
<click selector="{{StorefrontHeaderSection.storeViewOption(customStoreFR.code)}}" stepKey="selectStoreView1"/>
203-
<waitForPageLoad stepKey="waitForPageLoad4"/>
209+
<waitForPageLoad stepKey="waitForPageLoad12"/>
204210

205211
<amOnPage url="{{StorefrontHomePage.url}}$$createProduct.custom_attributes[url_key]$$.html" stepKey="amOnProduct2Page"/>
212+
<waitForPageLoad time="30" stepKey="waitForPageLoad13"/>
206213

207214
<seeElement selector="{{StorefrontProductInfoMainSection.productOptionDropDownTitle('FR Custom Options 1')}}" stepKey="seeProductFrOptionDropDownTitle"/>
208215
<seeElement selector="{{StorefrontProductInfoMainSection.productOptionDropDownOptionTitle('FR Custom Options 1', 'FR option1')}}" stepKey="productFrOptionDropDownOptionTitle1"/>
@@ -243,49 +250,51 @@
243250
<conditionalClick selector="{{CheckoutPaymentSection.productOptionsByProductItemPrice('150')}}" dependentSelector="{{CheckoutPaymentSection.productOptionsActiveByProductItemPrice('150')}}" visible="false" stepKey="exposeProductOptions3"/>
244251
<see selector="{{CheckoutPaymentSection.productOptionsActiveByProductItemPrice('150')}}" userInput="FR option2" stepKey="seeProductFrOptionValueDropdown1Input3"/>
245252
<click selector="{{CheckoutShippingSection.next}}" stepKey="clickNext1"/>
253+
<waitForPageLoad time="30" stepKey="waitForPageLoad14"/>
246254

247255
<!-- Place Order -->
248256

249-
<waitForElement selector="{{CheckoutPaymentSection.placeOrder}}" time="30" stepKey="waitForPlaceOrderButton1"/>
257+
<actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyOrder2"/>
250258
<click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrder1"/>
251259

252260
<!-- Open Product Grid, Filter product and open -->
253261

254262
<amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductGridPage1"/>
255-
<waitForPageLoad time="30" stepKey="waitForPageLoad5"/>
263+
<waitForPageLoad time="30" stepKey="waitForPageLoad15"/>
256264

257265
<actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="filterGroupedProductOptions1">
258266
<argument name="product" value="_defaultProduct"/>
259267
</actionGroup>
260268
<click selector="{{AdminProductGridSection.productGridXRowYColumnButton('1', '2')}}" stepKey="openProductForEdit1"/>
261-
<waitForPageLoad time="30" stepKey="waitForPageLoad6"/>
269+
<waitForPageLoad time="30" stepKey="waitForPageLoad16"/>
262270

263271
<!-- Switcher to Store FR-->
264-
272+
<scrollToTopOfPage stepKey="scrollToTopOfPage2"/>
265273
<click selector="{{AdminProductFormActionSection.changeStoreButton}}" stepKey="clickStoreSwitcher1"/>
266274
<click selector="{{AdminProductFormActionSection.selectStoreView(customStoreFR.name)}}" stepKey="clickStoreView1"/>
267275
<click selector="{{AdminConfirmationModalSection.ok}}" stepKey="acceptMessage1"/>
268276

269277
<!-- Open tab Customizable Options -->
270278

271-
<waitForPageLoad time="30" stepKey="waitForPageLoad9"/>
279+
<waitForPageLoad time="30" stepKey="waitForPageLoad17"/>
272280
<conditionalClick selector="{{AdminProductCustomizableOptionsSection.customizableOptions}}" dependentSelector="{{AdminProductCustomizableOptionsSection.checkIfCustomizableOptionsTabOpen}}" visible="true" stepKey="clickIfContentTabCloses4" />
273281

274282
<!-- Update Option Customizable Options and Option Value 1-->
275283

276-
<waitForPageLoad time="30" stepKey="waitForPageLoad10"/>
284+
<waitForPageLoad time="30" stepKey="waitForPageLoad18"/>
277285
<checkOption selector="{{AdminProductCustomizableOptionsSection.useDefaultOptionTitle}}" stepKey="checkUseDefaultOptionTitle"/>
278286
<checkOption selector="{{AdminProductCustomizableOptionsSection.useDefaultOptionValueTitleByIndex('0')}}" stepKey="checkUseDefaultOptionValueTitle1"/>
279287

280288
<!-- Update Product with Option Value 1 DropDown 1-->
281289

282-
<waitForPageLoad time="30" stepKey="waitForPageLoad11"/>
290+
<waitForPageLoad time="30" stepKey="waitForPageLoad19"/>
283291
<checkOption selector="{{AdminProductCustomizableOptionsSection.useDefaultOptionValueTitleByIndex('1')}}" stepKey="checkUseDefaultOptionValueTitle2"/>
284292
<click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton3"/>
285293

286294
<!--Go to Product Page-->
287295

288296
<amOnPage url="{{StorefrontHomePage.url}}$$createProduct.custom_attributes[url_key]$$.html" stepKey="amOnProduct2Page2"/>
297+
<waitForPageLoad time="30" stepKey="waitForPageLoad20"/>
289298

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

0 commit comments

Comments
 (0)