Fix Product View Gallery Block Unit Tests

Author: David Verholen

app/code/Magento/Catalog/Block/Product/View/Gallery.php

@@ -65,15 +65,16 @@ public function getGalleryImages()
         $images = $product->getMediaGalleryImages();
         if ($images instanceof \Magento\Framework\Data\Collection) {
             foreach ($images as $image) {
-                /** @var DataObject $image */
-                $this->galleryImagesConfig->walk(function (DataObject $imageConfig) use ($image, $product) {
+                foreach($this->galleryImagesConfig->getItems() as $imageConfig) {
                     /** @var Product $product */
-                    $productImage = $this->_imageHelper->init($product,
-                        $imageConfig['image_id'])
-                        ->setImageFile($image->getData('file'))
-                        ->getUrl();
-                    $image->setData($imageConfig->getData('data_object_key'), $productImage);
-                });
+                    $image->setData(
+                        $imageConfig->getData('data_object_key'),
+                        $this->_imageHelper->init($product,
+                            $imageConfig['image_id'])
+                            ->setImageFile($image->getData('file'))
+                            ->getUrl()
+                    );
+                }
             }
         }
 
@@ -115,14 +116,12 @@ public function getGalleryImagesJson()
                 'position' => $image->getData('position'),
                 'isMain'   => $this->isMainImage($image),
             ]);
-            $this->galleryImagesConfig->walk(function (
-                DataObject $imageConfig
-            ) use ($imageItem, $image) {
+            foreach($this->galleryImagesConfig->getItems() as $imageConfig) {
                 $imageItem->setData(
                     $imageConfig->getData('json_object_key'),
                     $image->getData($imageConfig->getData('data_object_key'))
                 );
-            });
+            }
             $imagesItems[] = $imageItem->toArray();
         }
         if (empty($imagesItems)) {

app/code/Magento/Catalog/Test/Unit/Block/Product/View/GalleryTest.php

@@ -40,7 +40,12 @@ class GalleryTest extends \PHPUnit_Framework_TestCase
     /**
      * @var \Magento\Catalog\Model\Product\Gallery\ImagesConfigFactoryInterface|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $imagesConfigMock;
+    protected $imagesConfigFactoryMock;
+
+    /**
+     * @var \Magento\Framework\Data\Collection|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $galleryImagesConfigMock;
 
     protected function setUp()
     {
@@ -54,15 +59,13 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMock();
 
-        $this->imagesConfigMock = $this->getMockBuilder('Magento\Catalog\Model\Product\Gallery\ImagesConfigFactoryInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
+        $this->imagesConfigFactoryMock = $this->getImagesConfigFactory();
 
         $this->model = new \Magento\Catalog\Block\Product\View\Gallery(
             $this->context,
             $this->arrayUtils,
             $this->jsonEncoderMock,
-            $this->imagesConfigMock
+            $this->imagesConfigFactoryMock
         );
     }
 
@@ -117,6 +120,10 @@ public function testGetGalleryImages()
             ->with('product')
             ->willReturn($productMock);
 
+        $this->galleryImagesConfigMock->expects($this->exactly(1))
+            ->method('getItems')
+            ->willReturn($this->getGalleryImagesConfigItems());
+
         $this->imageHelper->expects($this->exactly(3))
             ->method('init')
             ->willReturnMap([
@@ -164,4 +171,56 @@ private function getImagesCollection()
 
         return $collectionMock;
     }
+
+    /**
+     * getImagesConfigFactory
+     *
+     * @return \Magento\Catalog\Model\Product\Gallery\ImagesConfigFactoryInterface
+     */
+    private function getImagesConfigFactory()
+    {
+        $this->galleryImagesConfigMock = $this->getMockBuilder('\Magento\Framework\Data\Collection')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->galleryImagesConfigMock->expects($this->any())
+            ->method('getIterator')
+            ->willReturn(new \ArrayIterator($this->getGalleryImagesConfigItems()));
+
+        $galleryImagesConfigFactoryMock = $this->getMockBuilder('Magento\Catalog\Model\Product\Gallery\ImagesConfigFactoryInterface')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $galleryImagesConfigFactoryMock->expects($this->any())
+            ->method('create')
+            ->willReturn($this->galleryImagesConfigMock);
+
+        return $galleryImagesConfigFactoryMock;
+    }
+
+    /**
+     * getGalleryImagesConfigItems
+     *
+     * @return array
+     */
+    private function getGalleryImagesConfigItems()
+    {
+        return  [
+            new \Magento\Framework\DataObject([
+                'image_id' => 'product_page_image_small',
+                'data_object_key' => 'small_image_url',
+                'json_object_key' => 'thumb'
+            ]),
+            new \Magento\Framework\DataObject([
+                'image_id' => 'product_page_image_medium',
+                'data_object_key' => 'medium_image_url',
+                'json_object_key' => 'img'
+            ]),
+            new \Magento\Framework\DataObject([
+                'image_id' => 'product_page_image_large',
+                'data_object_key' => 'large_image_url',
+                'json_object_key' => 'full'
+            ])
+        ];
+    }
 }