Skip to content

Commit 9e02dd3

Browse files
subratpanditsubratpandit
committed
ACQE-7346:Import table rate shipping prices with specific amount including and excluding virtual products
Testcase Updated
1 parent a8aaf25 commit 9e02dd3

File tree

2 files changed

+35
-78
lines changed

2 files changed

+35
-78
lines changed

‎app/code/Magento/Customer/Test/Mftf/Data/AddressData.xml‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -129,24 +129,6 @@
129129
<data key="default_billing">Yes</data>
130130
<requiredEntity type="region">RegionTX</requiredEntity>
131131
</entity>
132-
<entity name="US_Address_Custom" type="address">
133-
<data key="firstname">Adam</data>
134-
<data key="lastname">Black</data>
135-
<data key="company">Magento</data>
136-
<array key="street">
137-
<item>1100 West Parmer Lane</item>
138-
<item>113</item>
139-
</array>
140-
<data key="city">Los Angeles</data>
141-
<data key="state">California</data>
142-
<data key="country_id">US</data>
143-
<data key="country">United States</data>
144-
<data key="postcode">20011</data>
145-
<data key="telephone">512-345-6789</data>
146-
<data key="default_billing">Yes</data>
147-
<data key="default_shipping">Yes</data>
148-
<requiredEntity type="region">RegionCA</requiredEntity>
149-
</entity>
150132
<entity name="US_Address_NY" type="address">
151133
<data key="firstname">John</data>
152134
<data key="lastname">Doe</data>

‎app/code/Magento/OfflineShipping/Test/Mftf/Test/AdminImportTableRatesWithSpecificAmountTest.xml‎

Lines changed: 35 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@
1111
<features value="Shipping"/>
1212
<stories value="Offline Shipping Methods"/>
1313
<title value="Import table rate shipping prices with specific amount including and excluding virtual products"/>
14-
<description value="Admin Should Able to import table rate shipping prices with specific amount with Virtual Products as per Configuration"/>
14+
<description value="Admin imports table rate shipping prices with specific amount including and excluding virtual products and validates the shipping cost reflects as per the configurations"/>
1515
<severity value="MAJOR"/>
1616
<testCaseId value="AC-13526"/>
1717
<group value="shipping"/>
1818
</annotations>
1919
<before>
2020
<!--Create customer-->
21-
<createData entity="Simple_Customer_Without_Address" stepKey="createCustomer"/>
21+
<createData entity="Simple_US_CA_Customer" stepKey="createCustomer"/>
2222
<!-- Add simple product -->
2323
<createData entity="SimpleProduct2" stepKey="createFirstSimpleProduct">
2424
<field key="price">9.00</field>
@@ -30,31 +30,24 @@
3030
<field key="price">64.00</field>
3131
</createData>
3232
<createData entity="ApiVirtualProductWithDescription" stepKey="createVirtualProduct"/>
33-
<magentoCLI command="config:set {{DisableFlatRateConfigData.path}} {{DisableFlatRateConfigData.value}}" stepKey="disableFlatRate"/>
3433
</before>
3534
<after>
36-
<!-- Roll back configuration -->
37-
<magentoCLI command="config:set {{EnableFlatRateConfigData.path}} {{EnableFlatRateConfigData.value}}" stepKey="enableFlatRate"/>
35+
<deleteData createDataKey="createVirtualProduct" stepKey="deleteVirtualProduct"/>
36+
<!-- Remove simple products-->
37+
<deleteData createDataKey="createFirstSimpleProduct" stepKey="deleteFirstSimpleProduct"/>
38+
<deleteData createDataKey="createSecondSimpleProduct" stepKey="deleteSecondSimpleProduct"/>
39+
<deleteData createDataKey="createThirdSimpleProduct" stepKey="deleteThirdSimpleProduct"/>
40+
<!-- Delete sales rule -->
41+
<deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
3842
<!-- Go to Stores > Configuration > Sales > Shipping Methods -->
3943
<actionGroup ref="AdminOpenShippingMethodsConfigPageActionGroup" stepKey="openShippingMethodConfigPage"/>
40-
<!-- Switch to Website scope -->
41-
<actionGroup ref="AdminSwitchWebsiteActionGroup" stepKey="AdminSwitchStoreView">
42-
<argument name="website" value="_defaultWebsite"/>
43-
</actionGroup>
4444
<!-- Check Use Default checkbox for Default Condition and Active -->
4545
<checkOption selector="{{AdminShippingMethodTableRatesSection.carriersTableRateConditionName}}" stepKey="enableUseDefaultCondition"/>
4646
<checkOption selector="{{AdminShippingMethodTableRatesSection.enabledUseSystemValue}}" stepKey="enableUseDefaultActive"/>
4747
<actionGroup ref="AdminSaveConfigActionGroup" stepKey="saveConfigs"/>
4848
<!-- Log out -->
4949
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
5050
<!-- Remove Virtual products-->
51-
<deleteData createDataKey="createVirtualProduct" stepKey="deleteVirtualProduct"/>
52-
<!-- Remove simple products-->
53-
<deleteData createDataKey="createFirstSimpleProduct" stepKey="deleteFirstSimpleProduct"/>
54-
<deleteData createDataKey="createSecondSimpleProduct" stepKey="deleteSecondSimpleProduct"/>
55-
<deleteData createDataKey="createThirdSimpleProduct" stepKey="deleteThirdSimpleProduct"/>
56-
<!-- Delete sales rule -->
57-
<deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
5851
</after>
5952
<!-- Login as admin -->
6053
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
@@ -72,7 +65,7 @@
7265
<selectOption selector="{{AdminShippingMethodTableRatesSection.condition}}" userInput="{{TableRateShippingMethodConfig.package_value_with_discount}}" stepKey="setCondition"/>
7366
<!-- Uncheck Use Default checkbox for include virtual price -->
7467
<uncheckOption selector="{{AdminShippingMethodTableRatesSection.carriersTableRateIncludeVirtualPrice}}" stepKey="uncheckIncludeVirtualPrice"/>
75-
<selectOption selector="{{AdminShippingMethodTableRatesSection.carriersTableRateIncludeVirtualPriceDropdown}}" userInput="No" stepKey="setIncludeVirtualPriceAsYes"/>
68+
<selectOption selector="{{AdminShippingMethodTableRatesSection.carriersTableRateIncludeVirtualPriceDropdown}}" userInput="No" stepKey="setIncludeVirtualPriceAsNo"/>
7669
<!-- Import file and save config -->
7770
<attachFile selector="{{AdminShippingMethodTableRatesSection.importFile}}" userInput="usa_tablerates.csv" stepKey="attachFileForImport"/>
7871
<actionGroup ref="AdminSaveConfigActionGroup" stepKey="saveConfigs"/>
@@ -83,45 +76,34 @@
8376
<actionGroup ref="LoginToStorefrontActionGroup" stepKey="customerLogin">
8477
<argument name="Customer" value="$$createCustomer$$" />
8578
</actionGroup>
86-
<actionGroup ref="StorefrontAddNewCustomerAddressActionGroup" stepKey="AddNewAddress">
87-
<argument name="Address" value="US_Address_Custom"/>
88-
</actionGroup>
79+
<amOnPage url="customer/address" stepKey="OpenCustomerAddNewAddress"/>
80+
<waitForPageLoad stepKey="waitForShippingAddressPageToLoad"/>
81+
<!--Open change shipping address page-->
82+
<waitForElementClickable selector="{{StorefrontCustomerAddressesSection.changeShippingAddress}}" stepKey="waitForChangeShippingAddress"/>
83+
<click selector="{{StorefrontCustomerAddressesSection.changeShippingAddress}}" stepKey="openChangeShippingAddress"/>
84+
<clearField stepKey="clearZip" selector="{{StorefrontCustomerAddressFormSection.zip}}"/>
85+
<fillField stepKey="fillZip" userInput="20011" selector="{{StorefrontCustomerAddressFormSection.zip}}"/>
86+
<click stepKey="saveCustomerAddress" selector="{{StorefrontCustomerAddressFormSection.saveAddress}}"/>
87+
<waitForPageLoad stepKey="waitForPageLoad"/>
8988
<!-- Add simple product to cart -->
9089
<actionGroup ref="AddSimpleProductToCartActionGroup" stepKey="addProductToCart">
9190
<argument name="product" value="$$createFirstSimpleProduct$$"/>
9291
</actionGroup>
9392
<!-- Assert that table rate value is correct for US -->
9493
<actionGroup ref="StorefrontCartPageOpenActionGroup" stepKey="goToCheckout"/>
95-
<waitForElement time="30" selector="{{CheckoutCartSummarySection.estimateShippingAndTaxForm}}" stepKey="waitForEstimateShippingAndTaxForm"/>
9694
<conditionalClick selector="{{CheckoutCartSummarySection.estimateShippingAndTax}}" dependentSelector="{{CheckoutCartSummarySection.country}}" visible="false" stepKey="expandEstimateShippingandTax" />
9795
<scrollTo selector="{{CheckoutCartSummarySection.shippingPrice}}" stepKey="scrollToShippingForUS"/>
98-
<grabTextFrom selector="{{CheckoutCartSummarySection.shippingPrice}}" stepKey="grabTableratePrice5"/>
99-
<assertStringContainsString stepKey="checkCustomerShippingPrice5">
100-
<expectedResult type="string">$6.99</expectedResult>
101-
<actualResult type="variable">grabTableratePrice5</actualResult>
102-
</assertStringContainsString>
103-
<waitForText selector="{{CheckoutCartSummarySection.country}}" userInput="United States" stepKey="selectUSCountry"/>
104-
<waitForText selector="{{CheckoutCartSummarySection.stateProvince}}" userInput="California" stepKey="selectCaliforniaRegion"/>
105-
<waitForElementVisible selector="{{CheckoutCartSummarySection.postcode}}" stepKey="selectZipCode"/>
106-
<grabValueFrom selector="{{CheckoutCartSummarySection.postcode}}" stepKey="grabTextPostCode"/>
107-
<assertEquals message="pass" stepKey="checkCustomerPostcode">
108-
<expectedResult type="string">{{US_Address_Custom.postcode}}</expectedResult>
109-
<actualResult type="variable">grabTextPostCode</actualResult>
110-
</assertEquals>
96+
<see selector="{{CheckoutCartSummarySection.shippingPrice}}" userInput="$6.99" stepKey="seeShippingForUS1"/>
11197
<waitForPageLoad stepKey="waitForSelectCountry"/>
112-
<!-- Add simple product to cart -->
98+
<!-- Add Virtual product to cart -->
11399
<actionGroup ref="AddSimpleProductToCartActionGroup" stepKey="addSecondProductToCart1">
114100
<argument name="product" value="$$createVirtualProduct$$"/>
115101
</actionGroup>
116102
<!-- Assert that table rate value is correct for US -->
117103
<actionGroup ref="StorefrontCartPageOpenActionGroup" stepKey="goAgainToCheckout"/>
118-
<conditionalClick selector="{{CheckoutCartSummarySection.estimateShippingAndTax}}" dependentSelector="{{CheckoutCartSummarySection.country}}" visible="false" stepKey="expandEstimateShippingandTax1"/>
119-
<grabTextFrom selector="{{CheckoutCartSummarySection.shippingPrice}}" stepKey="grabTableratePrice2"/>
120-
<assertStringContainsString stepKey="checkCustomerShippingPrice2">
121-
<expectedResult type="string">$6.99</expectedResult>
122-
<actualResult type="variable">grabTableratePrice2</actualResult>
123-
</assertStringContainsString>
124-
<!-- Assert product details in Mini Cart -->
104+
<conditionalClick selector="{{CheckoutCartSummarySection.estimateShippingAndTax}}" dependentSelector="{{CheckoutCartSummarySection.country}}" visible="false" stepKey="expandToEstimateShippingandTax1"/>
105+
<see selector="{{CheckoutCartSummarySection.shippingPrice}}" userInput="$6.99" stepKey="seeShippingForUS"/>
106+
<!-- Customer Click On Mini Cart -->
125107
<actionGroup ref="StorefrontClickOnMiniCartActionGroup" stepKey="clickOnMiniCart"/>
126108
<!--Remove an item from the cart using minicart-->
127109
<actionGroup ref="RemoveProductFromMiniCartActionGroup" stepKey="removeProductFromMiniCart">
@@ -135,10 +117,7 @@
135117
<actionGroup ref="StorefrontCartPageOpenActionGroup" stepKey="navigateToToCheckout"/>
136118
<conditionalClick selector="{{CheckoutCartSummarySection.estimateShippingAndTax}}" dependentSelector="{{CheckoutCartSummarySection.country}}" visible="false" stepKey="expandEstimateShippingPrice"/>
137119
<grabTextFrom selector="{{CheckoutCartSummarySection.shippingPrice}}" stepKey="grabTableratePrice1"/>
138-
<assertStringContainsString stepKey="checkCustomerShippingPrice1">
139-
<expectedResult type="string">$6.99</expectedResult>
140-
<actualResult type="variable">grabTableratePrice1</actualResult>
141-
</assertStringContainsString>
120+
<see selector="{{CheckoutCartSummarySection.shippingPrice}}" userInput="$6.99" stepKey="seeShippingForUS2"/>
142121
<!-- Assert product details in Mini Cart -->
143122
<actionGroup ref="StorefrontClickOnMiniCartActionGroup" stepKey="clickOnMiniCart1"/>
144123
<!--Remove an item from the cart using minicart-->
@@ -152,11 +131,7 @@
152131
<!-- Assert that table rate value is correct for US -->
153132
<actionGroup ref="StorefrontCartPageOpenActionGroup" stepKey="navigateAgainToToCheckout"/>
154133
<conditionalClick selector="{{CheckoutCartSummarySection.estimateShippingAndTax}}" dependentSelector="{{CheckoutCartSummarySection.country}}" visible="false" stepKey="expandEstimateShippingPrice1"/>
155-
<grabTextFrom selector="{{CheckoutCartSummarySection.shippingPrice}}" stepKey="grabTableratePrice3"/>
156-
<assertStringContainsString stepKey="checkCustomerShippingPrice3">
157-
<expectedResult type="string">$4.99</expectedResult>
158-
<actualResult type="variable">grabTableratePrice3</actualResult>
159-
</assertStringContainsString>
134+
<see selector="{{CheckoutCartSummarySection.shippingPrice}}" userInput="$4.99" stepKey="seeShippingForUS3"/>
160135
<!-- Assert product details in Mini Cart -->
161136
<actionGroup ref="StorefrontClickOnMiniCartActionGroup" stepKey="clickOnMiniCart2"/>
162137
<!--Remove an item from the cart using minicart-->
@@ -168,10 +143,10 @@
168143
<conditionalClick selector="{{CheckoutCartSummarySection.estimateShippingAndTax}}" dependentSelector="{{CheckoutCartSummarySection.country}}" visible="false" stepKey="expandEstimateShippingPrice2"/>
169144
<waitForElementNotVisible selector="{{CheckoutCartSummarySection.shippingPrice}}" stepKey="dontSeeShippingPriceForUS"/>
170145
<actionGroup ref="AdminOpenShippingMethodsConfigPageActionGroup" stepKey="openAgainShippingMethodConfigPage"/>
171-
<!-- Enable Table Rate method and save config -->
172-
<actionGroup ref="AdminChangeTableRatesShippingMethodStatusActionGroup" stepKey="enableTableRatesShippingMethod1"/>
173-
<scrollTo selector="{{AdminShippingMethodTableRatesSection.carriersTableRateIncludeVirtualPriceDropdown}}" stepKey="scrollToIncludeVirtualPrice"/>
174-
<selectOption selector="{{AdminShippingMethodTableRatesSection.carriersTableRateIncludeVirtualPriceDropdown}}" userInput="Yes" stepKey="setIncludeVirtualPriceAsNo"/>
146+
<actionGroup ref="AdminSwitchWebsiteActionGroup" stepKey="AdminSwitchStoreView1">
147+
<argument name="website" value="_defaultWebsite"/>
148+
</actionGroup>
149+
<selectOption selector="{{AdminShippingMethodTableRatesSection.carriersTableRateIncludeVirtualPriceDropdown}}" userInput="Yes" stepKey="setIncludeVirtualPriceAsYes"/>
175150
<actionGroup ref="AdminSaveConfigActionGroup" stepKey="saveConfig"/>
176151
<actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="navigateToStorefront"/>
177152
<actionGroup ref="StorefrontClickOnMiniCartActionGroup" stepKey="clickOnMiniCart3"/>
@@ -182,17 +157,17 @@
182157
<actionGroup ref="AddSimpleProductToCartActionGroup" stepKey="addSimpleProductToCart">
183158
<argument name="product" value="$$createFirstSimpleProduct$$"/>
184159
</actionGroup>
160+
<actionGroup ref="StorefrontCartPageOpenActionGroup" stepKey="goAgainToCheckout3"/>
161+
<conditionalClick selector="{{CheckoutCartSummarySection.estimateShippingAndTax}}" dependentSelector="{{CheckoutCartSummarySection.country}}" visible="false" stepKey="expandEstimateShippingandTax1" />
162+
<scrollTo selector="{{CheckoutCartSummarySection.shippingPrice}}" stepKey="scrollAgainToShippingForUS"/>
163+
<see selector="{{CheckoutCartSummarySection.shippingPrice}}" userInput="$6.99" stepKey="seeShippingForUS5"/>
185164
<!-- Add Virtual product to cart -->
186165
<actionGroup ref="AddSimpleProductToCartActionGroup" stepKey="addVirtualProductToCart">
187166
<argument name="product" value="$$createVirtualProduct$$"/>
188167
</actionGroup>
189168
<!-- Assert that table rate value is correct for US -->
190169
<actionGroup ref="StorefrontCartPageOpenActionGroup" stepKey="goAgainToCheckout2"/>
191170
<conditionalClick selector="{{CheckoutCartSummarySection.estimateShippingAndTax}}" dependentSelector="{{CheckoutCartSummarySection.country}}" visible="false" stepKey="expandEstimateTableRatePrice"/>
192-
<grabTextFrom selector="{{CheckoutCartSummarySection.shippingPrice}}" stepKey="grabTableratePrice4"/>
193-
<assertStringContainsString stepKey="checkCustomerShippingPrice">
194-
<expectedResult type="string">$6.99</expectedResult>
195-
<actualResult type="variable">grabTableratePrice4</actualResult>
196-
</assertStringContainsString>
171+
<see selector="{{CheckoutCartSummarySection.shippingPrice}}" userInput="$4.99" stepKey="seeShippingForUS4"/>
197172
</test>
198173
</tests>

0 commit comments

Comments
 (0)