aboutsummaryrefslogtreecommitdiffstats
path: root/spec/controllers/user_controller_spec.rb
diff options
context:
space:
mode:
authorSeb Bacon <seb.bacon@gmail.com>2011-03-11 13:47:12 +0000
committerSeb Bacon <seb.bacon@gmail.com>2011-03-11 13:47:12 +0000
commit1fb57d66c22000d4164c033ffd9353aa9030255b (patch)
tree3a567aaaab7c4119d5681a8fa988e4d244c60a24 /spec/controllers/user_controller_spec.rb
parentb8eef1efe1bc11b7468a1fb86644f4f9d695f136 (diff)
some test fixage
Diffstat (limited to 'spec/controllers/user_controller_spec.rb')
-rw-r--r--spec/controllers/user_controller_spec.rb5
1 files changed, 3 insertions, 2 deletions
diff --git a/spec/controllers/user_controller_spec.rb b/spec/controllers/user_controller_spec.rb
index 90f90860a..81da94e67 100644
--- a/spec/controllers/user_controller_spec.rb
+++ b/spec/controllers/user_controller_spec.rb
@@ -125,7 +125,7 @@ describe UserController, "when signing in" do
# check is right confirmation URL
mail_token.should == post_redirect.email_token
- params_from(:get, mail_path).should == { :controller => 'user', :action => 'confirm', :email_token => mail_token }
+ params_from(:get, mail_path).should == { :controller => 'user', :action => 'confirm', :email_token => mail_token, :locale => "en" }
# check confirmation URL works
session[:user_id].should be_nil
@@ -421,7 +421,8 @@ describe UserController, "when changing email address" do
"old_email"=>"bob@localhost",
"new_email"=>"newbob@localhost",
"password"=>"jonespassword"},
- "controller"=>"user"}
+ "controller"=>"user",
+ "locale"=>"en"}
post :signchangeemail, post_redirect.post_params
response.should redirect_to(:controller => 'user', :action => 'show', :url_name => 'bob_smith')