diff options
| author | Azul <azul@leap.se> | 2012-11-26 12:16:53 +0100 |
|---|---|---|
| committer | Azul <azul@leap.se> | 2012-11-26 12:16:53 +0100 |
| commit | 1ea7da1314a46a87512e4f3d7f99249883f4f12f (patch) | |
| tree | ab07f2e702b5f5eee9638ef751669f88298faad2 /users/test/functional/sessions_controller_test.rb | |
| parent | 716dc248e940be8bd323a9d92f98785737fc99a0 (diff) | |
| parent | cdda8f095d49cdda94c3527ecb92cb15c300327b (diff) | |
Merge branch 'feature/users-change-passwords' into develop
Diffstat (limited to 'users/test/functional/sessions_controller_test.rb')
| -rw-r--r-- | users/test/functional/sessions_controller_test.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/users/test/functional/sessions_controller_test.rb b/users/test/functional/sessions_controller_test.rb index 93cc032..9df4455 100644 --- a/users/test/functional/sessions_controller_test.rb +++ b/users/test/functional/sessions_controller_test.rb @@ -22,7 +22,7 @@ class SessionsControllerTest < ActionController::TestCase request.env['warden'].expects(:winning_strategy) get :new, :format => :json assert_response :success - assert_json_response :errors => nil + assert_json_error nil end test "renders warden errors" do @@ -31,7 +31,7 @@ class SessionsControllerTest < ActionController::TestCase I18n.expects(:t).with(:translate_me).at_least_once.returns("translation stub") get :new, :format => :json assert_response 422 - assert_json_response :errors => {"field" => "translation stub"} + assert_json_error :field => "translation stub" end # Warden takes care of parsing the params and |