diff options
| author | seb <seb@seb-U36JC> | 2011-11-21 13:57:31 +0000 |
|---|---|---|
| committer | seb <seb@seb-U36JC> | 2011-11-21 13:57:31 +0000 |
| commit | 69bcb7fe3fed27f3499654209e65fd627f788aaa (patch) | |
| tree | 2623a37f773d19e7a50d670237ac745deb1b0509 /spec/spec_helper.rb | |
| parent | 9030e9b47ebf52a525728103ab4b2c73f24d674e (diff) | |
| parent | 5128b4348862037139df45da15d4eee314bc710a (diff) | |
Merge branch 'develop' into feature/refactor-css-seb
Diffstat (limited to 'spec/spec_helper.rb')
| -rw-r--r-- | spec/spec_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index ffe48c731..a486418ce 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -114,7 +114,7 @@ def validate_as_body(html) end def basic_auth_login(request, username = nil, password = nil) - username = MySociety::Config.get('ADMIN_USERNAME') if username.nil? + username = MySociety::Config.get('ADMIN_USERNAME') if username.nil? password = MySociety::Config.get('ADMIN_PASSWORD') if password.nil? request.env["HTTP_AUTHORIZATION"] = "Basic " + Base64::encode64("#{username}:#{password}") end |