MAGETWO-69397: Hidden product images are not hidden from category listing or product view

 - support custom placeholder images

Author: cspruiell

app/code/Magento/Catalog/Test/Unit/Helper/ImageTest.php

@@ -42,6 +42,11 @@ class ImageTest extends \PHPUnit_Framework_TestCase
      */
     protected $scopeConfig;
 
+    /**
+     * @var \Magento\Catalog\Model\View\Asset\PlaceholderFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $placeholderFactory;
+
     protected function setUp()
     {
         $this->mockContext();
@@ -54,11 +59,16 @@ protected function setUp()
         $this->viewConfig = $this->getMockBuilder(\Magento\Framework\View\ConfigInterface::class)
             ->getMockForAbstractClass();
 
+        $this->placeholderFactory = $this->getMockBuilder(\Magento\Catalog\Model\View\Asset\PlaceholderFactory::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
         $this->helper = new \Magento\Catalog\Helper\Image(
             $this->context,
             $this->imageFactory,
             $this->assetRepository,
-            $this->viewConfig
+            $this->viewConfig,
+            $this->placeholderFactory
         );
     }