From 68ca8b36b7dafa82bfee683d0e91d9f4097a8c5b Mon Sep 17 00:00:00 2001
From: Dale Sikkema <dsikkema@ebay.com>
Date: Tue, 31 Mar 2015 13:09:08 -0500
Subject: [PATCH] MAGETWO-35465: testSetNoCacheHeaders randomly fails
---
.../Test/TestCase/ControllerAbstractTest.php | 17 ++++-------------
1 file changed, 4 insertions(+), 13 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 4f1d41953ed..ffb91846099 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,20 +17,11 @@ class ControllerAbstractTest extends \Magento\TestFramework\TestCase\AbstractCon
protected function setUp()
{
- $this->messageManager = $this->getMock('\Magento\Framework\Message\Manager', [], [], '', false);
- $request = new \Magento\TestFramework\Request(
- $this->getMock('Magento\Framework\Stdlib\Cookie\CookieReaderInterface'),
- $this->getMock('Magento\Framework\App\Route\ConfigInterface\Proxy', [], [], '', false),
- $this->getMock('Magento\Framework\App\Request\PathInfoProcessorInterface'),
- $this->getMock('Magento\Framework\ObjectManagerInterface')
- );
- $response = new \Magento\TestFramework\Response(
- $this->getMock('Magento\Framework\Stdlib\CookieManagerInterface'),
- $this->getMock('Magento\Framework\Stdlib\Cookie\CookieMetadataFactory', [], [], '', false),
- $this->getMock('Magento\Framework\App\Http\Context', [], [], '', false),
- $this->getMock('Magento\Framework\Stdlib\DateTime', [], [], '', false)
- );
+ $testObjectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+ $this->messageManager = $this->getMock('\Magento\Framework\Message\Manager', [], [], '', false);
+ $request = $testObjectManager->get('Magento\TestFramework\Request');
+ $response = $testObjectManager->get('Magento\TestFramework\Response');
$this->_objectManager = $this->getMock(
'Magento\TestFramework\ObjectManager',
['get', 'create'],
--
GitLab