Merge branch 'MAGETWO-33074' into MAGETWO-32690

Author: okarpenko

dev/tests/unit/testsuite/Magento/Framework/HTTP/PhpEnvironment/ResponseTest.php

@@ -115,15 +115,7 @@ public function testClearHeaderIfHeaderExistsAndWasFound()
 
         $this->headers->addHeaderLine('Header-name: header-value');
 
-        $header = $this->getMock(
-            'Zend\Http\Header\GenericHeader',
-            ['getFieldName'],
-            ['Header-name', 'header-value']
-        );
-        $header
-            ->expects($this->once())
-            ->method('getFieldName')
-            ->will($this->returnValue('Header-name'));
+        $header = \Zend\Http\Header\GenericHeader::fromString('Header-name: header-value');
 
         $this->headers
             ->expects($this->once())
@@ -132,7 +124,8 @@ public function testClearHeaderIfHeaderExistsAndWasFound()
             ->will($this->returnValue(true));
         $this->headers
             ->expects($this->once())
-            ->method('current')
+            ->method('get')
+            ->with('Header-name')
             ->will($this->returnValue($header));
         $this->headers
             ->expects($this->once())
@@ -148,47 +141,6 @@ public function testClearHeaderIfHeaderExistsAndWasFound()
         $response->clearHeader('Header-name');
     }
 
-    public function testClearHeaderIfHeaderExistsAndWasNotFound()
-    {
-        $response = $this->response = $this->getMock(
-            'Magento\Framework\HTTP\PhpEnvironment\Response',
-            ['getHeaders', 'send']
-        );
-
-        $this->headers->addHeaderLine('Header-name: header-value');
-
-        $header = $this->getMock(
-            'Zend\Http\Header\GenericHeader',
-            ['getFieldName'],
-            ['Header-name', 'header-value']
-        );
-        $header
-            ->expects($this->once())
-            ->method('getFieldName')
-            ->will($this->returnValue('Wrong-header-name'));
-
-        $this->headers
-            ->expects($this->once())
-            ->method('has')
-            ->with('Header-name')
-            ->will($this->returnValue(true));
-        $this->headers
-            ->expects($this->once())
-            ->method('current')
-            ->will($this->returnValue($header));
-        $this->headers
-            ->expects($this->never())
-            ->method('removeHeader')
-            ->with($header);
-
-        $response
-            ->expects($this->once())
-            ->method('getHeaders')
-            ->will($this->returnValue($this->headers));
-
-        $response->clearHeader('Header-name');
-    }
-
     public function testClearHeaderAndHeaderNotExists()
     {
         $response = $this->response = $this->getMock(
@@ -198,15 +150,7 @@ public function testClearHeaderAndHeaderNotExists()
 
         $this->headers->addHeaderLine('Header-name: header-value');
 
-        $header = $this->getMock(
-            'Zend\Http\Header\GenericHeader',
-            ['getFieldName'],
-            ['Header-name', 'header-value']
-        );
-        $header
-            ->expects($this->never())
-            ->method('getFieldName')
-            ->will($this->returnValue('Wrong-header-name'));
+        $header = \Zend\Http\Header\GenericHeader::fromString('Header-name: header-value');
 
         $this->headers
             ->expects($this->once())
@@ -215,7 +159,8 @@ public function testClearHeaderAndHeaderNotExists()
             ->will($this->returnValue(false));
         $this->headers
             ->expects($this->never())
-            ->method('current')
+            ->method('get')
+            ->with('Header-name')
             ->will($this->returnValue($header));
         $this->headers
             ->expects($this->never())