Merge remote-tracking branch 'remotes/mainline/2.3-develop' into MAGE…

…TWO-92773-Anchor-Category
magento · Jun 21, 2018 · c47e1c9 · c47e1c9
2 parents beb6398 + c2c4f29
commit c47e1c9
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 0 deletions.
diff --git a/...eptance/tests/functional/Magento/FunctionalTest/Backend/Section/AdminGridTableSection.xml b/...eptance/tests/functional/Magento/FunctionalTest/Backend/Section/AdminGridTableSection.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+    <section name="AdminGridTableSection">
+        <element name="row" type="text" selector="table.data-grid tbody tr[data-role=row]:nth-of-type({{row}})" parameterized="true"/>
+    </section>
+</sections>
diff --git a/...tance/tests/functional/Magento/FunctionalTest/Backend/Section/AdminMainActionsSection.xml b/...tance/tests/functional/Magento/FunctionalTest/Backend/Section/AdminMainActionsSection.xml
@@ -9,5 +9,7 @@
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminMainActionsSection">
+        <element name="save" type="button" selector="#save"/>
+        <element name="delete" type="button" selector="#delete"/>
     </section>
 </sections>
diff --git a/...tance/tests/functional/Magento/FunctionalTest/Sales/ActionGroup/AdminOrderActionGroup.xml b/...tance/tests/functional/Magento/FunctionalTest/Sales/ActionGroup/AdminOrderActionGroup.xml
@@ -134,4 +134,14 @@
         </arguments>
         <see selector="{{AdminOrderItemsOrderedSection.productSkuColumn}}" userInput="{{product.sku}}" stepKey="seeSkuInItemsOrdered"/>
     </actionGroup>
+
+    <!--Cancel order that is in pending status-->
+    <actionGroup name="cancelPendingOrder">
+        <click selector="{{AdminOrderDetailsMainActionsSection.cancel}}" stepKey="clickCancelOrder"/>
+        <waitForElement selector="{{AdminConfirmationModalSection.message}}" stepKey="waitForCancelConfirmation"/>
+        <see selector="{{AdminConfirmationModalSection.message}}" userInput="Are you sure you want to cancel this order?" stepKey="seeConfirmationMessage"/>
+        <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="confirmOrderCancel"/>
+        <see selector="{{AdminMessagesSection.success}}" userInput="You canceled the order." stepKey="seeCancelSuccessMessage"/>
+        <see selector="{{AdminOrderDetailsInformationSection.orderStatus}}" userInput="Canceled" stepKey="seeOrderStatusCanceled"/>
+    </actionGroup>
 </actionGroups>
diff --git a/...ceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderTotalSection.xml b/...ceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderTotalSection.xml
@@ -12,5 +12,6 @@
         <element name="subTotal" type="text" selector=".order-subtotal-table tbody tr.col-0>td span.price"/>
         <element name="grandTotal" type="text" selector=".order-subtotal-table tfoot tr.col-0>td span.price"/>
         <element name="shippingAndHandling" type="text" selector="//table[contains(@class, 'order-subtotal-table')]//td[normalize-space(.)='Shipping &amp; Handling']/following-sibling::td//span[@class='price']"/>
+        <element name="total" type="text" selector="//table[contains(@class,'order-subtotal-table')]/tbody/tr/td[contains(text(), '{{total}}')]/following-sibling::td/span/span[contains(@class, 'price')]" parameterized="true"/>
     </section>
 </sections>