From 2ebd193dd684ebfef76ba99faca9b2adc6a3907b Mon Sep 17 00:00:00 2001
From: Paul Lewis <plewis@ebay.com>
Date: Thu, 12 Feb 2015 09:57:40 -0600
Subject: [PATCH] MAGETWO-33669: Contribution of Sprint 23 Work to Mainline
- use ObjectManagerProvider instead of ObjectManagerFactory in unit tests
---
.../testsuite/Magento/Setup/Controller/ModulesTest.php | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/dev/tests/unit/testsuite/Magento/Setup/Controller/ModulesTest.php b/dev/tests/unit/testsuite/Magento/Setup/Controller/ModulesTest.php
index bc6387f0a26..0c23c1c21a1 100644
--- a/dev/tests/unit/testsuite/Magento/Setup/Controller/ModulesTest.php
+++ b/dev/tests/unit/testsuite/Magento/Setup/Controller/ModulesTest.php
@@ -34,12 +34,15 @@ class ModulesTest extends \PHPUnit_Framework_TestCase
{
$this->objectManager = $this->getMockForAbstractClass('Magento\Framework\ObjectManagerInterface');
$this->status = $this->getMock('Magento\Framework\Module\Status', [], [], '', false);
- $objectManagerFactory = $this->getMock('Magento\Setup\Model\ObjectManagerFactory', [], [], '', false);
- $objectManagerFactory->expects($this->once())->method('create')->willReturn($this->objectManager);
+ /** @var
+ * $objectManagerProvider \PHPUnit_Framework_MockObject_MockObject|\Magento\Setup\Model\ObjectManagerProvider
+ */
+ $objectManagerProvider = $this->getMock('Magento\Setup\Model\ObjectManagerProvider', [], [], '', false);
+ $objectManagerProvider->expects($this->once())->method('get')->willReturn($this->objectManager);
$this->modules = $this->getMock('Magento\Setup\Model\ModuleStatus', [], [], '', false);
$this->status = $this->getMock('Magento\Framework\Module\Status', [], [], '', false);
$this->objectManager->expects($this->once())->method('create')->will($this->returnValue($this->status));
- $this->controller = new Modules($this->modules, $objectManagerFactory);
+ $this->controller = new Modules($this->modules, $objectManagerProvider);
}
/**
--
GitLab