diff options
| author | Seb Bacon <seb.bacon@gmail.com> | 2011-07-07 14:09:22 +0100 |
|---|---|---|
| committer | Seb Bacon <seb.bacon@gmail.com> | 2011-07-07 14:09:22 +0100 |
| commit | 590fa9303086c4dc155387e3f947e0191e8226a0 (patch) | |
| tree | da0c64bcf7fa3b337086ab75268d45a012fbb35d /spec/controllers/user_controller_spec.rb | |
| parent | 39e04743f99ce3c88269dbf14c8790cd81e18f57 (diff) | |
| parent | 2c81cc44468636393b1c6250a691030423624daa (diff) | |
merge from master
Diffstat (limited to 'spec/controllers/user_controller_spec.rb')
| -rw-r--r-- | spec/controllers/user_controller_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/controllers/user_controller_spec.rb b/spec/controllers/user_controller_spec.rb index 93ea6de48..4e21bc467 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, :locale => "en" } + params_from(:get, mail_path).should == { :controller => 'user', :action => 'confirm', :email_token => mail_token } # check confirmation URL works session[:user_id].should be_nil |