gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed PMA_TEST_HEADERS checking as they have been defined

Browse Source
This commit is contained in:
osaid 2016-12-24 22:31:38 +05:30
parent b168fc5f58
commit eb54c43fb6
1 changed files with 15 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
test/libraries/core/PMA_headerLocation_test.php
View File

@ -61,29 +61,20 @@ class PMA_HeaderLocation_Test extends PHPUnit_Framework_TestCase
*/
public function testSendHeaderLocationWithoutSidWithIis()
{
if (defined('PMA_TEST_HEADERS')) {
$GLOBALS['PMA_Config']->set('PMA_IS_IIS', true);
$GLOBALS['PMA_Config']->set('PMA_IS_IIS', true);
$testUri = 'https://example.com/test.php';
$testUri = 'https://example.com/test.php';
$header = array('Location: ' . $testUri);
PMA_sendHeaderLocation($testUri); // sets $GLOBALS['header']
$this->assertEquals($header, $GLOBALS['header']);
$header = array('Location: ' . $testUri);
PMA_sendHeaderLocation($testUri); // sets $GLOBALS['header']
$this->assertEquals($header, $GLOBALS['header']);
//reset $GLOBALS['header'] for the next assertion
unset($GLOBALS['header']);
$header = array('Refresh: 0; ' . $testUri);
PMA_sendHeaderLocation($testUri, true); // sets $GLOBALS['header']
$this->assertEquals($header, $GLOBALS['header']);
} else {
$this->markTestSkipped(
'Cannot redefine constant/function - missing runkit extension'
);
}
//reset $GLOBALS['header'] for the next assertion
unset($GLOBALS['header']);
$header = array('Refresh: 0; ' . $testUri);
PMA_sendHeaderLocation($testUri, true); // sets $GLOBALS['header']
$this->assertEquals($header, $GLOBALS['header']);
}
/**
@ -93,20 +84,11 @@ class PMA_HeaderLocation_Test extends PHPUnit_Framework_TestCase
*/
public function testSendHeaderLocationWithoutSidWithoutIis()
{
if (defined('PMA_TEST_HEADERS')) {
$testUri = 'https://example.com/test.php';
$header = array('Location: ' . $testUri);
PMA_sendHeaderLocation($testUri); // sets $GLOBALS['header']
$this->assertEquals($header, $GLOBALS['header']);
} else {
$this->markTestSkipped(
'Cannot redefine constant/function - missing runkit extension'
);
}
$testUri = 'https://example.com/test.php';
$header = array('Location: ' . $testUri);
PMA_sendHeaderLocation($testUri); // sets $GLOBALS['header']
$this->assertEquals($header, $GLOBALS['header']);
}
/**
@ -171,4 +153,4 @@ class PMA_HeaderLocation_Test extends PHPUnit_Framework_TestCase
$attrInstance->setValue($restoreInstance);
}
}
}