MTA-3519: Update Products Using Mass Action change Stock Availability

rsavchuk · rsavchuk · commit 82e64c55458d · 2016-09-08T15:01:32.000+03:00
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Action/Tab/AdvancedInventory.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Action/Tab/AdvancedInventory.php
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Action/Tab/Attributes.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Action/Tab/Attributes.php
@@ -11,7 +11,7 @@
 use Magento\Mtf\Client\Element\SimpleElement;
 
 /**
- * Product update attributes Attributes tab.
+ * Attributes tab on Product update attributes Form.
  */
 class Attributes extends Tab
 {
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Action/UpdateAttribute.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Action/UpdateAttribute.php
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Action/UpdateAttributeForm.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Action/UpdateAttributeForm.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Action;
+
+use Magento\Backend\Test\Block\Widget\FormTabs;
+use Magento\Mtf\Fixture\InjectableFixture;
+
+/**
+ * Product update Attributes Form.
+ */
+class UpdateAttributeForm extends FormTabs
+{
+    /**
+     * Checkbox array mapping.
+     *
+     * @var array
+     */
+    private $checkboxMapping = [
+        'attributes' => [
+            'price' => 'toggle_price'
+        ],
+        'advanced_inventory' => [
+            'stock_data' => 'stock_data_checkbox'
+        ]
+    ];
+
+    /**
+     * Advanced Inventory Tab selector.
+     *
+     * @var string
+     */
+    protected $advancedInventoryTab = '#attributes_update_tabs_inventory';
+
+    /**
+     * Create data array for filling containers.
+     *
+     * Returns data in format
+     * [[abstract_container_name => [field_name => [attribute_name => attribute_value, ..], ..], ..]
+     * where container name should be set to 'null' if a field is not present on the form.
+     *
+     * @param InjectableFixture $fixture
+     * @return array
+     */
+    protected function getFixtureFieldsByContainers(InjectableFixture $fixture)
+    {
+        $dataByContainer = [];
+        $data = $fixture->getData();
+
+        foreach ($this->containers as $key => $container) {
+            foreach ($container['fields'] as $fieldKey => $field) {
+                if (isset($data[$fieldKey])) {
+                    $dataByContainer[$key][$fieldKey]['value'] = $data[$fieldKey];
+                    if (isset($this->checkboxMapping[$key][$fieldKey])) {
+                        $dataByContainer[$key][$this->checkboxMapping[$key][$fieldKey]]['value'] = 'Yes';
+                    }
+                }
+            }
+            if (isset($dataByContainer[$key])) {
+                $dataByContainer[$key] = array_reverse($dataByContainer[$key]);
+            }
+        }
+
+        return $dataByContainer;
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Action/UpdateAttributeForm.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Action/UpdateAttributeForm.xml
@@ -24,11 +24,11 @@
         <selector>#attributes_update_tabs_inventory</selector>
         <fields>
             <stock_data_checkbox>
-                <selector>[id=inventory_stock_availability_checkbox]</selector>
+                <selector>#inventory_stock_availability_checkbox</selector>
                 <input>checkbox</input>
             </stock_data_checkbox>
             <stock_data>
-                <selector>[id=inventory_stock_availability]</selector>
+                <selector>#inventory_stock_availability</selector>
                 <input>select</input>
             </stock_data>
         </fields>
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Grid.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Grid.php
@@ -78,7 +78,7 @@ class Grid extends DataGrid
      */
     public function updateAttributes(array $items = [])
     {
-        $productsSku = [];
+        $products = [];
         /** @var FixtureInterface $product */
         foreach ($items as $product) {
             $dataConfig = $product->getDataConfig();
@@ -87,12 +87,12 @@ public function updateAttributes(array $items = [])
                 $renderArguments = [
                     'product' => $product,
                 ];
-                $productsSku = $this->callRender($typeId, 'updateAttributes', $renderArguments);
+                $products = $this->callRender($typeId, 'prepareData', $renderArguments);
             } else {
-                $productsSku[] = ["sku" => $product->getSku()];
+                $products[] = ["sku" => $product->getSku()];
             }
         }
-        $this->massaction($productsSku, 'Update attributes');
+        $this->massaction($products, 'Update attributes');
     }
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertMassProductUpdateSuccessMessage.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertMassProductUpdateSuccessMessage.php
@@ -23,7 +23,7 @@ class AssertMassProductUpdateSuccessMessage extends AbstractConstraint
      * Assert that after mass update successful message appears.
      *
      * @param CatalogProductIndex $productGrid
-     * @param $productsCount
+     * @param string $productsCount
      * @return void
      */
     public function processAssert(CatalogProductIndex $productGrid, $productsCount)
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductsInStock.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductsInStock.php
@@ -42,6 +42,6 @@ public function processAssert(
      */
     public function toString()
     {
-        return 'In stock control is visible.';
+        return 'In stock control is visible for each product.';
     }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Adminhtml/CatalogProductActionAttributeEdit.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Adminhtml/CatalogProductActionAttributeEdit.xml
@@ -7,7 +7,7 @@
  -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/pages.xsd">
     <page name="CatalogProductActionAttributeEdit" area="Adminhtml" mca="catalog/product_action_attribute/edit" module="Magento_Catalog">
-        <block name="attributesBlockForm" class="Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Action\UpdateAttribute" locator="body" strategy="css selector" />
+        <block name="attributesBlockForm" class="Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Action\UpdateAttributeForm" locator="body" strategy="css selector" />
         <block name="formPageActions" class="Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Action\FormPageActions" locator=".page-main-actions" strategy="css selector" />
     </page>
 </config>
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/MassProductUpdateTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/MassProductUpdateTest.php
@@ -98,14 +98,12 @@ public function __inject(
      * @param CatalogProductSimple $product
      * @param string $configData
      * @param array $initialProducts
-     * @param string $checkbox
      * @return array
      */
     public function test(
         CatalogProductSimple $product,
         $configData,
-        array $initialProducts,
-        $checkbox
+        array $initialProducts
     ) {
         $this->configData = $configData;
 
@@ -123,9 +121,22 @@ public function test(
         // Steps
         $this->productGrid->open();
         $this->productGrid->getProductGrid()->updateAttributes($products);
-        $this->attributeMassActionPage->getAttributesBlockForm()->fillForm($product, $checkbox);
+        $this->attributeMassActionPage->getAttributesBlockForm()->fill($product);
         $this->attributeMassActionPage->getFormPageActions()->save();
+        $updatedProducts = $this->prepareUpdatedProducts($products, $product);
+        
+        return ['products' => $updatedProducts];
+    }
 
+    /**
+     * Prepare updated products.
+     *
+     * @param array $products
+     * @param CatalogProductSimple $product
+     * @return array
+     */
+    private function prepareUpdatedProducts(array $products, CatalogProductSimple $product)
+    {
         $productsReturn = [];
         /** @var FixtureInterface $item */
         foreach ($products as $item) {
@@ -134,8 +145,8 @@ public function test(
                 ['data' => array_merge($item->getData(), $product->getData())]
             );
         }
-        
-        return ['products' => $productsReturn];
+
+        return $productsReturn;
     }
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/MassProductUpdateTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/MassProductUpdateTest.xml
@@ -12,7 +12,6 @@
             <data name="initialProducts/0" xsi:type="string">catalogProductSimple::simple_10_dollar</data>
             <data name="initialProducts/1" xsi:type="string">catalogProductSimple::simple_10_dollar</data>
             <data name="productsCount" xsi:type="string">2</data>
-            <data name="checkbox/toggle_price" xsi:type="string">Yes</data>
             <data name="product/data/price/value" xsi:type="string">1.99</data>
             <constraint name="Magento\Catalog\Test\Constraint\AssertMassProductUpdateSuccessMessage" />
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductInGrid" />
@@ -22,7 +21,6 @@
             <data name="initialProducts/1" xsi:type="string">configurableProduct::out_of_stock</data>
             <data name="initialProducts/0" xsi:type="string">catalogProductSimple::out_of_stock</data>
             <data name="productsCount" xsi:type="string">3</data>
-            <data name="checkbox/stock_data_checkbox" xsi:type="string">Yes</data>
             <data name="product/data/stock_data" xsi:type="string">In Stock</data>
             <constraint name="Magento\Catalog\Test\Constraint\AssertMassProductUpdateSuccessMessage" />
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductInGrid" />
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Grid.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Grid.php
@@ -15,12 +15,12 @@
 class Grid extends DataGrid
 {
     /**
-     * Update attributes for product.
+     * Prepare data.
      *
      * @param ConfigurableProduct $product
      * @return array
      */
-    public function updateAttributes($product)
+    public function prepareData($product)
     {
         $configurableAttributesData = $product->getConfigurableAttributesData();
         $productItems[] = ['sku' => $product->getSku()];

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`use Magento\Mtf\Client\Element\SimpleElement;`
`12`	`12`
`13`	`13`	`/**`
`14`		`- * Product update attributes Attributes tab.`
	`14`	`+ * Attributes tab on Product update attributes Form.`
`15`	`15`	`*/`
`16`	`16`	`class Attributes extends Tab`
`17`	`17`	`{`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ class Grid extends DataGrid`
`78`	`78`	`*/`
`79`	`79`	`public function updateAttributes(array $items = [])`
`80`	`80`	`{`
`81`		`- $productsSku = [];`
	`81`	`+ $products = [];`
`82`	`82`	`/** @var FixtureInterface $product */`
`83`	`83`	`foreach ($items as $product) {`
`84`	`84`	`$dataConfig = $product->getDataConfig();`
`@@ -87,12 +87,12 @@ public function updateAttributes(array $items = [])`
`87`	`87`	`$renderArguments = [`
`88`	`88`	`'product' => $product,`
`89`	`89`	`];`
`90`		`- $productsSku = $this->callRender($typeId, 'updateAttributes', $renderArguments);`
	`90`	`+ $products = $this->callRender($typeId, 'prepareData', $renderArguments);`
`91`	`91`	`} else {`
`92`		`- $productsSku[] = ["sku" => $product->getSku()];`
	`92`	`+ $products[] = ["sku" => $product->getSku()];`
`93`	`93`	`}`
`94`	`94`	`}`
`95`		`- $this->massaction($productsSku, 'Update attributes');`
	`95`	`+ $this->massaction($products, 'Update attributes');`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ class AssertMassProductUpdateSuccessMessage extends AbstractConstraint`
`23`	`23`	`* Assert that after mass update successful message appears.`
`24`	`24`	`*`
`25`	`25`	`* @param CatalogProductIndex $productGrid`
`26`		`- * @param $productsCount`
	`26`	`+ * @param string $productsCount`
`27`	`27`	`* @return void`
`28`	`28`	`*/`
`29`	`29`	`public function processAssert(CatalogProductIndex $productGrid, $productsCount)`
Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,6 @@ public function processAssert(`
`42`	`42`	`*/`
`43`	`43`	`public function toString()`
`44`	`44`	`{`
`45`		`- return 'In stock control is visible.';`
	`45`	`+ return 'In stock control is visible for each product.';`
`46`	`46`	`}`
`47`	`47`	`}`