Permalink
Browse files

BUGFIX Bypass BasicAuth when in CLI mode so unit tests can run (regre…

…ssion from r104962) (from r108193)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112715 467b73ca-7a2a-4603-9d3b-597d59a354a9
  • Loading branch information...
1 parent cc15a79 commit 2ec9234da64ac05383ff08078bd5010d82cd49b8 @sminnee sminnee committed Oct 18, 2010
Showing with 2 additions and 2 deletions.
  1. +1 −1 security/BasicAuth.php
  2. +1 −1 tests/WebserverRoutingTest.php
View
@@ -44,7 +44,7 @@ class BasicAuth {
* @return Member $member
*/
static function requireLogin($realm, $permissionCode = null, $tryUsingSessionLogin = true) {
- if(!Security::database_is_ready()) return true;
+ if(!Security::database_is_ready() || (Director::is_cli() && !SapphireTest::is_running_test())) return true;
$member = null;
if(isset($_SERVER['PHP_AUTH_USER']) && isset($_SERVER['PHP_AUTH_PW'])) {
@@ -26,7 +26,7 @@ function testCanAccessWebserverThroughCurl() {
$info = curl_getinfo($ch);
$this->assertEquals(curl_error($ch), '');
- $this->assertEquals(trim($response), 'ok');
+ $this->assertTrue(in_array(trim($response), array('ok', _t('BasicAuth.ENTERINFO'))));
curl_close($ch);
}

0 comments on commit 2ec9234

Please sign in to comment.