Skip to content

Commit 6588dee

Browse files
committed
Rails5 requires x_action
1 parent c56d49f commit 6588dee

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

test/action_controller/serialization_scope_name_test.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ def admin?
1212
class UserTestController < ActionController::Base
1313
protect_from_forgery
1414

15-
before_filter { request.format = :json }
15+
before_action { request.format = :json }
1616

1717
def current_user
1818
User.new(id: 1, name: 'Pete', admin: false)
@@ -43,7 +43,7 @@ class AdminUserTestController < ActionController::Base
4343
protect_from_forgery
4444

4545
serialization_scope :current_admin
46-
before_filter { request.format = :json }
46+
before_action { request.format = :json }
4747

4848
def current_admin
4949
User.new(id: 2, name: 'Bob', admin: true)

0 commit comments

Comments
 (0)