Skip to content

Commit d6540b6

Browse files
committed
MAGETWO-52660: Improve performance of static assets deployment
1 parent f0c37eb commit d6540b6

File tree

2 files changed

+22
-5
lines changed

2 files changed

+22
-5
lines changed

app/code/Magento/Deploy/Test/Unit/Model/DeployManagerTest.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ class DeployManagerTest extends \PHPUnit_Framework_TestCase
3333
private $minifierTemplateMock;
3434

3535
/**
36-
* @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Deploy\Model\ProcessQueueManager
36+
* @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Deploy\Model\ProcessQueueManagerFactory
3737
*/
38-
private $processQueueManager;
38+
private $processQueueManagerFactoryMock;
3939

4040
/**
4141
* @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\App\State
@@ -65,8 +65,8 @@ protected function setUp()
6565
'',
6666
false
6767
);
68-
$this->processQueueManager = $this->getMock(
69-
\Magento\Deploy\Model\ProcessQueueManager::class,
68+
$this->processQueueManagerFactoryMock = $this->getMock(
69+
\Magento\Deploy\Model\ProcessQueueManagerFactory::class,
7070
[],
7171
[],
7272
'',
@@ -159,7 +159,7 @@ private function getModel(array $options)
159159
$this->outputMock,
160160
$this->versionStorageMock,
161161
$this->deployStrategyProviderFactoryMock,
162-
$this->processQueueManager,
162+
$this->processQueueManagerFactoryMock,
163163
$this->minifierTemplateMock,
164164
$this->stateMock,
165165
$options

app/code/Magento/Deploy/Test/Unit/Model/ProcessQueueManagerTest.php

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
use Magento\Deploy\Model\ProcessManager;
99
use Magento\Framework\App\ResourceConnection;
1010
use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
11+
use Magento\Deploy\Model\ProcessTaskFactory;
12+
use Magento\Deploy\Model\ProcessTask;
1113

1214
class ProcessQueueManagerTest extends \PHPUnit_Framework_TestCase
1315
{
@@ -26,15 +28,29 @@ class ProcessQueueManagerTest extends \PHPUnit_Framework_TestCase
2628
*/
2729
private $resourceConnectionMock;
2830

31+
/**
32+
* @var \PHPUnit_Framework_MockObject_MockObject|ProcessTaskFactory
33+
*/
34+
private $processTaskFactoryMock;
35+
36+
/**
37+
* @var \PHPUnit_Framework_MockObject_MockObject|ProcessTask
38+
*/
39+
private $processTaskMock;
40+
2941
protected function setUp()
3042
{
3143
$this->processManagerMock = $this->getMock(ProcessManager::class, [], [], '', false);
3244
$this->resourceConnectionMock = $this->getMock(ResourceConnection::class, [], [], '', false);
45+
$this->processTaskFactoryMock = $this->getMock(ProcessTaskFactory::class, [], [], '', false);
46+
$this->processTaskMock = $this->getMock(ProcessTask::class, [], [], '', false);
47+
$this->processTaskFactoryMock->expects($this->any())->method('create')->willReturn($this->processTaskMock);
3348
$this->model = (new ObjectManager($this))->getObject(
3449
\Magento\Deploy\Model\ProcessQueueManager::class,
3550
[
3651
'processManager' => $this->processManagerMock,
3752
'resourceConnection' => $this->resourceConnectionMock,
53+
'processTaskFactory' => $this->processTaskFactoryMock
3854
]
3955
);
4056
}
@@ -44,6 +60,7 @@ public function testProcess()
4460
$callableMock = function () {
4561
return true;
4662
};
63+
$this->processTaskMock->expects($this->any())->method('getHandler')->willReturn($callableMock);
4764

4865
$processMock = $this->getMock(\Magento\Deploy\Model\Process::class, [], [], '', false);
4966

0 commit comments

Comments
 (0)