diff options
| author | Seb Bacon <seb.bacon@gmail.com> | 2012-01-06 17:20:32 +0000 |
|---|---|---|
| committer | Seb Bacon <seb.bacon@gmail.com> | 2012-01-06 17:20:32 +0000 |
| commit | ddd86f6f41c740748f8a867022a89179c587ca30 (patch) | |
| tree | 7ee2982cf92b40e8527704ec1f7573cc99ae31ea /spec/controllers/user_controller_spec.rb | |
| parent | 38e30c682504e8cd5ace61f2fc937d100eae3c65 (diff) | |
| parent | 766d696d5b914520b0b9367e9b9a9decab87ea5f (diff) | |
Merge branch 'release/0.5' into wdtk
Diffstat (limited to 'spec/controllers/user_controller_spec.rb')
| -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 |