MAGETWO-58053: [GITHUB] Product image issue with multiple store views Magento 2.1.0 #6259

Author: le0n4eg

app/code/Magento/Catalog/Model/Product/Gallery/CreateHandler.php

@@ -160,12 +160,13 @@ public function execute($product, $arguments = [])
             if (in_array($attrData, array_keys($existImages))) {
                 $product->setData($mediaAttrCode . '_label', $existImages[$attrData]['label']);
             }
-
-            $product->addAttributeUpdate(
-                $mediaAttrCode,
-                $product->getData($mediaAttrCode),
-                $product->getStoreId()
-            );
+            if (!empty($product->getData($mediaAttrCode))) {
+                $product->addAttributeUpdate(
+                    $mediaAttrCode,
+                    $product->getData($mediaAttrCode),
+                    $product->getStoreId()
+                );
+            }
         }
 
         $product->setData($attrCode, $value);

dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Gallery/CreateHandlerTest.php

@@ -18,6 +18,10 @@ class CreateHandlerTest extends \PHPUnit_Framework_TestCase
      */
     protected $createHandler;
 
+    private $fileName = '/m/a/magento_image.jpg';
+
+    private $fileLabel = 'Magento image';
+
     protected function setUp()
     {
         $this->createHandler = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
@@ -28,31 +32,98 @@ protected function setUp()
     /**
      * @covers \Magento\Catalog\Model\Product\Gallery\CreateHandler::execute
      */
-    public function testExecute()
+    public function testExecuteWithImageDuplicate()
     {
-        $fileName = '/m/a/magento_image.jpg';
-        $fileLabel = 'Magento image';
         /** @var $product \Magento\Catalog\Model\Product */
         $product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
             \Magento\Catalog\Model\Product::class
         );
         $product->load(1);
         $product->setData(
             'media_gallery',
-            ['images' => ['image' => ['file' => $fileName, 'label' => $fileLabel]]]
+            ['images' => ['image' => ['file' => $this->fileName, 'label' => $this->fileLabel]]]
         );
-        $product->setData('image', $fileName);
+        $product->setData('image', $this->fileName);
         $this->createHandler->execute($product);
         $this->assertStringStartsWith('/m/a/magento_image', $product->getData('media_gallery/images/image/new_file'));
-        $this->assertEquals($fileLabel, $product->getData('image_label'));
+        $this->assertEquals($this->fileLabel, $product->getData('image_label'));
 
         $product->setIsDuplicate(true);
         $product->setData(
             'media_gallery',
-            ['images' => ['image' => ['value_id' => '100', 'file' => $fileName, 'label' => $fileLabel]]]
+            ['images' => ['image' => ['value_id' => '100', 'file' => $this->fileName, 'label' => $this->fileLabel]]]
         );
         $this->createHandler->execute($product);
         $this->assertStringStartsWith('/m/a/magento_image', $product->getData('media_gallery/duplicate/100'));
-        $this->assertEquals($fileLabel, $product->getData('image_label'));
+        $this->assertEquals($this->fileLabel, $product->getData('image_label'));
+    }
+
+    /**
+     * @covers \Magento\Catalog\Model\Product\Gallery\CreateHandler::execute
+     * @dataProvider executeDataProvider
+     * @param array $expectedValues
+     */
+    public function testExecuteWithImageRoles($expectedValues)
+    {
+        /** @var $product \Magento\Catalog\Model\Product */
+        $product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+            \Magento\Catalog\Model\Product::class
+        );
+        $product->load(1);
+        $product->setData(
+            'media_gallery',
+            ['images' => ['image' => ['file' => $this->fileName, 'label' => '']]]
+        );
+        foreach ($expectedValues as $mediaAttribute => $value) {
+            if ($value) {
+                $product->setData($mediaAttribute, $value);
+            }
+        }
+        $this->createHandler->execute($product);
+        $this->assertStringStartsWith('/m/a/magento_image', $product->getData('media_gallery/images/image/new_file'));
+        $resource = $product->getResource();
+        $attributeValues = [];
+        foreach (array_keys($expectedValues) as $mediaAttribute) {
+            $attributeValues[$mediaAttribute] = $resource->getAttributeRawValue(
+                $product->getId(),
+                $resource->getAttribute($mediaAttribute),
+                $product->getStoreId()
+            );
+        }
+        $this->assertStringStartsWith('/m/a/magento_image', $product->getData('media_gallery/images/image/new_file'));
+        $this->assertEquals($expectedValues, $attributeValues);
+    }
+
+    /**
+     * @return array
+     */
+    public function executeDataProvider()
+    {
+        return [
+            [
+                [
+                    'image' => $this->fileName,
+                    'small_image' => $this->fileName,
+                    'swatch_image' => $this->fileName,
+                    'thumbnail' => $this->fileName
+                ]
+            ],
+            [
+                [
+                    'image' => 'no_selection',
+                    'small_image' => 'no_selection',
+                    'swatch_image' => 'no_selection',
+                    'thumbnail' => 'no_selection'
+                ]
+            ],
+            [
+                [
+                    'image' => null,
+                    'small_image' => null,
+                    'swatch_image' => null,
+                    'thumbnail' => null
+                ]
+            ]
+        ];
     }
 }