From 800975a73ca381a2dc065f0e3f474b95f120484a Mon Sep 17 00:00:00 2001
From: osaid <osaid.nasir@gmail.com>
Date: Tue, 13 Dec 2016 20:33:37 +0530
Subject: [PATCH] PMA_sendHeaderLocation called after actually sending headers

---
 test/libraries/PMA_user_preferences_test.php | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/test/libraries/PMA_user_preferences_test.php b/test/libraries/PMA_user_preferences_test.php
index 95791a8153..8d9d76dd0c 100644
--- a/test/libraries/PMA_user_preferences_test.php
+++ b/test/libraries/PMA_user_preferences_test.php
@@ -369,20 +369,18 @@ class PMA_User_Preferences_Test extends PHPUnit_Framework_TestCase
 
         $mockResponse = $this->getMockBuilder('PMA\libraries\Response')
             ->disableOriginalConstructor()
-            ->setMethods(array('headersSent', 'header'))
+            ->setMethods(array('header', 'headersSent'))
             ->getMock();
 
+        $mockResponse->expects($this->once())
+            ->method('header')
+            ->with('Location: /phpmyadmin/file.html?a=b&saved=1&server=0#h+ash');
+
         $mockResponse->expects($this->any())
             ->method('headersSent')
             ->with()
             ->will($this->returnValue(false));
 
-        $mockResponse->expects($this->once())
-            ->method('header')
-            ->with(
-                $this->stringContains('Location: /phpmyadmin/file.html?a=b&saved=1&server=0#h+ash')
-            );
-
         $GLOBALS['PMA_Config']->set('PmaAbsoluteUri', '');
 
         $GLOBALS['cfg']['ServerDefault'] = 1;