From 2ec9234da64ac05383ff08078bd5010d82cd49b8 Mon Sep 17 00:00:00 2001 From: Sam Minnee Date: Mon, 18 Oct 2010 22:42:45 +0000 Subject: [PATCH] BUGFIX Bypass BasicAuth when in CLI mode so unit tests can run (regression from r104962) (from r108193) git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112715 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- security/BasicAuth.php | 2 +- tests/WebserverRoutingTest.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/security/BasicAuth.php b/security/BasicAuth.php index e1e314d22..7c13606b2 100755 --- a/security/BasicAuth.php +++ b/security/BasicAuth.php @@ -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'])) { diff --git a/tests/WebserverRoutingTest.php b/tests/WebserverRoutingTest.php index b7fa9c9d0..fc82efc37 100644 --- a/tests/WebserverRoutingTest.php +++ b/tests/WebserverRoutingTest.php @@ -26,7 +26,7 @@ class WebserverRoutingTest extends SapphireTest { $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); }