diff options
author | jessib <jessib@leap.se> | 2012-11-26 10:15:22 -0800 |
---|---|---|
committer | jessib <jessib@leap.se> | 2012-11-26 10:15:22 -0800 |
commit | 3e744e4e226eae3ea2f900d9fccc32b6c046d65f (patch) | |
tree | 1b19232d08229b178c094c92e2242ce1686099ae /users/test/unit/warden_strategy_secure_remote_password_test.rb | |
parent | d9d67bd60d3fdfa4106977de9e5aba11f659fc79 (diff) | |
parent | bf74255d1530fe5852dc6e6c27ef975ce9aa8d3c (diff) |
Merge branch 'develop' into help_develop
Conflicts:
users/app/views/sessions/_nav.html.haml
Diffstat (limited to 'users/test/unit/warden_strategy_secure_remote_password_test.rb')
-rw-r--r-- | users/test/unit/warden_strategy_secure_remote_password_test.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/users/test/unit/warden_strategy_secure_remote_password_test.rb b/users/test/unit/warden_strategy_secure_remote_password_test.rb index 79480f0..319809a 100644 --- a/users/test/unit/warden_strategy_secure_remote_password_test.rb +++ b/users/test/unit/warden_strategy_secure_remote_password_test.rb @@ -32,7 +32,7 @@ class WardenStrategySecureRemotePasswordTest < ActiveSupport::TestCase User.expects(:find_by_param).with(unknown).raises(RECORD_NOT_FOUND) post :create, :login => unknown assert_response :success - assert_json_response :errors => {"login" => ["unknown user"]} + assert_json_error "login" => ["unknown user"] end test "should authorize" do @@ -56,7 +56,7 @@ class WardenStrategySecureRemotePasswordTest < ActiveSupport::TestCase post :update, :id => @user.login, :client_auth => @client_hex assert_nil session[:handshake] assert_nil session[:user_id] - assert_json_response :errors => {"password" => ["wrong password"]} + assert_json_error "password" => ["wrong password"] end =end |