mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-22 14:05:37 +02:00
MINOR: Updated WebserverRoutingTest to use Security/ping to test if the server is accesible, since ?usetestmanifest is no longer available.
This commit is contained in:
parent
2f1ffe2f6f
commit
bd2a54769c
@ -17,7 +17,7 @@ class WebserverRoutingTest extends SapphireTest {
|
|||||||
function testCanAccessWebserverThroughCurl() {
|
function testCanAccessWebserverThroughCurl() {
|
||||||
if(!function_exists('curl_init')) return;
|
if(!function_exists('curl_init')) return;
|
||||||
|
|
||||||
$url = Director::absoluteBaseURL() . 'WebserverRoutingTest_Controller/?usetestmanifest=1&flush=1';
|
$url = Director::absoluteBaseURL() . 'Security/ping';
|
||||||
|
|
||||||
$ch = curl_init();
|
$ch = curl_init();
|
||||||
curl_setopt ($ch, CURLOPT_URL,$url );
|
curl_setopt ($ch, CURLOPT_URL,$url );
|
||||||
@ -26,22 +26,9 @@ class WebserverRoutingTest extends SapphireTest {
|
|||||||
$info = curl_getinfo($ch);
|
$info = curl_getinfo($ch);
|
||||||
|
|
||||||
$this->assertEquals(curl_error($ch), '');
|
$this->assertEquals(curl_error($ch), '');
|
||||||
$this->assertTrue(in_array(trim($response), array('ok', _t('BasicAuth.ENTERINFO'))));
|
$this->assertEquals('1', $response);
|
||||||
|
|
||||||
curl_close($ch);
|
curl_close($ch);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* @package sapphire
|
|
||||||
* @subpackage tests
|
|
||||||
*/
|
|
||||||
class WebserverRoutingTest_Controller extends Controller implements TestOnly {
|
|
||||||
function index() {
|
|
||||||
BasicAuth::protect_entire_site(false);
|
|
||||||
|
|
||||||
return "ok";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
?>
|
|
Loading…
Reference in New Issue
Block a user