Skip to content

Commit eb1d10c

Browse files
oleg-onuferoleg-onufer
committed
MAGETWO-96719: [Staging] Cart Price Rule >> Assign to the existing Update
1 parent 807ee7d commit eb1d10c

5 files changed

+29
-14
lines changed

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

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,12 @@
1919
<group value="checkout"/>
2020
</annotations>
2121
<before>
22-
<createData entity="_defaultCategory" stepKey="createCategory"/>
23-
<createData entity="defaultVirtualProduct" stepKey="createVirtualProduct">
24-
<requiredEntity createDataKey="createCategory"/>
25-
</createData>
26-
<createData entity="Simple_US_Customer_CA" stepKey="createCustomer">
27-
<field key="group_id">1</field>
28-
</createData>
22+
<createData entity="VirtualProduct" stepKey="createVirtualProduct"/>
23+
<createData entity="Customer_With_Different_Default_Billing_Shipping_Addresses" stepKey="createCustomer"/>
2924
</before>
3025
<after>
3126
<actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="customerLogout"/>
3227
<deleteData createDataKey="createVirtualProduct" stepKey="deleteVirtualProduct"/>
33-
<deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
3428
<deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
3529
</after>
3630
<!-- Steps -->
@@ -48,8 +42,8 @@
4842
<actionGroup ref="clickViewAndEditCartFromMiniCart" stepKey="goToShoppingcart"/>
4943
<!-- Step 4: Open Estimate Tax section -->
5044
<click selector="{{CheckoutCartSummarySection.estimateShippingAndTax}}" stepKey="openEstimateTaxSection"/>
51-
<see selector="{{CheckoutCartSummarySection.country}}" userInput="{{US_Address_CA.country_id}}" stepKey="checkCountry"/>
52-
<see selector="{{CheckoutCartSummarySection.stateProvince}}" userInput="{{US_Address_CA.state}}" stepKey="checkState"/>
45+
<seeOptionIsSelected selector="{{CheckoutCartSummarySection.country}}" userInput="{{US_Address_CA.country}}" stepKey="checkCountry"/>
46+
<seeOptionIsSelected selector="{{CheckoutCartSummarySection.stateProvince}}" userInput="{{US_Address_CA.state}}" stepKey="checkState"/>
5347
<scrollTo selector="{{CheckoutCartSummarySection.postcode}}" stepKey="scrollToPostCodeField"/>
5448
<grabValueFrom selector="{{CheckoutCartSummarySection.postcode}}" stepKey="grabTextPostCode"/>
5549
<assertEquals message="Customer postcode is invalid" stepKey="checkCustomerPostcode">

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@
9595
<data key="city">Los Angeles</data>
9696
<data key="state">California</data>
9797
<data key="country_id">US</data>
98+
<data key="country">United States</data>
9899
<data key="postcode">90001</data>
99100
<data key="telephone">512-345-6789</data>
100101
<data key="default_billing">Yes</data>
@@ -148,4 +149,12 @@
148149
</array>
149150
<data key="state">California</data>
150151
</entity>
152+
<entity name="US_Default_Billing_Address_TX" type="address" extends="US_Address_TX">
153+
<data key="default_billing">false</data>
154+
<data key="default_shipping">true</data>
155+
</entity>
156+
<entity name="US_Default_Shipping_Address_CA" type="address" extends="US_Address_CA">
157+
<data key="default_billing">true</data>
158+
<data key="default_shipping">false</data>
159+
</entity>
151160
</entities>

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,4 +142,16 @@
142142
<data key="website_id">0</data>
143143
<requiredEntity type="address">UK_Not_Default_Address</requiredEntity>
144144
</entity>
145+
<entity name="Customer_With_Different_Default_Billing_Shipping_Addresses" type="customer">
146+
<data key="group_id">1</data>
147+
<data key="email" unique="prefix">[email protected]</data>
148+
<data key="firstname">John</data>
149+
<data key="lastname">Doe</data>
150+
<data key="fullname">John Doe</data>
151+
<data key="password">pwdTest123!</data>
152+
<data key="store_id">0</data>
153+
<data key="website_id">0</data>
154+
<requiredEntity type="address">US_Default_Billing_Address_TX</requiredEntity>
155+
<requiredEntity type="address">US_Default_Shipping_Address_CA</requiredEntity>
156+
</entity>
145157
</entities>

‎app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxInformationInShoppingCartForCustomerPhysicalQuoteTest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,8 @@
8989
<actionGroup ref="clickViewAndEditCartFromMiniCart" stepKey="goToShoppingCartFromMinicart"/>
9090
<!-- Step 4: Open Estimate Shipping and Tax section -->
9191
<conditionalClick selector="{{CheckoutCartSummarySection.estimateShippingAndTax}}" dependentSelector="{{CheckoutCartSummarySection.country}}" visible="false" stepKey="expandEstimateShippingandTax" />
92-
<see selector="{{CheckoutCartSummarySection.country}}" userInput="{{US_Address_CA.country_id}}" stepKey="checkCustomerCountry" />
93-
<see selector="{{CheckoutCartSummarySection.stateProvince}}" userInput="{{US_Address_CA.state}}" stepKey="checkCustomerRegion" />
92+
<seeOptionIsSelected selector="{{CheckoutCartSummarySection.country}}" userInput="{{US_Address_CA.country}}" stepKey="checkCustomerCountry" />
93+
<seeOptionIsSelected selector="{{CheckoutCartSummarySection.stateProvince}}" userInput="{{US_Address_CA.state}}" stepKey="checkCustomerRegion" />
9494
<grabValueFrom selector="{{CheckoutCartSummarySection.postcode}}" stepKey="grabTextPostCode"/>
9595
<assertEquals message="Customer postcode is invalid" stepKey="checkCustomerPostcode">
9696
<expectedResult type="string">{{US_Address_CA.postcode}}</expectedResult>

‎app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxInformationInShoppingCartForCustomerVirtualQuoteTest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@
6161
<actionGroup ref="clickViewAndEditCartFromMiniCart" stepKey="goToShoppingCartFromMinicart"/>
6262
<!-- Step 4: Open Estimate Shipping and Tax section -->
6363
<conditionalClick selector="{{CheckoutCartSummarySection.estimateShippingAndTax}}" dependentSelector="{{CheckoutCartSummarySection.country}}" visible="false" stepKey="expandEstimateShippingandTax" />
64-
<see selector="{{CheckoutCartSummarySection.country}}" userInput="{{US_Address_NY.country_id}}" stepKey="checkCustomerCountry" />
65-
<see selector="{{CheckoutCartSummarySection.stateProvince}}" userInput="{{US_Address_NY.state}}" stepKey="checkCustomerRegion" />
64+
<seeOptionIsSelected selector="{{CheckoutCartSummarySection.country}}" userInput="{{US_Address_NY.country}}" stepKey="checkCustomerCountry" />
65+
<seeOptionIsSelected selector="{{CheckoutCartSummarySection.stateProvince}}" userInput="{{US_Address_NY.state}}" stepKey="checkCustomerRegion" />
6666
<grabValueFrom selector="{{CheckoutCartSummarySection.postcode}}" stepKey="grabTextPostCode"/>
6767
<assertEquals message="Customer postcode is invalid" stepKey="checkCustomerPostcode">
6868
<expectedResult type="string">{{US_Address_NY.postcode}}</expectedResult>

0 commit comments

Comments
 (0)