Merge remote-tracking branch 'remotes/github/MAGETWO-91658' into EPAM-PR-19

Author: VeronikaYarats

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

@@ -158,6 +158,14 @@
         <see userInput="${{total}}" selector="{{CheckoutPaymentSection.orderSummaryTotal}}" stepKey="assertTotal"/>
    </actionGroup>
 
+    <actionGroup name="CheckTotalsSortOrderInSummarySection">
+        <arguments>
+            <argument name="elementName" type="string"/>
+            <argument name="positionNumber" type="integer"/>
+        </arguments>
+        <see userInput="{{elementName}}" selector="{{CheckoutCartSummarySection.elementPosition(positionNumber)}}" stepKey="assertElementPosition"/>
+    </actionGroup>
+
     <!-- Check ship to information in checkout -->
     <actionGroup name="CheckShipToInformationInCheckoutActionGroup">
         <arguments>

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

@@ -9,6 +9,7 @@
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="CheckoutCartSummarySection">
+        <element name="elementPosition" type="text" selector=".data.table.totals > tbody tr:nth-of-type({{value}}) > th" parameterized="true"/>
         <element name="subtotal" type="text" selector="//*[@id='cart-totals']//tr[@class='totals sub']//td//span[@class='price']"/>
         <element name="shippingMethodForm" type="text" selector="#co-shipping-method-form"/>
         <element name="shippingMethod" type="text" selector="//*[@id='cart-totals']//tr[@class='totals shipping excl']//th//span[@class='value']"/>

app/code/Magento/SalesRule/Test/Mftf/Data/SalesRuleData.xml

@@ -39,6 +39,35 @@
         <requiredEntity type="SalesRuleLabel">SalesRuleLabelStore1</requiredEntity>
     </entity>
 
+    <entity name="ApiCartRule" type="SalesRule">
+        <data key="name" unique="suffix">salesRule</data>
+        <data key="description">Sales Rule Descritpion</data>
+        <array key="website_ids">
+            <item>1</item>
+        </array>
+        <array key="customer_group_ids">
+            <item>0</item>
+            <item>1</item>
+            <item>3</item>
+        </array>
+        <data key="uses_per_customer">0</data>
+        <data key="is_active">true</data>
+        <data key="stop_rules_processing">true</data>
+        <data key="is_advanced">true</data>
+        <data key="sort_order">0</data>
+        <data key="simple_action">by_percent</data>
+        <data key="discount_amount">50</data>
+        <data key="discount_qty">0</data>
+        <data key="discount_step">0</data>
+        <data key="apply_to_shipping">false</data>
+        <data key="times_used">0</data>
+        <data key="is_rss">true</data>
+        <data key="coupon_type">NO_COUPON</data>
+        <data key="use_auto_generation">false</data>
+        <data key="uses_per_coupon">0</data>
+        <data key="simple_free_shipping">0</data>
+    </entity>
+
     <entity name="SimpleSalesRule" type="SalesRule">
         <data key="name" unique="suffix">SimpleSalesRule</data>
         <data key="is_active">true</data>

app/code/Magento/SalesRule/view/frontend/layout/checkout_cart_index.xml

@@ -13,14 +13,10 @@
                     <item name="components" xsi:type="array">
                         <item name="block-totals" xsi:type="array">
                             <item name="children" xsi:type="array">
-                                <item name="before_grandtotal" xsi:type="array">
-                                    <item name="children" xsi:type="array">
-                                        <item name="discount" xsi:type="array">
-                                            <item name="component" xsi:type="string">Magento_SalesRule/js/view/cart/totals/discount</item>
-                                            <item name="config" xsi:type="array">
-                                                <item name="title" xsi:type="string" translate="true">Discount</item>
-                                            </item>
-                                        </item>
+                                <item name="discount" xsi:type="array">
+                                    <item name="component" xsi:type="string">Magento_SalesRule/js/view/cart/totals/discount</item>
+                                    <item name="config" xsi:type="array">
+                                        <item name="title" xsi:type="string" translate="true">Discount</item>
                                     </item>
                                 </item>
                             </item>