Merge remote-tracking branch 'origin/MAGETWO-69501' into 2.1.8-develop-pr20

Author: zakdma

app/code/Magento/Swatches/Helper/Data.php

@@ -346,8 +346,14 @@ private function getAllSizeImages(ModelProduct $product, $imageFile)
      */
     private function getSwatchAttributes(Product $product)
     {
-        $swatchAttributes = $this->swatchAttributesProvider->provide($product);
-        return $swatchAttributes;
+        $attributes = $this->swatchAttributesProvider->provide($product) ?: [];
+        foreach ($attributes as $attribute) {
+            if (!$attribute->hasData(Swatch::SWATCH_INPUT_TYPE_KEY)) {
+                $this->populateAdditionalDataEavAttribute($attribute);
+            }
+        }
+
+        return $attributes;
     }
 
     /**

app/code/Magento/Swatches/Test/Unit/Helper/DataTest.php

@@ -552,7 +552,10 @@ public function testGetSwatchAttributesAsArray($optionsArray, $attributeData, $e
         $storeMock->method('getId')->willReturn($storeId);
         $this->storeManagerMock->method('getStore')->willReturn($storeMock);
 
-        $this->attributeMock->method('getData')->with('')->willReturn($attributeData);
+        $this->attributeMock
+            ->method('getData')
+            ->withConsecutive(['additional_data'], [''])
+            ->will($this->onConsecutiveCalls('', $attributeData));
 
         $sourceMock = $this->getMock(
             \Magento\Eav\Model\Entity\Attribute\Source\AbstractSource::class,