Rails5 requires x_action; use in tests when available

Fix Rails 5 DEPRECATION WARNING
rails-api · Nov 24, 2015 · a84ec92 · a84ec92
1 parent 1388a90
commit a84ec92
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/test/action_controller/serialization_scope_name_test.rb b/test/action_controller/serialization_scope_name_test.rb
@@ -12,7 +12,12 @@ def admin?
   class UserTestController < ActionController::Base
     protect_from_forgery
 
-    before_filter { request.format = :json }
+    # For Rails5
+    if self.respond_to?(:before_action)
+      before_action { request.format = :json }
+    else
+      before_filter { request.format = :json }
+    end
 
     def current_user
       User.new(id: 1, name: 'Pete', admin: false)
@@ -43,7 +48,12 @@ class AdminUserTestController < ActionController::Base
     protect_from_forgery
 
     serialization_scope :current_admin
-    before_filter { request.format = :json }
+    # For Rails5
+    if self.respond_to?(:before_action)
+      before_action { request.format = :json }
+    else
+      before_filter { request.format = :json }
+    end
 
     def current_admin
       User.new(id: 2, name: 'Bob', admin: true)