diff options
| author | Louise Crow <louise.crow@gmail.com> | 2012-10-01 11:03:52 +0100 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2012-10-01 11:03:52 +0100 |
| commit | be96333dafd0fa0623ca4495237c8c6fa5457c14 (patch) | |
| tree | 6a0dbc34767db4a49ea9231738fe17dd1df6934a /spec/integration/admin_spec.rb | |
| parent | 3cfa6c4d1c4ae6ba5e3f22ff8757d1ec9dcd8b68 (diff) | |
| parent | 6ee1e8d0a4a8cfe02797c1a853bf27af2610ad27 (diff) | |
Merge remote-tracking branch 'openaustralia_github/configuration_refactor' into develop
Conflicts:
config/general.yml-example
Diffstat (limited to 'spec/integration/admin_spec.rb')
| -rw-r--r-- | spec/integration/admin_spec.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/spec/integration/admin_spec.rb b/spec/integration/admin_spec.rb index caf741749..e148ea3ca 100644 --- a/spec/integration/admin_spec.rb +++ b/spec/integration/admin_spec.rb @@ -12,10 +12,8 @@ describe "When administering the site" do response.should be_success # Now fetch the "log in as" link to log in as Bob - admin_username = MySociety::Config.get('ADMIN_USERNAME') - admin_password = MySociety::Config.get('ADMIN_PASSWORD') get_via_redirect "/admin/user/login_as/#{users(:bob_smith_user).id}", nil, { - "Authorization" => "Basic " + Base64.encode64("#{admin_username}:#{admin_password}").strip + "Authorization" => "Basic " + Base64.encode64("#{Configuration::admin_username}:#{Configuration::admin_password}").strip } response.should be_success session[:user_id].should == users(:bob_smith_user).id |