MAGETWO-60823: Cannot unset (set empty) category image on store view level if image defined on all store views

- Fixed
- Modified test

Author: Oleksandr Dubovyk

app/code/Magento/Catalog/Controller/Adminhtml/Category/Save.php

@@ -280,7 +280,7 @@ public function imagePreprocessing($data)
                 continue;
             }
 
-            $data[$attributeCode] = false;
+            $data[$attributeCode] = '';
         }
 
         return $data;

app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Category/SaveTest.php

@@ -5,8 +5,6 @@
  */
 namespace Magento\Catalog\Test\Unit\Controller\Adminhtml\Category;
 
-use Magento\Catalog\Controller\Adminhtml\Category\Save as Model;
-
 /**
  * Class SaveTest
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -463,18 +461,35 @@ public function dataProviderExecute()
      */
     public function imagePreprocessingDataProvider()
     {
+        $dataWithImage = [
+            'image' => 'path.jpg',
+            'name' => 'category',
+            'description' => '',
+            'parent' => 0
+        ];
+        $expectedSameAsDataWithImage = $dataWithImage;
+
+        $dataWithoutImage = [
+            'name' => 'category',
+            'description' => '',
+            'parent' => 0
+        ];
+        $expectedIfDataWithoutImage = $dataWithoutImage;
+        $expectedIfDataWithoutImage['image'] = '';
+
         return [
-            [['attribute1' => null, 'attribute2' => 123]],
-            [['attribute2' => 123]]
+            'categoryPostData contains image' => [$dataWithImage, $expectedSameAsDataWithImage],
+            'categoryPostData doesn\'t contain image' => [$dataWithoutImage, $expectedIfDataWithoutImage],
         ];
     }
 
     /**
      * @dataProvider imagePreprocessingDataProvider
      *
      * @param array $data
+     * @param array $expected
      */
-    public function testImagePreprocessingWithoutValue($data)
+    public function testImagePreprocessing($data, $expected)
     {
         $eavConfig = $this->createPartialMock(\Magento\Eav\Model\Config::class, ['getEntityType']);
 
@@ -484,68 +499,30 @@ public function testImagePreprocessingWithoutValue($data)
 
         $collection = new \Magento\Framework\DataObject(['attribute_collection' => [
             new \Magento\Framework\DataObject([
-                'attribute_code' => 'attribute1',
+                'attribute_code' => 'image',
                 'backend' => $imageBackendModel
             ]),
             new \Magento\Framework\DataObject([
-                'attribute_code' => 'attribute2',
+                'attribute_code' => 'name',
                 'backend' => new \Magento\Framework\DataObject()
-            ])
-        ]]);
-
-        $eavConfig->expects($this->once())
-            ->method('getEntityType')
-            ->with(\Magento\Catalog\Api\Data\CategoryAttributeInterface::ENTITY_TYPE_CODE)
-            ->will($this->returnValue($collection));
-
-        $model = $this->objectManager->getObject(\Magento\Catalog\Controller\Adminhtml\Category\Save::class, [
-            'eavConfig' => $eavConfig
-        ]);
-
-        $result = $model->imagePreprocessing($data);
-
-        $this->assertEquals([
-            'attribute1' => false,
-            'attribute2' => 123
-        ], $result);
-    }
-
-    public function testImagePreprocessingWithValue()
-    {
-        $eavConfig = $this->createPartialMock(\Magento\Eav\Model\Config::class, ['getEntityType']);
-
-        $imageBackendModel = $this->objectManager->getObject(
-            \Magento\Catalog\Model\Category\Attribute\Backend\Image::class
-        );
-
-        $collection = new \Magento\Framework\DataObject(['attribute_collection' => [
-            new \Magento\Framework\DataObject([
-                'attribute_code' => 'attribute1',
-                'backend' => $imageBackendModel
             ]),
             new \Magento\Framework\DataObject([
-                'attribute_code' => 'attribute2',
+                'attribute_code' => 'level',
                 'backend' => new \Magento\Framework\DataObject()
-            ])
+            ]),
         ]]);
 
         $eavConfig->expects($this->once())
             ->method('getEntityType')
             ->with(\Magento\Catalog\Api\Data\CategoryAttributeInterface::ENTITY_TYPE_CODE)
             ->will($this->returnValue($collection));
 
-        $model = $this->objectManager->getObject(Model::class, [
+        $model = $this->objectManager->getObject(\Magento\Catalog\Controller\Adminhtml\Category\Save::class, [
             'eavConfig' => $eavConfig
         ]);
 
-        $result = $model->imagePreprocessing([
-            'attribute1' => 'somevalue',
-            'attribute2' => null
-        ]);
+        $result = $model->imagePreprocessing($data);
 
-        $this->assertEquals([
-            'attribute1' => 'somevalue',
-            'attribute2' => null
-        ], $result);
+        $this->assertEquals($expected, $result);
     }
 }

app/design/adminhtml/Magento/backend/web/css/source/components/_file-uploader.less

@@ -74,6 +74,14 @@
                 box-shadow: 0 0 0 1px @file-uploader-preview-focus__color;
             }
         }
+
+        &:disabled {
+            + .file-uploader-button {
+                cursor: default;
+                opacity: .5;
+                pointer-events: none;
+            }
+        }
     }
 }