From 1beb8130ad6c3604a030fef6f4f2e555e10f47f6 Mon Sep 17 00:00:00 2001 From: osaid Date: Wed, 7 Dec 2016 19:42:05 +0530 Subject: [PATCH] Implemented header auth --- test/libraries/PMA_user_preferences_test.php | 29 +++++++++++++------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/test/libraries/PMA_user_preferences_test.php b/test/libraries/PMA_user_preferences_test.php index fc53bc115e..95791a8153 100644 --- a/test/libraries/PMA_user_preferences_test.php +++ b/test/libraries/PMA_user_preferences_test.php @@ -364,11 +364,25 @@ class PMA_User_Preferences_Test extends PHPUnit_Framework_TestCase */ public function testUserprefsRedirect() { - if (!defined('PMA_TEST_HEADERS')) { - $this->markTestSkipped( - 'Cannot redefine constant/function - missing runkit extension' + + $restoreInstance = PMA\libraries\Response::getInstance(); + + $mockResponse = $this->getMockBuilder('PMA\libraries\Response') + ->disableOriginalConstructor() + ->setMethods(array('headersSent', 'header')) + ->getMock(); + + $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; @@ -388,11 +402,6 @@ class PMA_User_Preferences_Test extends PHPUnit_Framework_TestCase 'h ash' ); - $this->assertContains( - 'Location: /phpmyadmin/file.html?a=b&saved=1&server=0#h+ash', - $GLOBALS['header'][0] - ); - if ($redefine !== null) { runkit_constant_redefine('PMA_IS_IIS', $redefine); } else { @@ -449,4 +458,4 @@ class PMA_User_Preferences_Test extends PHPUnit_Framework_TestCase $result ); } -} +} \ No newline at end of file