Skip to content

Commit 821a3d3

Browse files
Keerthana81187Keerthana81187
committed
[bengals-integration-tests-mainline] Reverting changes after stability PR merge
1 parent b100d0d commit 821a3d3

File tree

4 files changed

+58
-36
lines changed

4 files changed

+58
-36
lines changed

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

Lines changed: 56 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -41,34 +41,55 @@
4141
<argument name="indices" value=""/>
4242
</actionGroup>
4343
<actionGroup ref="CliCacheFlushActionGroup" stepKey="cleanCache">
44-
<argument name="tags" value=""/>
44+
<argument name="tags" value=""/>
4545
</actionGroup>
4646
<actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
4747
</after>
4848

49-
<comment userInput="BIC workaround" stepKey="firstSimpleCategory"/>
50-
<comment userInput="BIC workaround" stepKey="createFirstConfigProduct"/>
51-
<comment userInput="BIC workaround" stepKey="createFirstConfigProductAttribute"/>
52-
<comment userInput="BIC workaround" stepKey="createFirstConfigProductAttributeFirstOption"/>
53-
<comment userInput="BIC workaround" stepKey="createFirstConfigProductAttributeSecondOption"/>
54-
<comment userInput="BIC workaround" stepKey="addFirstProductToAttributeSet"/>
55-
<comment userInput="BIC workaround" stepKey="getFirstConfigAttributeFirstOption"/>
56-
<comment userInput="BIC workaround" stepKey="createFirstConfigFirstChildProduct"/>
57-
<comment userInput="BIC workaround" stepKey="createFirstConfigProductOption"/>
58-
<comment userInput="BIC workaround" stepKey="createFirstConfigProductAddFirstChild"/>
59-
60-
<!-- Reindex -->
61-
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
62-
<argument name="indices" value=""/>
63-
</actionGroup>
64-
<actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanCache">
65-
<argument name="tags" value="full_page"/>
66-
</actionGroup>
49+
<!-- Create category for configurable product -->
50+
<createData entity="SimpleSubCategory" stepKey="firstSimpleCategory"/>
6751

68-
<!-- Assert first product in category -->
69-
<magentoCron stepKey="runCron"/>
70-
<magentoCron stepKey="runCron1"/>
52+
<!-- Create configurable product with two options -->
53+
<createData entity="ApiConfigurableProduct" stepKey="createFirstConfigProduct">
54+
<requiredEntity createDataKey="firstSimpleCategory"/>
55+
</createData>
56+
57+
<createData entity="productAttributeWithTwoOptions" stepKey="createFirstConfigProductAttribute"/>
58+
59+
<createData entity="productAttributeOption1" stepKey="createFirstConfigProductAttributeFirstOption">
60+
<requiredEntity createDataKey="createFirstConfigProductAttribute"/>
61+
</createData>
62+
<createData entity="productAttributeOption2" stepKey="createFirstConfigProductAttributeSecondOption">
63+
<requiredEntity createDataKey="createFirstConfigProductAttribute"/>
64+
</createData>
65+
66+
<createData entity="AddToDefaultSet" stepKey="addFirstProductToAttributeSet">
67+
<requiredEntity createDataKey="createFirstConfigProductAttribute"/>
68+
</createData>
7169

70+
<getData entity="ProductAttributeOptionGetter" index="1" stepKey="getFirstConfigAttributeFirstOption">
71+
<requiredEntity createDataKey="createFirstConfigProductAttribute"/>
72+
</getData>
73+
74+
<!-- Create one child product for configurable product -->
75+
<createData entity="ApiSimpleOne" stepKey="createFirstConfigFirstChildProduct">
76+
<requiredEntity createDataKey="createFirstConfigProductAttribute"/>
77+
<requiredEntity createDataKey="getFirstConfigAttributeFirstOption"/>
78+
</createData>
79+
80+
<createData entity="ConfigurableProductOneOption" stepKey="createFirstConfigProductOption">
81+
<requiredEntity createDataKey="createFirstConfigProduct"/>
82+
<requiredEntity createDataKey="createFirstConfigProductAttribute"/>
83+
<requiredEntity createDataKey="getFirstConfigAttributeFirstOption"/>
84+
</createData>
85+
86+
<createData entity="ConfigurableProductAddChild" stepKey="createFirstConfigProductAddFirstChild">
87+
<requiredEntity createDataKey="createFirstConfigProduct"/>
88+
<requiredEntity createDataKey="createFirstConfigFirstChildProduct"/>
89+
</createData>
90+
91+
<!-- Assert first product in category -->
92+
<magentoCLI command="cron:run" stepKey="runCron"/>
7293
<amOnPage url="{{StorefrontCategoryPage.url($$firstSimpleCategory.custom_attributes[url_key]$$)}}" stepKey="goToFirstCategoryPageStorefront"/>
7394
<waitForPageLoad stepKey="waitForFirstCategoryPageLoad"/>
7495

@@ -77,21 +98,23 @@
7798
<argument name="expectedPrice" value="$$createFirstConfigFirstChildProduct.price$$"/>
7899
</actionGroup>
79100

80-
<!-- Update simple product price -->
81-
<comment userInput="BIC workaround" stepKey="openProductCatalogPage"/>
82-
<comment userInput="BIC workaround" stepKey="filterProductGrid"/>
83-
<comment userInput="BIC workaround" stepKey="clickFirstRowToOpenDefaultSimpleProduct"/>
84-
<comment userInput="BIC workaround" stepKey="waitUntilProductIsOpened"/>
85-
<actionGroup ref="AdminProductPageOpenByIdActionGroup" stepKey="openProductEditPage">
86-
<argument name="productId" value="$createFirstConfigFirstChildProduct.id$"/>
101+
<!-- Search default simple product in grid -->
102+
<actionGroup ref="AdminClearFiltersActionGroup" stepKey="openProductCatalogPage"/>
103+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="filterProductGrid"/>
104+
<actionGroup ref="OpenEditProductOnBackendActionGroup" stepKey="clickFirstRowToOpenDefaultSimpleProduct">
105+
<argument name="product" value="$$createFirstConfigFirstChildProduct$$"/>
87106
</actionGroup>
88-
<waitForElementVisible selector="{{AdminProductFormSection.productPrice}}" stepKey="waitForProductPriceField"/>
107+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitUntilProductIsOpened"/>
108+
109+
<!-- Update default simple product with price -->
89110
<fillField selector="{{AdminProductFormSection.productPrice}}" userInput="150" stepKey="fillSimpleProductPrice"/>
90-
<actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickButtonSave"/>
91-
<waitForText selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertSimpleProductSaveSuccessMessage"/>
111+
<actionGroup ref="AdminProductFormSaveButtonClickActionGroup" stepKey="clickButtonSave"/>
112+
113+
<!-- Verify customer see success message -->
114+
<see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertSimpleProductSaveSuccessMessage"/>
92115

93116
<!-- Assert first product in category -->
94-
<magentoCron stepKey="runCron2"/>
117+
<magentoCLI command="cron:run" stepKey="runCron1"/>
95118
<wait time="60" stepKey="waitForUpdateStarts"/>
96119

97120
<amOnPage url="{{StorefrontCategoryPage.url($$firstSimpleCategory.custom_attributes[url_key]$$)}}" stepKey="goToFirstCategoryPageStorefront1"/>

‎app/code/Magento/Checkout/Test/Mftf/Section/CheckoutCartSummarySection.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<element name="proceedToCheckout" type="button" selector=".action.primary.checkout span" timeout="30"/>
2525
<element name="discountAmount" type="text" selector="td[data-th='Discount']"/>
2626
<element name="shippingHeading" type="button" selector="#block-shipping-heading" timeout="10"/>
27-
<element name="postcode" type="input" selector="input[name='postcode']" timeout="30"/>
27+
<element name="postcode" type="input" selector="input[name='postcode']" timeout="10"/>
2828
<element name="stateProvince" type="select" selector="select[name='region_id']" timeout="10"/>
2929
<element name="stateProvinceInput" type="input" selector="input[name='region']"/>
3030
<element name="country" type="select" selector="select[name='country_id']" timeout="10"/>

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,6 @@
103103
<argument name="address" value="US_Address_TX"/>
104104
</actionGroup>
105105

106-
<waitForPageLoad stepKey="waitForFreeShippingOption"/>
107-
108106
<!-- Select Free Shipping -->
109107
<actionGroup ref="StorefrontSetShippingMethodActionGroup" stepKey="setShippingMethodFreeShipping">
110108
<argument name="shippingMethodName" value="Free Shipping"/>

‎app/code/Magento/Shipping/Test/Mftf/ActionGroup/StorefrontSetShippingMethodActionGroup.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
<arguments>
1616
<argument name="shippingMethodName" type="string" defaultValue="Flat Rate"/>
1717
</arguments>
18+
<waitForPageLoad stepKey="waitForShippingToLoad"/>
1819
<waitForElementClickable selector="{{CheckoutShippingMethodsSection.checkShippingMethodByName(shippingMethodName)}}" stepKey="waitForShippingButton"/>
1920
<checkOption selector="{{CheckoutShippingMethodsSection.checkShippingMethodByName(shippingMethodName)}}" stepKey="selectFlatRateShippingMethod"/>
2021
<waitForPageLoad stepKey="waitForLoadingMaskForNextButton"/>

0 commit comments

Comments
 (0)