From 6588dee22cebeb8480946f9174b80a16a131d1b3 Mon Sep 17 00:00:00 2001
From: Benjamin Fleischer <github@benjaminfleischer.com>
Date: Tue, 10 Nov 2015 01:14:54 -0600
Subject: [PATCH] Rails5 requires x_action

---
 test/action_controller/serialization_scope_name_test.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/action_controller/serialization_scope_name_test.rb b/test/action_controller/serialization_scope_name_test.rb
index 75220be2..5969f522 100644
--- a/test/action_controller/serialization_scope_name_test.rb
+++ b/test/action_controller/serialization_scope_name_test.rb
@@ -12,7 +12,7 @@ class DefaultScopeNameTest < ActionController::TestCase
   class UserTestController < ActionController::Base
     protect_from_forgery
 
-    before_filter { request.format = :json }
+    before_action { request.format = :json }
 
     def current_user
       User.new(id: 1, name: 'Pete', admin: false)
@@ -43,7 +43,7 @@ class SerializationScopeNameTest < ActionController::TestCase
     protect_from_forgery
 
     serialization_scope :current_admin
-    before_filter { request.format = :json }
+    before_action { request.format = :json }
 
     def current_admin
       User.new(id: 2, name: 'Bob', admin: true)