aboutsummaryrefslogtreecommitdiffstats
path: root/spec/controllers/user_controller_spec.rb
diff options
context:
space:
mode:
authorRobin Houston <robin.houston@gmail.com>2012-01-09 21:34:15 +0000
committerRobin Houston <robin.houston@gmail.com>2012-01-09 21:34:15 +0000
commit4fe1a1d68234197d5303ad7323dd91636b84db14 (patch)
treee66779ac77cd3ab8d9b39f6957e7e06fa2a4ae4e /spec/controllers/user_controller_spec.rb
parentbb87d842ec3559483a2c0132dbc0c216e0cb597e (diff)
parent19a0a2fedf68a256084d4dcfd70b9cb9377b9a09 (diff)
Merge branch 'release/0.5' of github.com:sebbacon/alaveteli into release/0.5
Diffstat (limited to 'spec/controllers/user_controller_spec.rb')
-rw-r--r--spec/controllers/user_controller_spec.rb4
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