From 6ec1b972f72b9e38e2e4c06f4fdd83db8a0677c4 Mon Sep 17 00:00:00 2001
From: Alex Lukyanau <cybergomel@gmail.com>
Date: Fri, 11 May 2018 01:07:21 -0400
Subject: [PATCH] Travic CI Test case errors

---
 .../Magento/Framework/View/Asset/Merged.php         |  2 +-
 .../Framework/View/Test/Unit/Asset/MergedTest.php   | 13 ++++++++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)
 mode change 100644 => 100755 lib/internal/Magento/Framework/View/Test/Unit/Asset/MergedTest.php

diff --git a/lib/internal/Magento/Framework/View/Asset/Merged.php b/lib/internal/Magento/Framework/View/Asset/Merged.php
index 2dddc2e59d9ac..57105ab231e03 100755
--- a/lib/internal/Magento/Framework/View/Asset/Merged.php
+++ b/lib/internal/Magento/Framework/View/Asset/Merged.php
@@ -41,7 +41,7 @@ class Merged implements \Iterator
     protected $contentType;
 
     /**
-     * @var StorageInterface
+     * @var \Magento\Framework\App\View\Deployment\Version\StorageInterface
      */
     private $versionStorage;
 
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Asset/MergedTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Asset/MergedTest.php
old mode 100644
new mode 100755
index 164a2ca4d4d1b..34a19c346a64f
--- a/lib/internal/Magento/Framework/View/Test/Unit/Asset/MergedTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Asset/MergedTest.php
@@ -12,6 +12,7 @@
 use Magento\Framework\View\Asset\Repository as AssetRepository;
 use Magento\Framework\View\Asset\MergeableInterface;
 use Magento\Framework\View\Asset\MergeStrategyInterface;
+use Magento\Framework\App\View\Deployment\Version\StorageInterface;
 
 /**
  * Class MergedTest
@@ -43,6 +44,11 @@ class MergedTest extends \PHPUnit\Framework\TestCase
      */
     private $assetRepo;
 
+    /**
+     * @var StorageInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $versionStorage;
+
     protected function setUp()
     {
         $this->assetJsOne = $this->getMockForAbstractClass(MergeableInterface::class);
@@ -66,6 +72,7 @@ protected function setUp()
         $this->assetRepo = $this->getMockBuilder(AssetRepository::class)
             ->disableOriginalConstructor()
             ->getMock();
+        $this->versionStorage = $this->createMock(StorageInterface::class);
     }
 
     /**
@@ -74,7 +81,7 @@ protected function setUp()
      */
     public function testConstructorNothingToMerge()
     {
-        new \Magento\Framework\View\Asset\Merged($this->logger, $this->mergeStrategy, $this->assetRepo, []);
+        new \Magento\Framework\View\Asset\Merged($this->logger, $this->mergeStrategy, $this->assetRepo, $this->versionStorage, []);
     }
 
     /**
@@ -89,6 +96,7 @@ public function testConstructorRequireMergeInterface()
             'logger' => $this->logger,
             'mergeStrategy' => $this->mergeStrategy,
             'assetRepo' => $this->assetRepo,
+            'versionStorage' => $this->versionStorage,
             'assets' => [$this->assetJsOne, $assetUrl],
         ]);
     }
@@ -108,6 +116,7 @@ public function testConstructorIncompatibleContentTypes()
             'logger' => $this->logger,
             'mergeStrategy' => $this->mergeStrategy,
             'assetRepo' => $this->assetRepo,
+            'versionStorage' => $this->versionStorage,
             'assets' => [$this->assetJsOne, $assetCss],
         ]);
     }
@@ -123,6 +132,7 @@ public function testIteratorInterfaceMerge()
             'logger' => $this->logger,
             'mergeStrategy' => $this->mergeStrategy,
             'assetRepo' => $this->assetRepo,
+            'versionStorage' => $this->versionStorage,
             'assets' => $assets,
         ]);
 
@@ -157,6 +167,7 @@ public function testIteratorInterfaceMergeFailure()
             'logger' => $this->logger,
             'mergeStrategy' => $this->mergeStrategy,
             'assetRepo' => $this->assetRepo,
+            'versionStorage' => $this->versionStorage,
             'assets' => [$this->assetJsOne, $this->assetJsTwo, $assetBroken],
         ]);