summaryrefslogtreecommitdiff
path: root/test/functional
diff options
context:
space:
mode:
Diffstat (limited to 'test/functional')
-rw-r--r--test/functional/application_controller_test.rb4
-rw-r--r--test/functional/users_controller_test.rb2
-rw-r--r--test/functional/v1/messages_controller_test.rb2
-rw-r--r--test/functional/v1/users_controller_test.rb4
4 files changed, 7 insertions, 5 deletions
diff --git a/test/functional/application_controller_test.rb b/test/functional/application_controller_test.rb
index c4c922b..b558ad8 100644
--- a/test/functional/application_controller_test.rb
+++ b/test/functional/application_controller_test.rb
@@ -9,13 +9,13 @@ class ApplicationControllerTest < ActionController::TestCase
def test_require_login_redirect
@controller.send(:require_login)
- assert_access_denied(true, false)
+ assert_login_required
end
def test_require_login
login
@controller.send(:require_login)
- assert_access_denied(false)
+ assert_access_granted
end
def test_require_admin
diff --git a/test/functional/users_controller_test.rb b/test/functional/users_controller_test.rb
index 4af9ca6..7d1745c 100644
--- a/test/functional/users_controller_test.rb
+++ b/test/functional/users_controller_test.rb
@@ -52,7 +52,7 @@ class UsersControllerTest < ActionController::TestCase
nonid = 'thisisnotanexistinguserid'
get :show, :id => nonid
- assert_access_denied(true, false)
+ assert_login_required
end
test "may not show non-existing user without admin" do
diff --git a/test/functional/v1/messages_controller_test.rb b/test/functional/v1/messages_controller_test.rb
index 24a5b1f..a50fded 100644
--- a/test/functional/v1/messages_controller_test.rb
+++ b/test/functional/v1/messages_controller_test.rb
@@ -51,7 +51,7 @@ class V1::MessagesControllerTest < ActionController::TestCase
test "fails if not authenticated" do
get :index, :format => :json
- assert_access_denied
+ assert_login_required
end
end
diff --git a/test/functional/v1/users_controller_test.rb b/test/functional/v1/users_controller_test.rb
index fe3cfe7..ffe2484 100644
--- a/test/functional/v1/users_controller_test.rb
+++ b/test/functional/v1/users_controller_test.rb
@@ -34,7 +34,9 @@ class V1::UsersControllerTest < ActionController::TestCase
test "user cannot update other user" do
user = find_record :user
login
- put :update, :user => record_attributes_for(:user_with_settings), :id => user.id, :format => :json
+ put :update, id: user.id,
+ user: record_attributes_for(:user_with_settings),
+ :format => :json
assert_access_denied
end