MTA-2343: Move all test data to repositories

Oleksandr Manchenko · Oleksandr Manchenko · commit 9e5b44ecdb68 · 2015-07-10T14:40:48.000+03:00
diff --git a/dev/tests/functional/composer.json b/dev/tests/functional/composer.json
@@ -1,6 +1,6 @@
 {
     "require": {
-        "magento/mtf": "1.0.0-rc27",
+        "magento/mtf": "1.0.0-rc28",
         "php": "~5.5.0|~5.6.0",
         "phpunit/phpunit": "4.1.0",
         "phpunit/phpunit-selenium": ">=1.2",
diff --git a/dev/tests/functional/tests/app/Magento/Authorizenet/Test/TestCase/OnePageCheckoutTest.xml b/dev/tests/functional/tests/app/Magento/Authorizenet/Test/TestCase/OnePageCheckoutTest.xml
@@ -11,16 +11,16 @@
             <data name="description" xsi:type="string">MAGETWO-12832 - Check Out as a Guest with Authorize.Net and Offline Shipping method</data>
             <data name="products" xsi:type="string">catalogProductSimple::product_10_dollar, configurableProduct::with_one_option, bundleProduct::bundle_fixed_100_dollar_product</data>
             <data name="taxRule" xsi:type="string">us_ca_ny_rule</data>
-            <data name="customer/dataSet" xsi:type="string">default</data>
-            <data name="billingAddress/dataSet" xsi:type="string">US_address_1</data>
+            <data name="customer/dataset" xsi:type="string">default</data>
+            <data name="billingAddress/dataset" xsi:type="string">US_address_1</data>
             <data name="checkoutMethod" xsi:type="string">guest</data>
             <data name="shipping/shipping_service" xsi:type="string">Flat Rate</data>
             <data name="shipping/shipping_method" xsi:type="string">Fixed</data>
             <data name="prices" xsi:type="array">
                 <item name="grandTotal" xsi:type="string">156.81</item>
             </data>
             <data name="payment/method" xsi:type="string">authorizenet</data>
-            <data name="creditCard/dataSet" xsi:type="string">visa_default</data>
+            <data name="creditCard/dataset" xsi:type="string">visa_default</data>
             <data name="configData" xsi:type="string">authorizenet</data>
             <data name="tag" xsi:type="string">test_type:3rd_party_test</data>
             <constraint name="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage"/>
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Repository/BundleProduct/BundleSelections.xml b/dev/tests/functional/tests/app/Magento/Bundle/Test/Repository/BundleProduct/BundleSelections.xml
@@ -433,7 +433,7 @@
                 <item name="1" xsi:type="array">
                     <item name="title" xsi:type="string">Radio Button Option</item>
                     <item name="type" xsi:type="string">Radio Buttons</item>
-                    <item name="required" xsi:type="string">Yes</item>
+                    <item name="required" xsi:type="string">No</item>
                     <item name="assigned_products" xsi:type="array">
                         <item name="0" xsi:type="array">
                             <item name="search_data" xsi:type="array">
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/AbstractCartItem.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/AbstractCartItem.php
@@ -9,75 +9,75 @@
 use Magento\Mtf\Block\Block;
 
 /**
- * Base product item block on checkout page
+ * Base product item block on checkout page.
  */
 class AbstractCartItem extends Block
 {
     /**
-     * Selector for product name
+     * Selector for product name.
      *
      * @var string
      */
     protected $productName = '.product-item-name > a';
 
     /**
-     * Selector for unit price
+     * Selector for unit price.
      *
      * @var string
      */
     protected $price = './/td[@class="col price"]//span[@class="price"]';
 
     /**
-     * Selector for unit price including tax
+     * Selector for unit price including tax.
      *
      * @var string
      */
     protected $priceInclTax = './/td[@class="col price"]/*[@class="price-including-tax"]/span';
 
     /**
-     * Selector for unit price excluding tax
+     * Selector for unit price excluding tax.
      *
      * @var string
      */
     protected $priceExclTax = './/td[@class="col price"]/*[@class="price-excluding-tax"]/span';
 
     /**
-     * Quantity input selector
+     * Quantity input selector.
      *
      * @var string
      */
     protected $qty = './/input[@data-role="cart-item-qty"]';
 
     /**
-     * Cart item sub-total xpath selector
+     * Cart item sub-total xpath selector.
      *
      * @var string
      */
     protected $subtotalPrice = '.col.subtotal .price';
 
     /**
-     * Cart item sub-total excluding tax xpath selector
+     * Cart item sub-total excluding tax xpath selector.
      *
      * @var string
      */
     protected $subTotalPriceExclTax = '.col.subtotal .price-excluding-tax .price';
 
     /**
-     * Cart item sub-total including tax xpath selector
+     * Cart item sub-total including tax xpath selector.
      *
      * @var string
      */
     protected $subTotalPriceInclTax = '.col.subtotal .price-including-tax .price';
 
     /**
-     *  Selector for options block
+     *  Selector for options block.
      *
      * @var string
      */
     protected $optionsBlock = './/dl[contains(@class, "item-options")]';
 
     /**
-     * Escape currency in price
+     * Escape currency in price.
      *
      * @param string $price
      * @return string|null
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/CartItem.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/CartItem.php
@@ -40,7 +40,7 @@ class CartItem extends AbstractCartItem
      *
      * @var string
      */
-    protected $wishlistButton = '.towishlist';
+    protected $wishlistButton = '.action-towishlist';
 
     /**
      * Quantity input selector
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/AbstractReview.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/AbstractReview.php
@@ -244,7 +244,7 @@ public function getGrandTotalInclTax()
     /**
      * Get Tax text from Order Totals.
      *
-     * @return array|string
+     * @return string|null
      */
     public function getTax()
     {
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Payment.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Payment.php
@@ -50,7 +50,7 @@ class Payment extends Block
     protected $placeOrder = '.action.primary.checkout';
     
     /**
-     * Wait element
+     * Wait element.
      *
      * @var string
      */
@@ -120,6 +120,8 @@ public function getSelectedPaymentMethodBlock()
 
     /*
      * Press "Place Order" button.
+     *
+     * @return void
     */
     public function placeOrder()
     {
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Repository/ConfigurableProduct/CheckoutData.xml b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Repository/ConfigurableProduct/CheckoutData.xml
@@ -33,11 +33,11 @@
                 <item name="configurable_options" xsi:type="array">
                     <item name="0" xsi:type="array">
                         <item name="title" xsi:type="string">attribute_key_0</item>
-                        <item name="value" xsi:type="string">option_key_0</item>
+                        <item name="value" xsi:type="string">option_key_1</item>
                     </item>
                     <item name="1" xsi:type="array">
                         <item name="title" xsi:type="string">attribute_key_1</item>
-                        <item name="value" xsi:type="string">option_key_1</item>
+                        <item name="value" xsi:type="string">option_key_0</item>
                     </item>
                 </item>
             </field>
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AbstractAssertTaxCalculationAfterCheckoutDownloadable.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AbstractAssertTaxCalculationAfterCheckoutDownloadable.php
@@ -52,7 +52,7 @@ public function processAssert(
 
         $checkoutCart->getProceedToCheckoutBlock()->proceedToCheckout();
         $cmsIndex->getCmsPageBlock()->waitPageInit();
-        $checkoutOnepage->getPaymentMethodsBlock()->selectPaymentMethod(['method' => 'checkmo']);
+        $checkoutOnepage->getPaymentBlock()->selectPaymentMethod(['method' => 'checkmo']);
         $actualPrices = [];
         $actualPrices = $this->getReviewPrices($actualPrices, $product);
         $actualPrices = $this->getReviewTotals($actualPrices);
@@ -61,7 +61,7 @@ public function processAssert(
         $message = 'Prices on order review should be equal to defined in dataset.';
         \PHPUnit_Framework_Assert::assertEquals($prices, array_filter($actualPrices), $message);
 
-        $checkoutOnepage->getPaymentMethodsBlock()->placeOrder();
+        $checkoutOnepage->getPaymentBlock()->placeOrder();
         $checkoutOnepageSuccess->getSuccessBlock()->getGuestOrderId();
         $checkoutOnepageSuccess->getSuccessBlock()->openOrder();
         $actualPrices = [];
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AbstractAssertTaxRuleIsAppliedToAllPricesDownloadable.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AbstractAssertTaxRuleIsAppliedToAllPricesDownloadable.php
@@ -55,8 +55,9 @@ public function processAssert(
         $this->catalogCategoryView = $catalogCategoryView;
         $this->catalogProductView = $catalogProductView;
         $this->checkoutCart = $checkoutCart;
-        $actualPrices = [];
+
         //Assertion steps
+        $actualPrices = [];
         $productCategory = $product->getCategoryIds()[0];
         $this->openCategory($productCategory);
         $actualPrices = $this->getCategoryPrices($product, $actualPrices);
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesDownloadableIncludingTax.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesDownloadableIncludingTax.php
@@ -31,11 +31,9 @@ class AssertTaxRuleIsAppliedToAllPricesDownloadableIncludingTax extends
     public function getCategoryPrices(FixtureInterface $product, $actualPrices)
     {
         $priceBlock = $this->catalogCategoryView->getListProductBlock()->getProductItem($product)->getPriceBlock();
+        $actualPrices['category_special_price'] = $priceBlock->getSpecialPrice();
         $actualPrices['category_price_excl_tax'] = $priceBlock->getPriceExcludingTax();
-        $actualPrices['category_price_incl_tax'] = $priceBlock->getPrice();
-        if (null === $actualPrices['category_price_incl_tax']) {
-            $actualPrices['category_price_incl_tax'] = $priceBlock->getPrice();
-        }
+        $actualPrices['category_price_incl_tax'] = $priceBlock->getPriceIncludingTax();
 
         return $actualPrices;
     }
@@ -49,6 +47,7 @@ public function getCategoryPrices(FixtureInterface $product, $actualPrices)
     public function getProductPagePrices($actualPrices)
     {
         $priceBlock = $this->catalogProductView->getViewBlock()->getPriceBlock();
+        $actualPrices['product_view_special_price'] = $priceBlock->getSpecialPrice();
         $actualPrices['product_view_price_excl_tax'] = $priceBlock->getPriceExcludingTax();
         $actualPrices['product_view_price_incl_tax'] = $priceBlock->getPriceIncludingTax();
 
diff --git a/dev/tests/functional/tests/app/Magento/Fedex/Test/TestCase/OnePageCheckoutTest.xml b/dev/tests/functional/tests/app/Magento/Fedex/Test/TestCase/OnePageCheckoutTest.xml
@@ -18,7 +18,7 @@
             <data name="shipping/shipping_method" xsi:type="string">International Economy</data>
             <data name="cart/data/shipping_method" xsi:type="string">International Economy</data>
             <data name="payment/method" xsi:type="string">checkmo</data>
-            <data name="configData" xsi:type="string">checkmo, fedex, shipping_origin_US_CA</data><!--<data name="issue" xsi:type="string">Rating is temporarily unavailable - Error in FEDEX</data>-->
+            <data name="configData" xsi:type="string">checkmo, fedex, shipping_origin_US_CA</data>
             <constraint name="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage"/>
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderInOrdersGrid"/>
             <constraint name="Magento\Checkout\Test\Constraint\AssertCartIsEmpty"/>
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/CustomersOrderCountReportEntityTest.php b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/CustomersOrderCountReportEntityTest.php
@@ -35,14 +35,14 @@ class CustomersOrderCountReportEntityTest extends Injectable
     /* end tags */
 
     /**
-     * Order count report page
+     * Order count report page.
      *
      * @var CustomerOrdersReport
      */
     protected $customerOrdersReport;
 
     /**
-     * Inject page
+     * Inject page.
      *
      * @param CustomerOrdersReport $customerOrdersReport
      * @return void
@@ -53,7 +53,7 @@ public function __inject(CustomerOrdersReport $customerOrdersReport)
     }
 
     /**
-     * Order count report view
+     * Order count report view.
      *
      * @param Customer $customer
      * @param string $orders
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/OrderedProductsReportEntityTest.php b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/OrderedProductsReportEntityTest.php
@@ -32,14 +32,14 @@ class OrderedProductsReportEntityTest extends Injectable
     /* end tags */
 
     /**
-     * Ordered Products Report
+     * Ordered Products Report.
      *
      * @var OrderedProductsReport
      */
     protected $orderedProducts;
 
     /**
-     * Inject pages
+     * Inject pages.
      *
      * @param OrderedProductsReport $orderedProducts
      * @return void
@@ -50,7 +50,7 @@ public function __inject(OrderedProductsReport $orderedProducts)
     }
 
     /**
-     * Search order products report
+     * Search order products report.
      *
      * @param OrderInjectable $order
      * @param array $customersReport
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesInvoiceReportEntityTest.php b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesInvoiceReportEntityTest.php
@@ -41,7 +41,7 @@ class SalesInvoiceReportEntityTest extends Injectable
     /* end tags */
 
     /**
-     * Sales invoice report
+     * Sales invoice report.
      *
      * @param SalesInvoiceReport $salesInvoiceReport
      * @param OrderInjectable $order
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesOrderReportEntityTest.php b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesOrderReportEntityTest.php
@@ -41,14 +41,14 @@ class SalesOrderReportEntityTest extends Injectable
     /* end tags */
 
     /**
-     * Sales Report page
+     * Sales Report page.
      *
      * @var SalesReport
      */
     protected $salesReport;
 
     /**
-     * Inject page
+     * Inject page.
      *
      * @param SalesReport $salesReport
      * @return void
@@ -59,7 +59,7 @@ public function __inject(SalesReport $salesReport)
     }
 
     /**
-     * Sales order report
+     * Sales order report.
      *
      * @param OrderInjectable $order
      * @param array $salesReport
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesRefundsReportEntityTest.php b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesRefundsReportEntityTest.php
@@ -40,14 +40,14 @@ class SalesRefundsReportEntityTest extends Injectable
     /* end tags */
 
     /**
-     * Refunds report page
+     * Refunds report page.
      *
      * @var RefundsReport
      */
     protected $refundsReport;
 
     /**
-     * Inject pages
+     * Inject pages.
      *
      * @param RefundsReport $refundsReport
      * @return void
@@ -58,7 +58,7 @@ public function __inject(RefundsReport $refundsReport)
     }
 
     /**
-     * Refunds report
+     * Refunds report.
      *
      * @param OrderInjectable $order
      * @param array $refundsReport
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Grid.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Grid.php
@@ -81,10 +81,12 @@ class Grid extends DataGrid
      *
      * @var string
      */
-    protected $firstRowSelector = '//tbody/tr[1]//a';
+    protected $firstRowSelector = '//tbody/tr[1]/td[@data-action="grid-row-edit"]';
 
     /**
      * Start to create new order.
+     *
+     * @return void
      */
     public function addNewOrder()
     {
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Page/Adminhtml/OrderIndex.xml b/dev/tests/functional/tests/app/Magento/Sales/Test/Page/Adminhtml/OrderIndex.xml
@@ -6,9 +6,9 @@
  */
  -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/pages.xsd">
-  <page name="OrderIndex" area="Adminhtml" mca="sales/order/index" module="Magento_Sales">
-    <block name="gridPageActions" class="Magento\Backend\Test\Block\GridPageActions" locator=".page-main-actions" strategy="css selector"/>
-    <block name="salesOrderGrid" class="Magento\Sales\Test\Block\Adminhtml\Order\Grid" locator=".admin__data-grid-outer-wrap" strategy="css selector"/>
-    <block name="messagesBlock" class="Magento\Backend\Test\Block\Messages" locator="#messages" strategy="css selector"/>
-  </page>
+    <page name="OrderIndex" area="Adminhtml" mca="sales/order/index" module="Magento_Sales">
+        <block name="gridPageActions" class="Magento\Backend\Test\Block\GridPageActions" locator=".page-main-actions" strategy="css selector"/>
+        <block name="salesOrderGrid" class="Magento\Sales\Test\Block\Adminhtml\Order\Grid" locator=".admin__data-grid-outer-wrap" strategy="css selector"/>
+        <block name="messagesBlock" class="Magento\Backend\Test\Block\Messages" locator="#messages" strategy="css selector"/>
+    </page>
 </config>
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CreateOrderBackendTest.xml b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CreateOrderBackendTest.xml
@@ -136,7 +136,7 @@
             <data name="customer/dataset" xsi:type="string">default</data>
             <data name="saveAddress" xsi:type="string">Yes</data>
             <data name="checkoutMethod" xsi:type="string">register</data>
-            <data name="billingAddress/dataSet" xsi:type="string">US_address_1_without_email</data>
+            <data name="billingAddress/dataset" xsi:type="string">US_address_1_without_email</data>
             <data name="shipping/shipping_service" xsi:type="string">Flat Rate</data>
             <data name="shipping/shipping_method" xsi:type="string">Fixed</data>
             <data name="prices" xsi:type="array">
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertOrderTaxOnBackend.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertOrderTaxOnBackend.php
@@ -140,8 +140,10 @@ public function processAssert(
     protected function preparePrices($prices)
     {
         $deletePrices = [
+            'category_special_price',
             'category_price_excl_tax',
             'category_price_incl_tax',
+            'product_view_special_price',
             'product_view_price_excl_tax',
             'product_view_price_incl_tax'
         ];
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertTaxCalculationAfterCheckout.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertTaxCalculationAfterCheckout.php
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserFailedLoginByPermissionMessage.php b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserFailedLoginByPermissionMessage.php
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserFailedLoginMessage.php b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserFailedLoginMessage.php
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/CreateAdminUserEntityTest.php b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/CreateAdminUserEntityTest.php
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/CreateAdminUserEntityTest.xml b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/CreateAdminUserEntityTest.xml
diff --git a/dev/tests/functional/tests/app/Magento/Weee/Test/Block/Product/Price.php b/dev/tests/functional/tests/app/Magento/Weee/Test/Block/Product/Price.php
diff --git a/dev/tests/functional/tests/app/Magento/Weee/Test/TestCase/CreateTaxWithFptTest.php b/dev/tests/functional/tests/app/Magento/Weee/Test/TestCase/CreateTaxWithFptTest.php

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"require": {`
`3`		`- "magento/mtf": "1.0.0-rc27",`
	`3`	`+ "magento/mtf": "1.0.0-rc28",`
`4`	`4`	`"php": "~5.5.0\|~5.6.0",`
`5`	`5`	`"phpunit/phpunit": "4.1.0",`
`6`	`6`	`"phpunit/phpunit-selenium": ">=1.2",`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ class CartItem extends AbstractCartItem`
`40`	`40`	`*`
`41`	`41`	`* @var string`
`42`	`42`	`*/`
`43`		`- protected $wishlistButton = '.towishlist';`
	`43`	`+ protected $wishlistButton = '.action-towishlist';`
`44`	`44`
`45`	`45`	`/**`
`46`	`46`	`* Quantity input selector`
Original file line number	Diff line number	Diff line change
`@@ -244,7 +244,7 @@ public function getGrandTotalInclTax()`
`244`	`244`	`/**`
`245`	`245`	`* Get Tax text from Order Totals.`
`246`	`246`	`*`
`247`		`- * @return array\|string`
	`247`	`+ * @return string\|null`
`248`	`248`	`*/`
`249`	`249`	`public function getTax()`
`250`	`250`	`{`