Skip to content

Commit 138bbec

Browse files
VeronikaYaratsVeronikaYarats
committed
Merge remote-tracking branch 'remotes/github/MAGETWO-97434' into EPAM-PR-34
2 parents 54123a9 + 3eb5441 commit 138bbec

File tree

8 files changed

+53
-87
lines changed

8 files changed

+53
-87
lines changed

‎app/code/Magento/Bundle/Test/Mftf/Test/StorefrontAddBundleOptionsToCartTest.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -131,10 +131,10 @@
131131

132132
<!--Check all products and Cart Subtotal -->
133133
<actionGroup ref="StorefrontCheckCartActionGroup" stepKey="cartAssert" after="waitForDetailsOpen">
134-
<argument name="subtotal" value="BundleProductsSummary.subtotal"/>
135-
<argument name="shipping" value="BundleProductsSummary.shipping"/>
136-
<argument name="shippingMethod" value="BundleProductsSummary.shippingMethod"/>
137-
<argument name="total" value="BundleProductsSummary.total"/>
134+
<argument name="subtotal" value="1,968.00"/>
135+
<argument name="shipping" value="5.00"/>
136+
<argument name="shippingMethod" value="Flat Rate - Fixed"/>
137+
<argument name="total" value="1,973.00"/>
138138
</actionGroup>
139139
</test>
140140
</tests>

‎app/code/Magento/Checkout/Test/Mftf/ActionGroup/CheckoutActionGroup.xml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -187,16 +187,16 @@
187187
<!-- Check order summary in checkout -->
188188
<actionGroup name="CheckOrderSummaryInCheckoutActionGroup">
189189
<arguments>
190-
<argument name="subtotal"/>
191-
<argument name="shippingTotal"/>
192-
<argument name="shippingMethod"/>
193-
<argument name="total"/>
190+
<argument name="subtotal" type="string"/>
191+
<argument name="shippingTotal" type="string"/>
192+
<argument name="shippingMethod" type="string"/>
193+
<argument name="total" type="string"/>
194194
</arguments>
195195
<waitForElement selector="{{CheckoutPaymentSection.paymentSectionTitle}}" time="30" stepKey="waitForPaymentSectionLoaded"/>
196-
<see userInput="${{subtotal}}" selector="{{CheckoutPaymentSection.orderSummarySubtotal}}" stepKey="assertSubtotal"/>
197-
<see userInput="${{shippingTotal}}" selector="{{CheckoutPaymentSection.orderSummaryShippingTotal}}" stepKey="assertShipping"/>
196+
<see userInput="{{subtotal}}" selector="{{CheckoutPaymentSection.orderSummarySubtotal}}" stepKey="assertSubtotal"/>
197+
<see userInput="{{shippingTotal}}" selector="{{CheckoutPaymentSection.orderSummaryShippingTotal}}" stepKey="assertShipping"/>
198198
<see userInput="{{shippingMethod}}" selector="{{CheckoutPaymentSection.orderSummaryShippingMethod}}" stepKey="assertShippingMethod"/>
199-
<see userInput="${{total}}" selector="{{CheckoutPaymentSection.orderSummaryTotal}}" stepKey="assertTotal"/>
199+
<see userInput="{{total}}" selector="{{CheckoutPaymentSection.orderSummaryTotal}}" stepKey="assertTotal"/>
200200
</actionGroup>
201201

202202
<actionGroup name="CheckTotalsSortOrderInSummarySection">

‎app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontProductCartActionGroup.xml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -78,20 +78,20 @@
7878
<!-- Check the Cart -->
7979
<actionGroup name="StorefrontCheckCartActionGroup">
8080
<arguments>
81-
<argument name="subtotal"/>
82-
<argument name="shipping"/>
83-
<argument name="shippingMethod"/>
84-
<argument name="total"/>
81+
<argument name="subtotal" type="string"/>
82+
<argument name="shipping" type="string"/>
83+
<argument name="shippingMethod" type="string"/>
84+
<argument name="total" type="string"/>
8585
</arguments>
8686
<seeInCurrentUrl url="{{CheckoutCartPage.url}}" stepKey="assertUrl"/>
8787
<waitForPageLoad stepKey="waitForCartPage"/>
8888
<conditionalClick selector="{{CheckoutCartSummarySection.shippingHeading}}" dependentSelector="{{CheckoutCartSummarySection.shippingMethodForm}}" visible="false" stepKey="openEstimateShippingSection"/>
8989
<waitForElementVisible selector="{{CheckoutCartSummarySection.flatRateShippingMethod}}" stepKey="waitForShippingSection"/>
9090
<checkOption selector="{{CheckoutCartSummarySection.flatRateShippingMethod}}" stepKey="selectShippingMethod"/>
91-
<see userInput="${{subtotal}}" selector="{{CheckoutCartSummarySection.subtotal}}" stepKey="assertSubtotal"/>
91+
<see userInput="{{subtotal}}" selector="{{CheckoutCartSummarySection.subtotal}}" stepKey="assertSubtotal"/>
9292
<see userInput="({{shippingMethod}})" selector="{{CheckoutCartSummarySection.shippingMethod}}" stepKey="assertShippingMethod"/>
93-
<waitForText userInput="${{shipping}}" selector="{{CheckoutCartSummarySection.shipping}}" time="45" stepKey="assertShipping"/>
94-
<see userInput="${{total}}" selector="{{CheckoutCartSummarySection.total}}" stepKey="assertTotal"/>
93+
<waitForText userInput="{{shipping}}" selector="{{CheckoutCartSummarySection.shipping}}" time="45" stepKey="assertShipping"/>
94+
<see userInput="{{total}}" selector="{{CheckoutCartSummarySection.total}}" stepKey="assertTotal"/>
9595
</actionGroup>
9696

9797
<!-- Open the Cart from Minicart-->

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@
2323
<element name="country" type="select" selector="select[name='country_id']" timeout="10"/>
2424
<element name="countryParameterized" type="select" selector="select[name='country_id'] > option:nth-child({{var}})" timeout="10" parameterized="true"/>
2525
<element name="estimateShippingAndTax" type="text" selector="#block-shipping-heading" timeout="5"/>
26-
<element name="flatRateShippingMethod" type="radio" selector="#s_method_flatrate_flatrate" timeout="30"/>
26+
<element name="flatRateShippingMethod" type="input" selector="#s_method_flatrate_flatrate" timeout="30"/>
2727
</section>
2828
</sections>

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

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -96,14 +96,10 @@
9696
<comment userInput="Check cart information" stepKey="commentCheckCartInformation" after="cartMinicartAssertSimpleProduct2PageImageNotDefault" />
9797
<actionGroup ref="StorefrontOpenCartFromMinicartActionGroup" stepKey="cartOpenCart" after="commentCheckCartInformation"/>
9898
<actionGroup ref="StorefrontCheckCartActionGroup" stepKey="cartAssertCart" after="cartOpenCart">
99-
<!-- @TODO: Change to scalar value after MQE-498 is implemented -->
100-
<argument name="subtotal" value="E2EB2CQuote.subtotal"/>
101-
<!-- @TODO: Change to scalar value after MQE-498 is implemented -->
102-
<argument name="shipping" value="E2EB2CQuote.shipping"/>
103-
<!-- @TODO: Change to scalar value after MQE-498 is implemented -->
104-
<argument name="shippingMethod" value="E2EB2CQuote.shippingMethod"/>
105-
<!-- @TODO: Change to scalar value after MQE-498 is implemented -->
106-
<argument name="total" value="E2EB2CQuote.total"/>
99+
<argument name="subtotal" value="480.00"/>
100+
<argument name="shipping" value="15.00"/>
101+
<argument name="shippingMethod" value="Flat Rate - Fixed"/>
102+
<argument name="total" value="495.00"/>
107103
</actionGroup>
108104

109105
<!-- Check simple product 1 in cart -->
@@ -157,14 +153,10 @@
157153
<!-- Check order summary in checkout -->
158154
<comment userInput="Check order summary in checkout" stepKey="commentCheckOrderSummaryInCheckout" after="guestCheckoutFillingShippingSection" />
159155
<actionGroup ref="CheckOrderSummaryInCheckoutActionGroup" stepKey="guestCheckoutCheckOrderSummary" after="commentCheckOrderSummaryInCheckout">
160-
<!-- @TODO: Change to scalar value after MQE-498 is implemented -->
161-
<argument name="subtotal" value="{{E2EB2CQuote.subtotal}}"/>
162-
<!-- @TODO: Change to scalar value after MQE-498 is implemented -->
163-
<argument name="shippingTotal" value="{{E2EB2CQuote.shipping}}"/>
164-
<!-- @TODO: Change to scalar value after MQE-498 is implemented -->
165-
<argument name="shippingMethod" value="{{E2EB2CQuote.shippingMethod}}"/>
166-
<!-- @TODO: Change to scalar value after MQE-498 is implemented -->
167-
<argument name="total" value="{{E2EB2CQuote.total}}"/>
156+
<argument name="subtotal" value="480.00"/>
157+
<argument name="shippingTotal" value="15.00"/>
158+
<argument name="shippingMethod" value="Flat Rate - Fixed"/>
159+
<argument name="total" value="495.00"/>
168160
</actionGroup>
169161

170162
<!-- Check ship to information in checkout -->

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

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -96,14 +96,10 @@
9696
<comment userInput="Check cart information" stepKey="commentCheckCartInformation" after="cartMinicartAssertSimpleProduct2PageImageNotDefault" />
9797
<actionGroup ref="StorefrontOpenCartFromMinicartActionGroup" stepKey="cartOpenCart" after="commentCheckCartInformation"/>
9898
<actionGroup ref="StorefrontCheckCartActionGroup" stepKey="cartAssertCart" after="cartOpenCart">
99-
<!-- @TODO: Change to scalar value after MQE-498 is implemented -->
100-
<argument name="subtotal" value="E2EB2CQuote.subtotal"/>
101-
<!-- @TODO: Change to scalar value after MQE-498 is implemented -->
102-
<argument name="shipping" value="E2EB2CQuote.shipping"/>
103-
<!-- @TODO: Change to scalar value after MQE-498 is implemented -->
104-
<argument name="shippingMethod" value="E2EB2CQuote.shippingMethod"/>
105-
<!-- @TODO: Change to scalar value after MQE-498 is implemented -->
106-
<argument name="total" value="E2EB2CQuote.total"/>
99+
<argument name="subtotal" value="480.00"/>
100+
<argument name="shipping" value="15.00"/>
101+
<argument name="shippingMethod" value="Flat Rate - Fixed"/>
102+
<argument name="total" value="495.00"/>
107103
</actionGroup>
108104

109105
<!-- Check simple product 1 in cart -->
@@ -157,14 +153,10 @@
157153
<!-- Check order summary in checkout -->
158154
<comment userInput="Check order summary in checkout" stepKey="commentCheckOrderSummaryInCheckout" after="checkoutFillingShippingSection" />
159155
<actionGroup ref="CheckOrderSummaryInCheckoutActionGroup" stepKey="checkoutCheckOrderSummary" after="commentCheckOrderSummaryInCheckout">
160-
<!-- @TODO: Change to scalar value after MQE-498 is implemented -->
161-
<argument name="subtotal" value="{{E2EB2CQuote.subtotal}}"/>
162-
<!-- @TODO: Change to scalar value after MQE-498 is implemented -->
163-
<argument name="shippingTotal" value="{{E2EB2CQuote.shipping}}"/>
164-
<!-- @TODO: Change to scalar value after MQE-498 is implemented -->
165-
<argument name="shippingMethod" value="{{E2EB2CQuote.shippingMethod}}"/>
166-
<!-- @TODO: Change to scalar value after MQE-498 is implemented -->
167-
<argument name="total" value="{{E2EB2CQuote.total}}"/>
156+
<argument name="subtotal" value="480.00"/>
157+
<argument name="shippingTotal" value="15.00"/>
158+
<argument name="shippingMethod" value="Flat Rate - Fixed"/>
159+
<argument name="total" value="495.00"/>
168160
</actionGroup>
169161

170162
<!-- Check ship to information in checkout -->

‎app/code/Magento/SalesRule/Test/Mftf/Test/EndToEndB2CGuestUserTest.xml

Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -29,30 +29,21 @@
2929

3030
<actionGroup ref="StorefrontCheckCouponAppliedActionGroup" stepKey="couponCheckAppliedDiscount" after="couponApplyCoupon">
3131
<argument name="rule" value="$$createSalesRule$$"/>
32-
<!-- @TODO: Change to scalar value after MQE-498 is implemented -->
33-
<argument name="discount" value="E2EB2CQuoteWith10PercentDiscount.discount"/>
32+
<argument name="discount" value="48.00"/>
3433
</actionGroup>
3534
<actionGroup ref="StorefrontCheckCartActionGroup" stepKey="couponCheckCartWithDiscount" after="couponCheckAppliedDiscount">
36-
<!-- @TODO: Change to scalar value after MQE-498 is implemented -->
37-
<argument name="subtotal" value="E2EB2CQuoteWith10PercentDiscount.subtotal"/>
38-
<!-- @TODO: Change to scalar value after MQE-498 is implemented -->
39-
<argument name="shipping" value="E2EB2CQuoteWith10PercentDiscount.shipping"/>
40-
<!-- @TODO: Change to scalar value after MQE-498 is implemented -->
41-
<argument name="shippingMethod" value="E2EB2CQuoteWith10PercentDiscount.shippingMethod"/>
42-
<!-- @TODO: Change to scalar value after MQE-498 is implemented -->
43-
<argument name="total" value="E2EB2CQuoteWith10PercentDiscount.total"/>
35+
<argument name="subtotal" value="480.00"/>
36+
<argument name="shipping" value="15.00"/>
37+
<argument name="shippingMethod" value="Flat Rate - Fixed"/>
38+
<argument name="total" value="447.00"/>
4439
</actionGroup>
4540

4641
<actionGroup ref="StorefrontCancelCouponActionGroup" stepKey="couponCancelCoupon" after="couponCheckCartWithDiscount"/>
4742
<actionGroup ref="StorefrontCheckCartActionGroup" stepKey="cartAssertCartAfterCancelCoupon" after="couponCancelCoupon">
48-
<!-- @TODO: Change to scalar value after MQE-498 is implemented -->
49-
<argument name="subtotal" value="E2EB2CQuote.subtotal"/>
50-
<!-- @TODO: Change to scalar value after MQE-498 is implemented -->
51-
<argument name="shipping" value="E2EB2CQuote.shipping"/>
52-
<!-- @TODO: Change to scalar value after MQE-498 is implemented -->
53-
<argument name="shippingMethod" value="E2EB2CQuote.shippingMethod"/>
54-
<!-- @TODO: Change to scalar value after MQE-498 is implemented -->
55-
<argument name="total" value="E2EB2CQuote.total"/>
43+
<argument name="subtotal" value="480.00"/>
44+
<argument name="shipping" value="15.00"/>
45+
<argument name="shippingMethod" value="Flat Rate - Fixed"/>
46+
<argument name="total" value="495.00"/>
5647
</actionGroup>
5748
<comment userInput="End of using coupon code" stepKey="endOfUsingCouponCode" after="cartAssertCartAfterCancelCoupon" />
5849
</test>

‎app/code/Magento/SalesRule/Test/Mftf/Test/EndToEndB2CLoggedInUserTest.xml

Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -29,30 +29,21 @@
2929

3030
<actionGroup ref="StorefrontCheckCouponAppliedActionGroup" stepKey="couponCheckAppliedDiscount" after="couponApplyCoupon">
3131
<argument name="rule" value="$$createSalesRule$$"/>
32-
<!-- @TODO: Change to scalar value after MQE-498 is implemented -->
33-
<argument name="discount" value="E2EB2CQuoteWith10PercentDiscount.discount"/>
32+
<argument name="discount" value="48.00"/>
3433
</actionGroup>
3534
<actionGroup ref="StorefrontCheckCartActionGroup" stepKey="couponCheckCartWithDiscount" after="couponCheckAppliedDiscount">
36-
<!-- @TODO: Change to scalar value after MQE-498 is implemented -->
37-
<argument name="subtotal" value="E2EB2CQuoteWith10PercentDiscount.subtotal"/>
38-
<!-- @TODO: Change to scalar value after MQE-498 is implemented -->
39-
<argument name="shipping" value="E2EB2CQuoteWith10PercentDiscount.shipping"/>
40-
<!-- @TODO: Change to scalar value after MQE-498 is implemented -->
41-
<argument name="shippingMethod" value="E2EB2CQuoteWith10PercentDiscount.shippingMethod"/>
42-
<!-- @TODO: Change to scalar value after MQE-498 is implemented -->
43-
<argument name="total" value="E2EB2CQuoteWith10PercentDiscount.total"/>
35+
<argument name="subtotal" value="480.00"/>
36+
<argument name="shipping" value="15.00"/>
37+
<argument name="shippingMethod" value="Flat Rate - Fixed"/>
38+
<argument name="total" value="447.00"/>
4439
</actionGroup>
4540

4641
<actionGroup ref="StorefrontCancelCouponActionGroup" stepKey="couponCancelCoupon" after="couponCheckCartWithDiscount"/>
4742
<actionGroup ref="StorefrontCheckCartActionGroup" stepKey="cartAssertCartAfterCancelCoupon" after="couponCancelCoupon">
48-
<!-- @TODO: Change to scalar value after MQE-498 is implemented -->
49-
<argument name="subtotal" value="E2EB2CQuote.subtotal"/>
50-
<!-- @TODO: Change to scalar value after MQE-498 is implemented -->
51-
<argument name="shipping" value="E2EB2CQuote.shipping"/>
52-
<!-- @TODO: Change to scalar value after MQE-498 is implemented -->
53-
<argument name="shippingMethod" value="E2EB2CQuote.shippingMethod"/>
54-
<!-- @TODO: Change to scalar value after MQE-498 is implemented -->
55-
<argument name="total" value="E2EB2CQuote.total"/>
43+
<argument name="subtotal" value="480.00"/>
44+
<argument name="shipping" value="15.00"/>
45+
<argument name="shippingMethod" value="Flat Rate - Fixed"/>
46+
<argument name="total" value="495.00"/>
5647
</actionGroup>
5748
<comment userInput="End of using coupon code" stepKey="endOfUsingCouponCode" after="cartAssertCartAfterCancelCoupon"/>
5849
</test>

0 commit comments

Comments
 (0)