summaryrefslogtreecommitdiff
path: root/users/test/functional/sessions_controller_test.rb
diff options
context:
space:
mode:
authorAzul <azul@leap.se>2012-11-26 11:54:11 +0100
committerAzul <azul@leap.se>2012-11-26 11:54:11 +0100
commit595518684b9c4364f96c97a84cc481b5ae0da981 (patch)
treeee5aafd33cf90f4c2d099d364f6da1d6f7331024 /users/test/functional/sessions_controller_test.rb
parentce0999ead0d61db1f6534ee9d8114c4551542e80 (diff)
simplified controller and adjusted tests
Also added #assert_json_error to tests.
Diffstat (limited to 'users/test/functional/sessions_controller_test.rb')
-rw-r--r--users/test/functional/sessions_controller_test.rb4
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