summaryrefslogtreecommitdiff
path: root/users/test/support
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2013-07-04 02:44:11 -0700
committerelijah <elijah@riseup.net>2013-07-04 04:15:04 -0700
commit64bacc45ea1a023b154b07ec0790f762a79d20d5 (patch)
tree701cb9008508d869c5b40096850656662d9b190c /users/test/support
parent290d367ddb064c0aea4e0447441776fd69e29f6c (diff)
user tests -- user update has been moved entirely to api controller, so fix tests to reflect this.
Diffstat (limited to 'users/test/support')
-rw-r--r--users/test/support/auth_test_helper.rb16
1 files changed, 12 insertions, 4 deletions
diff --git a/users/test/support/auth_test_helper.rb b/users/test/support/auth_test_helper.rb
index c0fcf3a..555b5db 100644
--- a/users/test/support/auth_test_helper.rb
+++ b/users/test/support/auth_test_helper.rb
@@ -20,10 +20,18 @@ module AuthTestHelper
def assert_access_denied(denied = true, logged_in = true)
if denied
- assert_equal({:alert => "Not authorized"}, flash.to_hash)
- # todo: eventually probably eliminate separate conditions
- assert_redirected_to login_path if !logged_in
- assert_redirected_to root_path if logged_in
+ if @response.content_type == 'application/json'
+ assert_json_response('error' => I18n.t(:not_authorized))
+ assert_response :unprocessable_entity
+ else
+ if logged_in
+ assert_equal({:alert => I18n.t(:not_authorized)}, flash.to_hash)
+ assert_redirected_to root_url
+ else
+ assert_equal({:alert => I18n.t(:not_authorized_login)}, flash.to_hash)
+ assert_redirected_to login_url
+ end
+ end
else
assert flash[:alert].blank?
end