diff options
| author | Louise Crow <louise.crow@gmail.com> | 2012-10-17 14:04:58 +0100 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2012-10-17 14:04:58 +0100 |
| commit | a4927fc05a710cee6217d8a40ce925d5f894fd8f (patch) | |
| tree | 83909e1d903afbf49d50182af79a679442632975 /spec/integration | |
| parent | cc27fe66a13fe1504711c64ce5530a1c178e907d (diff) | |
| parent | cc7bc36d5748c9baa0cfd8e44395923cc5792f32 (diff) | |
Merge branch 'release/0.6.7' into wdtk
Conflicts:
config/general.yml-example
Diffstat (limited to 'spec/integration')
| -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 |