Merge branch 'develop' of https://github.corp.ebay.com/magento-troll/magento2ce into develop

Author: Roman Ganin

dev/tests/unit/testsuite/Magento/Framework/App/StaticResourceTest.php

@@ -55,6 +55,11 @@ class StaticResourceTest extends \PHPUnit_Framework_TestCase
      */
     private $object;
 
+    /**
+     * @var \Magento\Framework\View\Asset\MinifyService|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $minifyService;
+
     protected function setUp()
     {
         $this->state = $this->getMock('Magento\Framework\App\State', [], [], '', false);
@@ -67,6 +72,11 @@ protected function setUp()
         $this->configLoader = $this->getMock(
             'Magento\Framework\App\ObjectManager\ConfigLoader', [], [], '', false
         );
+        $this->minifyService = $this->getMockBuilder('Magento\Framework\View\Asset\MinifyService')
+            ->disableOriginalConstructor()
+            ->setMethods(['getAssets'])
+            ->getMock();
+
         $this->object = new \Magento\Framework\App\StaticResource(
             $this->state,
             $this->response,
@@ -76,6 +86,7 @@ protected function setUp()
             $this->moduleList,
             $this->objectManager,
             $this->configLoader,
+            $this->minifyService,
             $this->getMockForAbstractClass('\Magento\Framework\View\DesignInterface')
         );
     }
@@ -142,6 +153,7 @@ public function testLaunch(
         $this->response->expects($this->once())
             ->method('setFilePath')
             ->with('resource/file.css');
+        $this->minifyService->expects($this->once())->method('getAssets')->willReturnArgument(0);
         $this->object->launch();
     }