From a6c137a9216d3dc6e5fb781bc04df29c5e71e955 Mon Sep 17 00:00:00 2001
From: Joan He <joan@x.com>
Date: Wed, 1 Apr 2015 10:48:58 -0500
Subject: [PATCH] MAGETWO-35465: testSetNoCacheHeaders randomly fails
---
.../Magento/Test/TestCase/ControllerAbstractTest.php | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/TestCase/ControllerAbstractTest.php b/dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/TestCase/ControllerAbstractTest.php
index ffb91846099..edd2d4e255b 100644
--- a/dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/TestCase/ControllerAbstractTest.php
+++ b/dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/TestCase/ControllerAbstractTest.php
@@ -17,11 +17,11 @@ class ControllerAbstractTest extends \Magento\TestFramework\TestCase\AbstractCon
protected function setUp()
{
- $testObjectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+ $testObjectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
$this->messageManager = $this->getMock('\Magento\Framework\Message\Manager', [], [], '', false);
- $request = $testObjectManager->get('Magento\TestFramework\Request');
- $response = $testObjectManager->get('Magento\TestFramework\Response');
+ $request = $testObjectManager->getObject('Magento\TestFramework\Request');
+ $response = $testObjectManager->getObject('Magento\TestFramework\Response');
$this->_objectManager = $this->getMock(
'Magento\TestFramework\ObjectManager',
['get', 'create'],
--
GitLab