Skip to content

Commit 0169fba

Browse files
MAGETWO-91697: [Magento Cloud] "Tier Pricing" of Products changes to "Price" (without discount) after Updated Items and Quantities
- Update automated test
1 parent 199aa0a commit 0169fba

File tree

3 files changed

+10
-3
lines changed

3 files changed

+10
-3
lines changed

app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@
182182
<waitForPageLoad stepKey="waitForPageOpened"/>
183183
<click selector="{{ProductInWebsitesSection.website(website)}}" stepKey="SelectWebsite"/>
184184
<click selector="{{AdminProductFormAdvancedPricingSection.save}}" stepKey="clickSaveProduct"/>
185-
<waitForPageLoad stepKey="waitForPageOpened1"/>
185+
<waitForPageLoad time='60' stepKey="waitForPageOpened1"/>
186186
</actionGroup>
187187

188188
<actionGroup name="ProductSetAdvancedPricing">
@@ -205,7 +205,7 @@
205205
<click selector="{{AdminProductFormAdvancedPricingSection.doneButton}}" stepKey="clickDoneButton"/>
206206
<waitForPageLoad stepKey="WaitForProductSave"/>
207207
<click selector="{{AdminProductFormAdvancedPricingSection.save}}" stepKey="clickSaveProduct1"/>
208-
<waitForPageLoad stepKey="WaitForProductSave1"/>
208+
<waitForPageLoad time="60" stepKey="WaitForProductSave1"/>
209209
<see userInput="You saved the product." stepKey="seeSaveConfirmation"/>
210210
</actionGroup>
211211

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<argument name="product" defaultValue="product"/>
1313
</arguments>
1414
<amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
15-
<waitForPageLoad time="30" stepKey="waitForProductsPageToLoad"/>
15+
<waitForPageLoad time="60" stepKey="waitForProductsPageToLoad"/>
1616
<click selector="{{AdminProductFiltersSection.filtersButton}}" stepKey="openFiltersSectionOnProductsPage"/>
1717
<conditionalClick selector="{{AdminProductFiltersSection.clearFiltersButton}}" dependentSelector="{{AdminProductFiltersSection.clearFiltersButton}}" visible="true" stepKey="cleanFiltersIfTheySet"/>
1818
<fillField userInput="{{product.sku}}" selector="{{AdminProductFiltersSection.skuInput}}" stepKey="fillSkuFieldOnFiltersSection"/>

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,7 @@
163163
<click selector="{{OrdersGridSection.selectProduct($$product3.name$$)}}" stepKey="selectProduct3"/>
164164
<fillField selector="{{OrdersGridSection.setQuantity($$product3.name$$)}}" userInput="10" stepKey="AddProductQuantity3"/>
165165
<click stepKey="addProductsToOrder" selector="{{OrdersGridSection.addProductsToOrder}}"/>
166+
<waitForLoadingMaskToDisappear stepKey="wait6"/>
166167
<!--Verify tier price values-->
167168
<grabTextFrom selector="{{OrdersGridSection.productPrice($$product1.name$$)}}" stepKey="checkProductPrice1"/>
168169
<assertEquals stepKey="verifyPrice1">
@@ -227,6 +228,7 @@
227228
<click selector="{{OrdersGridSection.selectProduct($$product3.name$$)}}" stepKey="selectProduct7"/>
228229
<fillField selector="{{OrdersGridSection.setQuantity($$product3.name$$)}}" userInput="10" stepKey="AddProductQuantity7"/>
229230
<click stepKey="addProductsToOrder1" selector="{{OrdersGridSection.addProductsToOrder}}"/>
231+
<waitForLoadingMaskToDisappear stepKey="wait7"/>
230232
<!--Verify tier price values-->
231233
<grabTextFrom selector="{{OrdersGridSection.productPrice($$product1.name$$)}}" stepKey="checkProductPrice7"/>
232234
<assertEquals stepKey="verifyPrice7">
@@ -249,9 +251,11 @@
249251
<!--Add one more product and verify values-->
250252
<waitForPageLoad stepKey="waitForPgeLoaded3"/>
251253
<click selector="{{OrdersGridSection.addProducts}}" stepKey="clickToAddProduct2"/>
254+
<waitForLoadingMaskToDisappear stepKey="wait8"/>
252255
<click selector="{{OrdersGridSection.selectProduct($$product4.name$$)}}" stepKey="selectProduct8"/>
253256
<fillField selector="{{OrdersGridSection.setQuantity($$product4.name$$)}}" userInput="10" stepKey="AddProductQuantity9"/>
254257
<click selector="{{OrdersGridSection.addProductsToOrder}}" stepKey="addProductsToOrder2"/>
258+
<waitForLoadingMaskToDisappear stepKey="wait9"/>
255259
<grabTextFrom selector="{{OrdersGridSection.productPrice($$product4.name$$)}}" stepKey="checkProductPrice10"/>
256260
<assertEquals stepKey="verifyPrice10">
257261
<expectedResult type="string">{{testDataTierPrice.goldenPrice1}}</expectedResult>
@@ -281,6 +285,7 @@
281285
<selectOption selector="{{OrdersGridSection.removeItems($$product3.name$$)}}" userInput="Remove" stepKey="clickToRemove6"/>
282286
<waitForLoadingMaskToDisappear stepKey="wait4"/>
283287
<click selector="{{OrdersGridSection.update}}" stepKey="ClickToUpdate2"/>
288+
<waitForLoadingMaskToDisappear stepKey="wait10"/>
284289

285290
<!--TEST CASE #3-->
286291
<waitForPageLoad stepKey="WaitProductsDeleted1"/>
@@ -289,9 +294,11 @@
289294
<click selector="{{OrdersGridSection.selectProduct($$product1.name$$)}}" stepKey="selectProduct9"/>
290295
<fillField selector="{{OrdersGridSection.setQuantity($$product1.name$$)}}" userInput="10" stepKey="AddProductQuantity10"/>
291296
<click selector="{{OrdersGridSection.addProductsToOrder}}" stepKey="addProductsToOrder3"/>
297+
<waitForLoadingMaskToDisappear stepKey="wait11"/>
292298
<fillField selector="{{OrdersGridSection.applyCoupon}}" userInput="ship" stepKey="AddCouponCode"/>
293299
<waitForLoadingMaskToDisappear stepKey="wait5"/>
294300
<click selector="{{OrdersGridSection.update}}" stepKey="ClickToUpdate3"/>
301+
<waitForLoadingMaskToDisappear stepKey="wait12"/>
295302
<grabTextFrom selector="{{OrdersGridSection.productPrice($$product1.name$$)}}" stepKey="checkProductPrice14"/>
296303
<grabTextFrom selector="{{OrdersGridSection.productPrice($$product4.name$$)}}" stepKey="checkProductPrice15"/>
297304
<assertEquals stepKey="verifyPrice14">

0 commit comments

Comments
 (0)