diff options
| author | Azul <azul@leap.se> | 2013-03-05 13:35:05 +0100 |
|---|---|---|
| committer | Azul <azul@leap.se> | 2013-03-05 13:35:05 +0100 |
| commit | 27c16ccceffa1d8eaaf02612cf29a60bfe6ced01 (patch) | |
| tree | 1df9d9900872cf2e97d5c27b4175816eff5cbf80 /users/test/functional/sessions_controller_test.rb | |
| parent | 733426aa3992dafaf1c58ede7e74018057a01148 (diff) | |
| parent | 87c306ea212c01ecc8f98009def5971fc4d5af11 (diff) | |
Merge branch 'master' into feature/limit_user_leak
Conflicts:
users/lib/warden/strategies/secure_remote_password.rb
Diffstat (limited to 'users/test/functional/sessions_controller_test.rb')
| -rw-r--r-- | users/test/functional/sessions_controller_test.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/users/test/functional/sessions_controller_test.rb b/users/test/functional/sessions_controller_test.rb index 9df4455..f99c0d7 100644 --- a/users/test/functional/sessions_controller_test.rb +++ b/users/test/functional/sessions_controller_test.rb @@ -47,10 +47,12 @@ class SessionsControllerTest < ActionController::TestCase request.env['warden'].expects(:authenticate!) handshake = stub(:to_json => "JSON") session[:handshake] = handshake + post :update, :id => @user.login, :client_auth => @client_hex + assert_nil session[:handshake] assert_response :success - assert_equal handshake.to_json, @response.body + assert_json_response handshake end test "logout should reset warden user" do |