Skip to content

Commit 0210032

Browse files
committed
MAGETWO-43646: Sort ordering for static files pre-processors
- Fixed tests
1 parent b4a5200 commit 0210032

File tree

2 files changed

+5
-7
lines changed

2 files changed

+5
-7
lines changed

lib/internal/Magento/Framework/View/Asset/PreProcessor/AlternativeSource.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,6 @@ public function process(Chain $chain)
103103
/** @var FallbackContext $context */
104104
$context = $chain->getAsset()->getContext();
105105
$chain->setContent($this->processContent($path, $content, $module, $context));
106-
} catch (\Exception $e) {
107-
throw $e;
108106
} finally {
109107
$this->lockerProcess->unlockProcess();
110108
}

lib/internal/Magento/Framework/View/Test/Unit/Asset/PreProcessor/AlternativeSourceTest.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,6 @@ protected function setUp()
8282

8383
/**
8484
* Run test for process method (exception)
85-
*
86-
* @expectedException \UnexpectedValueException
87-
* @expectedExceptionMessage "stdClass" has to implement the ContentProcessorInterface.
8885
*/
8986
public function testProcessException()
9087
{
@@ -142,8 +139,11 @@ public function testProcessException()
142139
'lock',
143140
$alternatives
144141
);
145-
146-
$alternativeSource->process($this->getChainMockExpects('', 0));
142+
try {
143+
$alternativeSource->process($this->getChainMockExpects('', 0));
144+
} catch (\UnexpectedValueException $e) {
145+
self::assertInstanceOf('\UnexpectedValueException', $e);
146+
}
147147
}
148148

149149
/**

0 commit comments

Comments
 (0)