From 831e58c2ac596592548220d111491426b433c5e0 Mon Sep 17 00:00:00 2001 From: Alex Lukyanau Date: Fri, 11 May 2018 02:24:26 -0400 Subject: [PATCH] Fixed Unit Tests --- .../Magento/Framework/View/Test/Unit/Asset/MergedTest.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Asset/MergedTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Asset/MergedTest.php index 0e06b81068b9a..8f6cb55d562d4 100755 --- a/lib/internal/Magento/Framework/View/Test/Unit/Asset/MergedTest.php +++ b/lib/internal/Magento/Framework/View/Test/Unit/Asset/MergedTest.php @@ -101,8 +101,8 @@ public function testConstructorRequireMergeInterface() 'logger' => $this->logger, 'mergeStrategy' => $this->mergeStrategy, 'assetRepo' => $this->assetRepo, - 'versionStorage' => $this->versionStorage, 'assets' => [$this->assetJsOne, $assetUrl], + 'versionStorage' => $this->versionStorage, ]); } @@ -121,8 +121,8 @@ public function testConstructorIncompatibleContentTypes() 'logger' => $this->logger, 'mergeStrategy' => $this->mergeStrategy, 'assetRepo' => $this->assetRepo, - 'versionStorage' => $this->versionStorage, 'assets' => [$this->assetJsOne, $assetCss], + 'versionStorage' => $this->versionStorage, ]); } @@ -137,8 +137,8 @@ public function testIteratorInterfaceMerge() 'logger' => $this->logger, 'mergeStrategy' => $this->mergeStrategy, 'assetRepo' => $this->assetRepo, - 'versionStorage' => $this->versionStorage, 'assets' => $assets, + 'versionStorage' => $this->versionStorage, ]); $mergedAsset = $this->createMock(\Magento\Framework\View\Asset\File::class); @@ -172,8 +172,8 @@ public function testIteratorInterfaceMergeFailure() 'logger' => $this->logger, 'mergeStrategy' => $this->mergeStrategy, 'assetRepo' => $this->assetRepo, - 'versionStorage' => $this->versionStorage, 'assets' => [$this->assetJsOne, $this->assetJsTwo, $assetBroken], + 'versionStorage' => $this->versionStorage, ]); $this->logger->expects($this->once())->method('critical')->with($this->identicalTo($mergeError));