MTA-2343: Move all test data to repositories

Dmytro Aponasenko · Dmytro Aponasenko · commit a07357fca158 · 2015-07-01T09:49:14.000+03:00
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/CreateBundleProductEntityTest.xml b/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/CreateBundleProductEntityTest.xml
@@ -99,7 +99,6 @@
             <constraint name="Magento\Bundle\Test\Constraint\AssertBundleItemsOnProductPage" />
         </variation>
         <variation name="CreateBundleProductEntityTestVariation5">
-            <data name="issue" xsi:type="string">Bug: MAGETWO-35342</data>
             <data name="description" xsi:type="string">Create fixed bundle with all types options</data>
             <data name="product/data/url_key" xsi:type="string">bundle-product-%isolation%</data>
             <data name="product/data/name" xsi:type="string">BundleProduct %isolation%</data>
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Edit/AttributeForm.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Edit/AttributeForm.php
@@ -76,7 +76,28 @@ public function getData(FixtureInterface $fixture = null, SimpleElement $element
             }
         }
 
-        return $data;
+        return $this->removeEmptyValues($data);
+    }
+
+    /**
+     * Remove recursive all empty values in array.
+     *
+     * @param mixed $input
+     * @return mixed
+     */
+    protected function removeEmptyValues($input)
+    {
+        if (!is_array($input)) {
+            return $input;
+        }
+        $filteredArray = [];
+        foreach ($input as $key => $value) {
+            if ($value) {
+                $filteredArray[$key] = $this->removeEmptyValues($value);
+            }
+        }
+
+        return $filteredArray;
     }
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/UpdateSimpleProductEntityTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/UpdateSimpleProductEntityTest.xml
@@ -9,7 +9,7 @@
     <testCase name="Magento\Catalog\Test\TestCase\Product\UpdateSimpleProductEntityTest">
         <variation name="UpdateSimpleProductEntityTestVariation1">
             <data name="description" xsi:type="string">Update visibility to Catalog, Search</data>
-            <data name="initialProduct/dataset" xsi:type="string">simple_with_tier_price</data>
+            <data name="initialProduct/dataset" xsi:type="string">product_with_category</data>
             <data name="product/data/name" xsi:type="string">Test simple product %isolation%</data>
             <data name="product/data/sku" xsi:type="string">test_simple_product_%isolation%</data>
             <data name="product/data/price/value" xsi:type="string">245.00</data>
@@ -143,7 +143,6 @@
             <data name="product/data/name" xsi:type="string">Simple Product %isolation%</data>
             <data name="product/data/sku" xsi:type="string">sku_simple_product_%isolation%</data>
             <data name="product/data/price/value" xsi:type="string">1.99</data>
-            <data name="product/data/price/dataset" xsi:type="string">-</data>
             <data name="product/data/attribute_set_id/dataset" xsi:type="string">default</data>
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductInGrid" />
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductInCategory" />
diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleNoticeMessage.php b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleNoticeMessage.php
@@ -10,12 +10,12 @@
 use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
- * Class AssertCatalogPriceRuleNoticeMessage
+ * Assert notice message after saving catalog price rule.
  */
 class AssertCatalogPriceRuleNoticeMessage extends AbstractConstraint
 {
     const NOTICE_MESSAGE_RULES = 'We found updated rules that are not applied.';
-    const NOTICE_MESSAGE_APPLY = ' Please, click Apply Rules in order to see immediate effect in the catalog.';
+    const NOTICE_MESSAGE_APPLY = ' Please click "Apply Rules" to update your catalog.';
 
     /**
      * Assert that message "We found updated rules that are not applied..."
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
@@ -40,7 +40,7 @@ class AbstractCartItem extends Block
      *
      * @var string
      */
-    protected $qty = './/input[@type="number" and @title="Quantity"]';
+    protected $qty = './/input[@data-role="cart-item-qty"]';
 
     /**
      * Cart item sub-total xpath selector
diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Fixture/GroupedProduct.xml b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Fixture/GroupedProduct.xml
@@ -71,7 +71,7 @@
         <field name="type_id" />
         <field name="attribute_set_id" group="product-details" source="Magento\Catalog\Test\Fixture\Product\AttributeSetId" />
         <field name="website_ids" group="websites" />
-        <field name="price" source="Magento\GroupedProduct\Test\Repository\GroupedProduct\Price" />
+        <field name="price" source="Magento\Catalog\Test\Fixture\Product\Price" repository="Magento\GroupedProduct\Test\Repository\GroupedProduct\Price" />
         <field name="checkout_data" group="null" repository="Magento\GroupedProduct\Test\Repository\GroupedProduct\CheckoutData" />
         <field name="tax_class" />
     </fixture>
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create.php
@@ -234,8 +234,7 @@ public function updateProductsData(array $products)
             ['element' => $this->_rootElement->find($this->itemsBlock)]
         );
         foreach ($products as $product) {
-            $items->getItemProductByName($product->getName())
-                ->fill($product->getDataFieldConfig('checkout_data')['source']);
+            $items->getItemProductByName($product->getName())->fillCheckoutData($product->getCheckoutData());
         }
         $this->updateItems();
     }
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Items/ItemProduct.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Items/ItemProduct.php
@@ -8,7 +8,6 @@
 
 use Magento\Mtf\Block\Form;
 use Magento\Mtf\Client\Locator;
-use Magento\Mtf\Fixture\FixtureInterface;
 use Magento\Mtf\Client\Element\SimpleElement;
 
 /**
@@ -78,15 +77,14 @@ public function getCheckoutData(array $fields, $currency = '$')
     }
 
     /**
-     * Fill the root form.
+     * Fill the root form with checkout data.
      *
-     * @param FixtureInterface $fixture
+     * @param array $data
      * @param SimpleElement|null $element
      * @return $this
      */
-    public function fill(FixtureInterface $fixture, SimpleElement $element = null)
+    public function fillCheckoutData(array $data, SimpleElement $element = null)
     {
-        $data = $fixture->getData();
         if (isset($data['cartItem'])) {
             unset($data['cartItem']);
         }
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Repository/OrderInjectable/Price.xml b/dev/tests/functional/tests/app/Magento/Sales/Test/Repository/OrderInjectable/Price.xml
@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/Magento/Mtf/Repository/etc/repository.xsd">
-    <repository class="Magento\Sales\Test\Repository\OrderInjectable">
+    <repository class="Magento\Sales\Test\Repository\OrderInjectable\Price">
         <dataset name="default_with_discount">
             <field name="subtotal" xsi:type="string">560</field>
             <field name="discount" xsi:type="string">280</field>

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ class AbstractCartItem extends Block`
`40`	`40`	`*`
`41`	`41`	`* @var string`
`42`	`42`	`*/`
`43`		`- protected $qty = './/input[@type="number" and @title="Quantity"]';`
	`43`	`+ protected $qty = './/input[@data-role="cart-item-qty"]';`
`44`	`44`
`45`	`45`	`/**`
`46`	`46`	`* Cart item sub-total xpath selector`
Original file line number	Diff line number	Diff line change
`@@ -234,8 +234,7 @@ public function updateProductsData(array $products)`
`234`	`234`	`['element' => $this->_rootElement->find($this->itemsBlock)]`
`235`	`235`	`);`
`236`	`236`	`foreach ($products as $product) {`
`237`		`- $items->getItemProductByName($product->getName())`
`238`		`- ->fill($product->getDataFieldConfig('checkout_data')['source']);`
	`237`	`+ $items->getItemProductByName($product->getName())->fillCheckoutData($product->getCheckoutData());`
`239`	`238`	`}`
`240`	`239`	`$this->updateItems();`
`241`	`240`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,6 @@`
`8`	`8`
`9`	`9`	`use Magento\Mtf\Block\Form;`
`10`	`10`	`use Magento\Mtf\Client\Locator;`
`11`		`-use Magento\Mtf\Fixture\FixtureInterface;`
`12`	`11`	`use Magento\Mtf\Client\Element\SimpleElement;`
`13`	`12`
`14`	`13`	`/**`
`@@ -78,15 +77,14 @@ public function getCheckoutData(array $fields, $currency = '$')`
`78`	`77`	`}`
`79`	`78`
`80`	`79`	`/**`
`81`		`- * Fill the root form.`
	`80`	`+ * Fill the root form with checkout data.`
`82`	`81`	`*`
`83`		`- * @param FixtureInterface $fixture`
	`82`	`+ * @param array $data`
`84`	`83`	`* @param SimpleElement\|null $element`
`85`	`84`	`* @return $this`
`86`	`85`	`*/`
`87`		`- public function fill(FixtureInterface $fixture, SimpleElement $element = null)`
	`86`	`+ public function fillCheckoutData(array $data, SimpleElement $element = null)`
`88`	`87`	`{`
`89`		`- $data = $fixture->getData();`
`90`	`88`	`if (isset($data['cartItem'])) {`
`91`	`89`	`unset($data['cartItem']);`
`92`	`90`	`}`