MC-4767: Convert PrintOrderFrontendGuestTest to MFTF

MilaLesechko · MilaLesechko · commit d338df50b029 · 2019-05-28T15:12:27.000-05:00
diff --git a/app/code/Magento/Bundle/Test/Mftf/Section/AdminProductFormBundleSection.xml b/app/code/Magento/Bundle/Test/Mftf/Section/AdminProductFormBundleSection.xml
@@ -43,7 +43,7 @@
         <element name="shortDescription" type="input" selector="#product_form_short_description"/>
         <!--BundleOptionsDropDown-->
         <element name="bundleOptionsDropDown" type="button" selector="div[data-index='bundle-items']" timeout="30"/>
-        <element name="currentBundleOption" type="text" selector="//div[@data-index='bundle-items']//div[@class='admin__collapsible-title']/span"/>
+        <element name="currentBundleOption" type="text" selector="//div[@data-index='bundle-items']//div[contains(@class, 'admin__collapsible-title')]/span"/>
         <!--AddingAnOption-->
         <element name="addOptions" type="button" selector="//tr[@data-repeat-index='0']//td[4]" timeout="30"/>
         <!--SEODropdownTab-->
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminProductFormConfigurationsSection.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminProductFormConfigurationsSection.xml
@@ -44,7 +44,7 @@
         <element name="productQuantity" type="input" selector=".admin__control-text[name='product[quantity_and_stock_status][qty]']"/>
         <element name="currentVariationsQuantityCells" type="button" selector="td[data-index='quantity_container']"/>
         <element name="rowByCode" type="textarea" selector="//span[contains(text(), '{{var1}}-{{var2}}')]//ancestor-or-self::tr" parameterized="true"/>
-        <element name="currentAttribute" type="text" selector="//fieldset[@class='admin__fieldset']/div[@class='admin__field _disabled']//span"/>
+        <element name="currentAttribute" type="text" selector="//fieldset[@class='admin__fieldset']/div[contains(@class, 'admin__field _disabled')]//span"/>
     </section>
     <section name="AdminConfigurableProductSelectAttributesSlideOut">
         <element name="grid" type="button" selector=".admin__data-grid-wrap tbody"/>
diff --git a/app/code/Magento/Downloadable/Test/Mftf/Data/ProductData.xml b/app/code/Magento/Downloadable/Test/Mftf/Data/ProductData.xml
@@ -74,7 +74,7 @@
         <requiredEntity type="custom_attribute_array">ApiProductShortDescription</requiredEntity>
         <requiredEntity type="downloadable_link">apiDownloadableLink</requiredEntity>
     </entity>
-    <entity name="DownloadableProductWithTwoLink1000" type="product">
+    <entity name="DownloadableProductWithTwoLink100" type="product">
         <data key="sku" unique="suffix">downloadableproduct</data>
         <data key="type_id">downloadable</data>
         <data key="attribute_set_id">4</data>
diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminAddToOrderBundleProductActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminAddToOrderBundleProductActionGroup.xml
@@ -9,20 +9,16 @@
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="AdminAddToOrderBundleProductActionGroup">
-        <annotations>
-            <description>Configuration added Bundle Product during creation order by Admin: select bundle option and product with quantity</description>
-            <page>AdminOrderCreatePage</page>
-        </annotations>
         <arguments>
             <argument name="option" type="string"/>
-            <argument name="selectedProduct" type="entity"/>
+            <argument name="selectedProductName" type="string"/>
             <argument name="quantity" type="string"/>
         </arguments>
         <scrollTo selector="{{AdminOrderFormConfigureProductSection.bundleItems}}" stepKey="scroll"/>
         <click selector="{{AdminOrderFormConfigureProductSection.bundleItems}}" stepKey="focusOnSideDialog"/>
         <waitForAjaxLoad stepKey="waitForAjax"/>
         <click selector="{{AdminOrderFormConfigureProductSection.bundleSelect(option)}}" stepKey="clickSelector"/>
-        <selectOption selector="{{AdminOrderFormConfigureProductSection.bundleSelect(option)}}" userInput="{{selectedProduct.name}}" stepKey="selectionOption"/>
+        <selectOption selector="{{AdminOrderFormConfigureProductSection.bundleSelect(option)}}" userInput="{{selectedProductName}}" stepKey="selectionOption"/>
         <waitForAjaxLoad stepKey="waitForAjaxLoad"/>
         <fillField userInput="{{quantity}}" selector="{{AdminOrderFormConfigureProductSection.quantity}}" stepKey="fillQty"/>
         <click selector="{{AdminOrderFormConfigureProductSection.ok}}" stepKey="clickOkConfigurablePopover"/>
diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminAddToOrderConfigurableProductActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminAddToOrderConfigurableProductActionGroup.xml
@@ -9,10 +9,6 @@
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="AdminAddToOrderConfigurableProductActionGroup">
-        <annotations>
-            <description>Configuration added Configurable Product during creation order by Admin: select option by attribute and quantity</description>
-            <page>AdminOrderCreatePage</page>
-        </annotations>
         <arguments>
             <argument name="attribute" type="string"/>
             <argument name="option" type="string"/>
diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminAddToOrderCouponCodeActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminAddToOrderCouponCodeActionGroup.xml
@@ -9,14 +9,10 @@
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="AdminAddToOrderCouponCodeActionGroup">
-        <annotations>
-            <description>Add and apply Coupon Code to order during creating order by Admin</description>
-            <page>AdminOrderCreatePage</page>
-        </annotations>
         <arguments>
-            <argument name="coupon" type="entity"/>
+            <argument name="couponCode" type="string"/>
         </arguments>
-        <fillField userInput="{{coupon.code}}" selector="{{AdminOrderFormDiscountSection.fieldCouponCode}}" stepKey="fillCouponCode"/>
+        <fillField userInput="{{couponCode}}" selector="{{AdminOrderFormDiscountSection.fieldCouponCode}}" stepKey="fillCouponCode"/>
         <click selector="{{AdminOrderFormDiscountSection.applyCouponCode}}" stepKey="clickApply"/>
         <waitForPageLoad stepKey="waitForPageLoad"/>
     </actionGroup>
diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminAddToOrderDownloadableProductActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminAddToOrderDownloadableProductActionGroup.xml
@@ -9,10 +9,6 @@
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="AdminAddToOrderDownloadableProductActionGroup">
-        <annotations>
-            <description>Configuration added Downloadable Product during creation order by Admin: select link and quantity</description>
-            <page>AdminOrderCreatePage</page>
-        </annotations>
         <arguments>
             <argument name="link" type="string"/>
             <argument name="quantity" type="string" defaultValue="1"/>
diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminFilterProductInCreateOrderActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminFilterProductInCreateOrderActionGroup.xml
@@ -9,10 +9,6 @@
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="AdminFilterProductInCreateOrderActionGroup">
-        <annotations>
-            <description>Search product in product grid on create order by admin page</description>
-            <page>AdminOrderCreatePage</page>
-        </annotations>
         <arguments>
             <argument name="productSKU" type="string"/>
         </arguments>
diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/StorefrontAssertSalesPrintOrderBillingAddressActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/StorefrontAssertSalesPrintOrderBillingAddressActionGroup.xml
@@ -9,10 +9,6 @@
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="AssertSalesPrintOrderBillingAddress">
-        <annotations>
-            <description>Assert billing address data on printed order</description>
-            <page>StorefrontPrintOrderPage</page>
-        </annotations>
         <arguments>
             <argument name="address" type="entity"/>
         </arguments>
diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/StorefrontFillOrdersAndReturnsFormActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/StorefrontFillOrdersAndReturnsFormActionGroup.xml
@@ -9,13 +9,9 @@
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="StorefrontFillOrdersAndReturnsFormActionGroup">
-        <annotations>
-            <description>Fill order information in form "Orders and Returns"</description>
-            <page>StorefrontGuestOrderSearchPage</page>
-        </annotations>
         <arguments>
             <argument name="orderNumber" type="string"/>
-            <argument name="customer" type="entity" defaultValue="$$createCustomer$$"/>
+            <argument name="customer" type="entity"/>
         </arguments>
         <fillField selector="{{StorefrontGuestOrderSearchSection.orderId}}" userInput="{{orderNumber}}" stepKey="inputOrderId"/>
         <fillField selector="{{StorefrontGuestOrderSearchSection.billingLastName}}" userInput="{{customer.lastname}}" stepKey="inputBillingLastName"/>
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/StorefrontGuestOrderViewSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/StorefrontGuestOrderViewSection.xml
@@ -10,6 +10,6 @@
           xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="StorefrontGuestOrderViewSection">
         <element name="orderInformationTab" type="text" selector="//*[@class='nav item current']/strong[contains(text(), 'Order Information')]"/>
-        <element name="printOrder" type="button" selector=".order-actions-toolbar .actions .print" timeout="10"/>
+        <element name="printOrder" type="button" selector=".order-actions-toolbar .actions .print" timeout="30"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/StorefrontOrderDetailsSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/StorefrontOrderDetailsSection.xml
@@ -15,6 +15,6 @@
         <element name="grandTotalPrice" type="text" selector="tr.grand_total span.price"/>
         <element name="paymentMethod" type="text" selector=".box-order-billing-method dt.title"/>
         <element name="shippingMethod" type="text" selector=".box-order-shipping-method div.box-content"/>
-        <element name="productNameCell" type="text" selector="//*[@class='product name product-item-name']"/>
+        <element name="productNameCell" type="text" selector="//*[contains(@class, 'product-item-name')]"/>
      </section>
 </sections>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/StorefrontPrintOrderGuestTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/StorefrontPrintOrderGuestTest.xml
@@ -23,7 +23,7 @@
             <createData entity="ApiCategory" stepKey="createCategory"/>
 
             <!-- Create downloadable Product -->
-            <createData entity="DownloadableProductWithTwoLink1000" stepKey="downloadableProduct">
+            <createData entity="DownloadableProductWithTwoLink100" stepKey="downloadableProduct">
                 <requiredEntity createDataKey="createCategory"/>
                 <field key="price">280</field>
             </createData>
@@ -182,7 +182,7 @@
             </actionGroup>
             <actionGroup ref="AdminAddToOrderBundleProductActionGroup" stepKey="addBundleProduct">
                 <argument name="option" value="{$grabBundleOption}"/>
-                <argument name="selectedProduct" value="$$simpleProduct1$$"/>
+                <argument name="selectedProductName" value="$$simpleProduct1.name$$"/>
                 <argument name="quantity" value="2"/>
             </actionGroup>
 
@@ -196,7 +196,7 @@
 
             <!-- add Coupon -->
             <actionGroup ref="AdminAddToOrderCouponCodeActionGroup" stepKey="addCoupon">
-                <argument name="coupon" value="$$createCouponForCartPriceRule$$"/>
+                <argument name="couponCode" value="$$createCouponForCartPriceRule.code$$"/>
             </actionGroup>
 
             <actionGroup ref="fillOrderCustomerInformation" stepKey="fillOrder">
