diff options
| author | Robin Houston <robin.houston@gmail.com> | 2012-01-31 08:48:40 +0000 |
|---|---|---|
| committer | Robin Houston <robin.houston@gmail.com> | 2012-01-31 08:48:40 +0000 |
| commit | 62ae2d1d4538d682c27971e4937d01eca9896929 (patch) | |
| tree | 8b537ca81551800634e2a6f3e8184a70aee881d7 /spec/controllers/admin_public_body_controller_spec.rb | |
| parent | edf43caeb577ad321c5beebfec6130382cb06db7 (diff) | |
| parent | 0a560b492e77eb04b6b83b6d567db4e4e5429bb2 (diff) | |
Merge branch 'wdtk' into release/0.5
Conflicts:
config/general.yml-example
doc/CHANGES.md
Diffstat (limited to 'spec/controllers/admin_public_body_controller_spec.rb')
| -rw-r--r-- | spec/controllers/admin_public_body_controller_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/controllers/admin_public_body_controller_spec.rb b/spec/controllers/admin_public_body_controller_spec.rb index 9a7c46476..7af637c1c 100644 --- a/spec/controllers/admin_public_body_controller_spec.rb +++ b/spec/controllers/admin_public_body_controller_spec.rb @@ -76,7 +76,7 @@ describe AdminPublicBodyController, "when administering public bodies and paying it "disallows non-authenticated users to do anything" do @request.env["HTTP_AUTHORIZATION"] = "" - n = PublicBody.count.should + n = PublicBody.count post :destroy, { :id => 3 } response.code.should == "401" PublicBody.count.should == n @@ -111,7 +111,7 @@ describe AdminPublicBodyController, "when administering public bodies and paying config['ADMIN_USERNAME'] = 'biz' config['ADMIN_PASSWORD'] = 'fuz' @request.env["HTTP_AUTHORIZATION"] = "" - n = PublicBody.count.should + n = PublicBody.count basic_auth_login(@request, "baduser", "badpassword") post :destroy, { :id => public_bodies(:forlorn_public_body).id } response.code.should == "401" |