Merge remote-tracking branch 'origin/MAGETWO-49481' into Troll_S53

Author: rganin

app/code/Magento/Eav/Model/ResourceModel/UpdateHandler.php

@@ -134,6 +134,7 @@ public function execute($entityType, $data)
                 if ((!array_key_exists($attribute->getAttributeCode(), $snapshot)
                     || $snapshot[$attribute->getAttributeCode()] === false)
                     && array_key_exists($attribute->getAttributeCode(), $data)
+                    && $data[$attribute->getAttributeCode()] !== false
                     && !$attribute->isValueEmpty($data[$attribute->getAttributeCode()])
                 ) {
                     $this->attributePersistor->registerInsert(
@@ -147,6 +148,7 @@ public function execute($entityType, $data)
                 if (array_key_exists($attribute->getAttributeCode(), $snapshot)
                     && $snapshot[$attribute->getAttributeCode()] !== false
                     && array_key_exists($attribute->getAttributeCode(), $data)
+                    && $data[$attribute->getAttributeCode()] !== false
                     && $snapshot[$attribute->getAttributeCode()] != $data[$attribute->getAttributeCode()]
                     && !$attribute->isValueEmpty($data[$attribute->getAttributeCode()])
                 ) {

dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/CategoryTest.php

@@ -147,7 +147,58 @@ public function testSuggestCategoriesActionNoSuggestions()
     public function saveActionDataProvider()
     {
         return [
-            //'default values' removed from here. Should be fixed in MAGETWO-49481
+            'default values' => [
+                [
+                    'id' => '2',
+                    'entity_id' => '2',
+                    'path' => '1/2',
+                    'url_key' => 'default-category',
+                    'is_anchor' => false,
+                    'use_default' => [
+                        'name' => 1,
+                        'is_active' => 1,
+                        'thumbnail' => 1,
+                        'description' => 1,
+                        'image' => 1,
+                        'meta_title' => 1,
+                        'meta_keywords' => 1,
+                        'meta_description' => 1,
+                        'include_in_menu' => 1,
+                        'display_mode' => 1,
+                        'landing_page' => 1,
+                        'available_sort_by' => 1,
+                        'default_sort_by' => 1,
+                        'filter_price_range' => 1,
+                        'custom_apply_to_products' => 1,
+                        'custom_design' => 1,
+                        'custom_design_from' => 1,
+                        'custom_design_to' => 1,
+                        'page_layout' => 1,
+                        'custom_layout_update' => 1,
+                    ],
+                ],
+                [
+                    'name' => false,
+                    'default_sort_by' => false,
+                    'display_mode' => false,
+                    'meta_title' => false,
+                    'custom_design' => false,
+                    'page_layout' => false,
+                    'is_active' => false,
+                    'include_in_menu' => false,
+                    'landing_page' => false,
+                    'is_anchor' => false,
+                    'custom_apply_to_products' => false,
+                    'available_sort_by' => false,
+                    'description' => false,
+                    'meta_keywords' => false,
+                    'meta_description' => false,
+                    'custom_layout_update' => false,
+                    'custom_design_from' => false,
+                    'custom_design_to' => false,
+                    'filter_price_range' => false
+                ],
+            ],
             'custom values' => [
                 [
                     'id' => '2',
@@ -163,7 +214,7 @@ public function saveActionDataProvider()
                     'url_key' => 'default-category',
                     'display_mode' => 'PRODUCTS',
                     'landing_page' => '1',
-                    'is_anchor' => '1',
+                    'is_anchor' => true,
                     'custom_apply_to_products' => '0',
                     'custom_design' => 'Magento/blank',
                     'custom_design_from' => '5/21/2015',
@@ -232,7 +283,7 @@ public function saveActionDataProvider()
                     'url_key' => 'default-category',
                     'display_mode' => 'PRODUCTS',
                     'landing_page' => '1',
-                    'is_anchor' => '1',
+                    'is_anchor' => true,
                     'custom_apply_to_products' => '0',
                     'custom_design' => 'Magento/blank',
                     'custom_design_from' => '5/29/2015',