MAGETWO-75412: End-to-end automation: B2C admin

danielrenaud · danielrenaud · commit 8411368ad782 · 2018-02-23T12:36:59.000-06:00
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/Section/AdminConfirmationModalSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/Section/AdminConfirmationModalSection.xml
@@ -11,7 +11,7 @@
     <section name="AdminConfirmationModalSection">
         <element name="title" type="text" selector="aside.confirm .modal-title"/>
         <element name="message" type="text" selector="aside.confirm .modal-content"/>
-        <element name="cancel" type="text" selector="aside.confirm .modal-footer button.action-dismiss" timeout="30"/>
-        <element name="ok" type="text" selector="aside.confirm .modal-footer button.action-accept" timeout="30"/>
+        <element name="cancel" type="button" selector="aside.confirm .modal-footer button.action-dismiss" timeout="30"/>
+        <element name="ok" type="button" selector="aside.confirm .modal-footer button.action-accept" timeout="30"/>
     </section>
 </sections>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Test/EndToEndB2CAdminTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Test/EndToEndB2CAdminTest.xml
@@ -15,7 +15,7 @@
             </after>
 
             <!--Create Bundle Product-->
-            <amOnPage url="{{AdminProductIndexPage}}" stepKey="visitAdminProductPageBundle" after="viewVirtualProductInGrid"/>
+            <amOnPage url="{{AdminProductIndexPage}}" stepKey="visitAdminProductPageBundle" after="seeSimpleProductInGrid"/>
             <waitForPageLoad stepKey="waitForProductPageLoadBundle" after="visitAdminProductPageBundle"/>
             <actionGroup ref="goToCreateProductPage" stepKey="goToCreateBundleProduct" after="waitForProductPageLoadBundle">
                 <argument name="product" value="BundleProduct"/>
@@ -38,9 +38,7 @@
             <fillField selector="{{AdminProductFormBundleSection.firstProductQuantity}}" userInput="{{BundleProduct.defaultQuantity}}" stepKey="fillProductDefaultQty" after="clickAddSelectedBundleProducts"/>
             <actionGroup ref="saveProductForm" stepKey="saveBundleProduct" after="fillProductDefaultQty"/>
             <actionGroup ref="viewBundleProductInAdminGrid" stepKey="viewBundleProductInGrid" after="saveBundleProduct">
-            <argument name="product" value="BundleProduct"/>
+                <argument name="product" value="BundleProduct"/>
             </actionGroup>
-
-
         </test>
 </tests>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/composer.json
@@ -12,11 +12,11 @@
     },
     "require": {
         "magento/magento2-functional-testing-framework": "1.0.0",
+        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
         "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
     },
     "suggest": {
         "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
         "magento/magento2-functional-test-module-catalog-inventory": "100.0.0-dev",
         "magento/magento2-functional-test-module-catalog-rule": "100.0.0-dev",
         "magento/magento2-functional-test-module-checkout": "100.0.0-dev",
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/composer.json
@@ -12,10 +12,11 @@
     },
     "require": {
         "magento/magento2-functional-testing-framework": "1.0.0",
+        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
+        "magento/magento2-functional-test-module-ui": "100.0.0-dev",
         "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
     },
     "suggest": {
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
         "magento/magento2-functional-test-module-catalog-inventory": "100.0.0-dev",
         "magento/magento2-functional-test-module-catalog-rule": "100.0.0-dev",
         "magento/magento2-functional-test-module-catalog-url-rewrite": "100.0.0-dev",
@@ -34,7 +35,6 @@
         "magento/magento2-functional-test-module-store": "100.0.0-dev",
         "magento/magento2-functional-test-module-tax": "100.0.0-dev",
         "magento/magento2-functional-test-module-theme": "100.0.0-dev",
-        "magento/magento2-functional-test-module-ui": "100.0.0-dev",
         "magento/magento2-functional-test-module-url-rewrite": "100.0.0-dev",
         "magento/magento2-functional-test-module-widget": "100.0.0-dev",
         "magento/magento2-functional-test-module-wishlist": "100.0.0-dev"
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/composer.json
@@ -12,6 +12,7 @@
     },
     "require": {
         "magento/magento2-functional-testing-framework": "1.0.0",
+        "magento/magento2-functional-test-module-sales": "100.0.0-dev",
         "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
     },
     "suggest": {
@@ -26,7 +27,6 @@
         "magento/magento2-functional-test-module-page-cache": "100.0.0-dev",
         "magento/magento2-functional-test-module-payment": "100.0.0-dev",
         "magento/magento2-functional-test-module-quote": "100.0.0-dev",
-        "magento/magento2-functional-test-module-sales": "100.0.0-dev",
         "magento/magento2-functional-test-module-sales-rule": "100.0.0-dev",
         "magento/magento2-functional-test-module-shipping": "100.0.0-dev",
         "magento/magento2-functional-test-module-store": "100.0.0-dev",
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/composer.json
@@ -12,11 +12,11 @@
     },
     "require": {
         "magento/magento2-functional-testing-framework": "1.0.0",
+        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
         "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
     },
     "suggest": {
         "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
         "magento/magento2-functional-test-module-catalog-inventory": "100.0.0-dev",
         "magento/magento2-functional-test-module-checkout": "100.0.0-dev",
         "magento/magento2-functional-test-module-customer": "100.0.0-dev",
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable/Test/EndToEndB2CAdminTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable/Test/EndToEndB2CAdminTest.xml
@@ -15,7 +15,7 @@
         </after>
 
         <!--Create Downloadable Product-->
-        <amOnPage url="{{AdminProductIndexPage}}" stepKey="visitProductPageDownloadable" after="viewBundleProductInGrid"/>
+        <amOnPage url="{{AdminProductIndexPage}}" stepKey="visitProductPageDownloadable" after="seeSimpleProductInGrid"/>
         <waitForPageLoad stepKey="waitForProductPageLoadDownloadable" after="visitProductPageDownloadable"/>
         <actionGroup ref="goToCreateProductPage" stepKey="goToCreateDownloadableProduct" after="waitForProductPageLoadDownloadable">
             <argument name="product" value="DownloadableProduct"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable/composer.json
@@ -12,11 +12,11 @@
     },
     "require": {
         "magento/magento2-functional-testing-framework": "1.0.0",
+        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
         "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
     },
     "suggest": {
         "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
         "magento/magento2-functional-test-module-catalog-inventory": "100.0.0-dev",
         "magento/magento2-functional-test-module-checkout": "100.0.0-dev",
         "magento/magento2-functional-test-module-config": "100.0.0-dev",
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedProduct/Test/EndToEndB2CAdminTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedProduct/Test/EndToEndB2CAdminTest.xml
@@ -15,7 +15,7 @@
         </after>
 
         <!--Create Grouped Product-->
-        <amOnPage url="{{AdminProductIndexPage}}" stepKey="visitAdminProductPageGrouped" after="viewConfigurableProductInGrid"/>
+        <amOnPage url="{{AdminProductIndexPage}}" stepKey="visitAdminProductPageGrouped" after="seeSimpleProductInGrid"/>
         <waitForPageLoad stepKey="waitForProductPageLoadGrouped" after="visitAdminProductPageGrouped"/>
         <actionGroup ref="goToCreateProductPage" stepKey="goToCreateGroupedProduct" after="waitForProductPageLoadGrouped">
             <argument name="product" value="GroupedProduct"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedProduct/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedProduct/composer.json
@@ -12,11 +12,11 @@
     },
     "require": {
         "magento/magento2-functional-testing-framework": "1.0.0",
+        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
         "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
     },
     "suggest": {
         "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
         "magento/magento2-functional-test-module-catalog-inventory": "100.0.0-dev",
         "magento/magento2-functional-test-module-checkout": "100.0.0-dev",
         "magento/magento2-functional-test-module-customer": "100.0.0-dev",
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Payment/Data/PaymentMethodData.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Payment/Data/PaymentMethodData.xml
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Payment/Metadata/payment_method-meta.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Payment/Metadata/payment_method-meta.xml
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Quote/Data/CartItemData.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Quote/Data/CartItemData.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="SimpleCartItem" type="CartItem">
+        <data key="qty">1</data>
+        <var key="quote_id" entityKey="return" entityType="GuestCart"/>
+        <var key="sku" entityKey="sku" entityType="product"/>
+    </entity>
+</entities>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Quote/Data/GuestCartData.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Quote/Data/GuestCartData.xml
@@ -9,6 +9,20 @@
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
-    <entity name="guestCart" type="guestCart">
+
+    <entity name="GuestCart" type="GuestCart">
+    </entity>
+
+    <entity name="GuestAddressInformation" type="AddressInformation">
+        <var key="quote_id" entityKey="return" entityType="GuestCart"/>
+        <requiredEntity type="shipping_address">ShippingAddressTX</requiredEntity>
+        <requiredEntity type="billing_address">BillingAddressTX</requiredEntity>
+        <data key="shipping_method_code">flatrate</data>
+        <data key="shipping_carrier_code">flatrate</data>
+    </entity>
+
+    <entity name="GuestOrderPaymentMethod" type="PaymentInformation">
+        <requiredEntity type="payment_method">PaymentMethodCheckMoneyOrder</requiredEntity>
+        <requiredEntity type="billing_address">BillingAddressTX</requiredEntity>
     </entity>
 </entities>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Quote/Metadata/billing_address-meta.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Quote/Metadata/billing_address-meta.xml
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Quote/Metadata/guest-cart-meta.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Quote/Metadata/guest-cart-meta.xml
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Quote/Metadata/guest_cart-meta.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Quote/Metadata/guest_cart-meta.xml
@@ -64,19 +64,5 @@
         <object key="paymentMethod" dataType="payment_method">
             <field key="method">string</field>
         </object>
-        <!--<object key="billing_address" dataType="billing_address">-->
-            <!--<field key="region">string</field>-->
-            <!--<field key="region_code">string</field>-->
-            <!--<field key="region_id">integer</field>-->
-            <!--<field key="country_id">string</field>-->
-            <!--<array key="street">-->
-                <!--<value>string</value>-->
-            <!--</array>-->
-            <!--<field key="postcode">string</field>-->
-            <!--<field key="firstname">string</field>-->
-            <!--<field key="lastname">string</field>-->
-            <!--<field key="email">string</field>-->
-            <!--<field key="telephone">string</field>-->
-        <!--</object>-->
     </operation>
 </operations>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Quote/Metadata/shipping_address-meta.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Quote/Metadata/shipping_address-meta.xml
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Data/SalesData.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Data/SalesData.xml
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminCreditMemoItemsSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminCreditMemoItemsSection.xml
@@ -21,7 +21,6 @@
         <element name="itemDiscountAmount" type="text" selector=".order-creditmemo-tables tbody:nth-of-type({{row}}) .col-discont .price" parameterized="true"/>
         <element name="itemTotal" type="text" selector=".order-creditmemo-tables tbody:nth-of-type({{row}}) .col-total .price" parameterized="true"/>
         <element name="updateQty" type="button" selector=".order-creditmemo-tables tfoot button[data-ui-id='order-items-update-button']" timeout="30"/>
-
         <element name="nameColumn" type="text" selector=".order-creditmemo-tables .product-title"/>
         <element name="skuColumn" type="text" selector=".order-creditmemo-tables .product-sku-block"/>
     </section>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminInvoiceItemsSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminInvoiceItemsSection.xml
@@ -18,7 +18,6 @@
         <element name="itemTaxAmount" type="text" selector=".order-invoice-tables tbody:nth-of-type({{row}}) .col-tax .price" parameterized="true"/>
         <element name="itemDiscountAmount" type="text" selector=".order-invoice-tables tbody:nth-of-type({{row}}) .col-discount .price" parameterized="true"/>
         <element name="itemTotal" type="text" selector=".order-invoice-tables tbody:nth-of-type({{row}}) .col-total .price" parameterized="true"/>
-
         <element name="nameColumn" type="text" selector=".order-invoice-tables .product-title"/>
         <element name="skuColumn" type="text" selector=".order-invoice-tables .product-sku-block"/>
         <element name="priceColumn" type="text" selector=".order-invoice-tables .col-price .price"/>
@@ -28,7 +27,6 @@
         <element name="taxAmountColumn" type="text" selector=".order-invoice-tables .col-tax .price"/>
         <element name="discountAmountColumn" type="text" selector=".order-invoice-tables .col-discount .price"/>
         <element name="totalColumn" type="text" selector=".order-invoice-tables .col-total .price"/>
-
         <element name="updateQty" type="button" selector=".order-invoice-tables tfoot button[data-ui-id='order-items-update-button']"/>
     </section>
 </sections>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/composer.json
@@ -12,12 +12,15 @@
     },
     "require": {
         "magento/magento2-functional-testing-framework": "1.0.0",
+        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
+        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
+        "magento/magento2-functional-test-module-ui": "100.0.0-dev",
+        "magento/magento2-functional-test-module-payment": "100.0.0-dev",
+        "magento/magento2-functional-test-module-quote": "100.0.0-dev",
         "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
     },
     "suggest": {
         "magento/magento2-functional-test-module-authorization": "100.0.0-dev",
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
         "magento/magento2-functional-test-module-catalog-inventory": "100.0.0-dev",
         "magento/magento2-functional-test-module-checkout": "100.0.0-dev",
         "magento/magento2-functional-test-module-config": "100.0.0-dev",
@@ -26,16 +29,13 @@
         "magento/magento2-functional-test-module-eav": "100.0.0-dev",
         "magento/magento2-functional-test-module-gift-message": "100.0.0-dev",
         "magento/magento2-functional-test-module-media-storage": "100.0.0-dev",
-        "magento/magento2-functional-test-module-payment": "100.0.0-dev",
-        "magento/magento2-functional-test-module-quote": "100.0.0-dev",
         "magento/magento2-functional-test-module-reports": "100.0.0-dev",
         "magento/magento2-functional-test-module-sales-rule": "100.0.0-dev",
         "magento/magento2-functional-test-module-sales-sequence": "100.0.0-dev",
         "magento/magento2-functional-test-module-shipping": "100.0.0-dev",
         "magento/magento2-functional-test-module-store": "100.0.0-dev",
         "magento/magento2-functional-test-module-tax": "100.0.0-dev",
         "magento/magento2-functional-test-module-theme": "100.0.0-dev",
-        "magento/magento2-functional-test-module-ui": "100.0.0-dev",
         "magento/magento2-functional-test-module-widget": "100.0.0-dev",
         "magento/magento2-functional-test-module-wishlist": "100.0.0-dev"
     },
