diff options
| author | Seb Bacon <seb.bacon@gmail.com> | 2011-10-10 13:21:22 +0100 |
|---|---|---|
| committer | Seb Bacon <seb.bacon@gmail.com> | 2011-10-10 13:21:22 +0100 |
| commit | 189c7c80c9e56d09d8dd441a924d687aa2b9ed5e (patch) | |
| tree | 8aac4844a602458276b8d61f8482b31bae865d67 /spec/spec_helper.rb | |
| parent | 247a24cde3954b7f7b3cbb2e3b624669b6e6e61d (diff) | |
| parent | f6b93d8cb5fbe4e4d2c96bf732f76102d54ce9cd (diff) | |
Merge branch 'release/0.4' into develop
Diffstat (limited to 'spec/spec_helper.rb')
| -rw-r--r-- | spec/spec_helper.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 2ddf839da..ffe48c731 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -113,9 +113,9 @@ def validate_as_body(html) "<html><head><title>Test</title></head><body>#{html}</body></html>") end -def basic_auth_login(request) - username = MySociety::Config.get('ADMIN_USERNAME') - password = MySociety::Config.get('ADMIN_PASSWORD') +def basic_auth_login(request, username = nil, password = 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 |