diff options
| author | Seb Bacon <seb.bacon@gmail.com> | 2012-01-06 17:04:28 +0000 |
|---|---|---|
| committer | Seb Bacon <seb.bacon@gmail.com> | 2012-01-06 17:04:28 +0000 |
| commit | 2241acda80d5d17386989eba130623ffb5543e41 (patch) | |
| tree | 0e15a5cb0e989cef072a2f48b34f477d93cb14b1 /spec/controllers | |
| parent | ec2614eba4591b0b138c87b84bef7ef1463aa5be (diff) | |
| parent | 646e211b9a45093f37a18661bdb3501508234387 (diff) | |
Merge branch 'fixing-xapian-reindexing' into release/0.5
Diffstat (limited to 'spec/controllers')
| -rw-r--r-- | spec/controllers/user_controller_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/controllers/user_controller_spec.rb b/spec/controllers/user_controller_spec.rb index cf50bcc7a..c13d7c9fc 100644 --- a/spec/controllers/user_controller_spec.rb +++ b/spec/controllers/user_controller_spec.rb @@ -32,10 +32,10 @@ describe UserController, "when showing a user" do session[:user_id] = users(:bob_smith_user).id get :show, :url_name => "bob_smith", :view => 'requests' response.body.should_not include("Change your password") - response.body.should include("Freedom of Information requests") + response.body.should match(/Your [0-9]+ Freedom of Information requests/) get :show, :url_name => "bob_smith", :view => 'profile' response.body.should include("Change your password") - response.body.should_not include("Freedom of Information requests") + response.body.should_not match(/Your [0-9]+ Freedom of Information requests/) end it "should assign the user" do |