1 files changed, 46 insertions, 46 deletions

diff --git a/actionpack/test/controller/filters_test.rb b/actionpack/test/controller/filters_test.rb
index 089c841956..0ddf825864 100644
--- a/actionpack/test/controller/filters_test.rb
+++ b/actionpack/test/controller/filters_test.rb
@@ -21,7 +21,7 @@ class FilterTest < ActionController::TestCase
     after_action  :clean_up
 
     def show
-      render :inline => "ran action"
+      render inline: "ran action"
     end
 
     private
@@ -37,7 +37,7 @@ class FilterTest < ActionController::TestCase
   end
 
   class ChangingTheRequirementsController < TestController
-    before_action :ensure_login, :except => [:go_wild]
+    before_action :ensure_login, except: [:go_wild]
 
     def go_wild
       render plain: "gobble"
@@ -72,14 +72,14 @@ class FilterTest < ActionController::TestCase
 
     def show
       @ran_action = true
-      render :inline => "ran action"
+      render inline: "ran action"
     end
 
     private
       def before_action_rendering
         @ran_filter ||= []
         @ran_filter << "before_action_rendering"
-        render :inline => "something else"
+        render inline: "something else"
       end
 
       def unreached_after_action
@@ -102,19 +102,19 @@ class FilterTest < ActionController::TestCase
 
     def show
       @ran_action = true
-      render :inline => "ran show action"
+      render inline: "ran show action"
     end
 
     def target_of_redirection
       @ran_target_of_redirection = true
-      render :inline => "ran target_of_redirection action"
+      render inline: "ran target_of_redirection action"
     end
 
     private
       def before_action_redirects
         @ran_filter ||= []
         @ran_filter << "before_action_redirects"
-        redirect_to(:action => "target_of_redirection")
+        redirect_to(action: "target_of_redirection")
       end
 
       def unreached_after_action
@@ -133,15 +133,15 @@ class FilterTest < ActionController::TestCase
 
   class ConditionalFilterController < ActionController::Base
     def show
-      render :inline => "ran action"
+      render inline: "ran action"
     end
 
     def another_action
-      render :inline => "ran action"
+      render inline: "ran action"
     end
 
     def show_without_action
-      render :inline => "ran action without action"
+      render inline: "ran action without action"
     end
 
     private
@@ -157,28 +157,28 @@ class FilterTest < ActionController::TestCase
   end
 
   class ConditionalCollectionFilterController < ConditionalFilterController
-    before_action :ensure_login, :except => [ :show_without_action, :another_action ]
+    before_action :ensure_login, except: [ :show_without_action, :another_action ]
   end
 
   class OnlyConditionSymController < ConditionalFilterController
-    before_action :ensure_login, :only => :show
+    before_action :ensure_login, only: :show
   end
 
   class ExceptConditionSymController < ConditionalFilterController
-    before_action :ensure_login, :except => :show_without_action
+    before_action :ensure_login, except: :show_without_action
   end
 
   class BeforeAndAfterConditionController < ConditionalFilterController
-    before_action :ensure_login, :only => :show
-    after_action  :clean_up_tmp, :only => :show
+    before_action :ensure_login, only: :show
+    after_action  :clean_up_tmp, only: :show
   end
 
   class OnlyConditionProcController < ConditionalFilterController
-    before_action(:only => :show) {|c| c.instance_variable_set(:"@ran_proc_action", true) }
+    before_action(only: :show) {|c| c.instance_variable_set(:"@ran_proc_action", true) }
   end
 
   class ExceptConditionProcController < ConditionalFilterController
-    before_action(:except => :show_without_action) {|c| c.instance_variable_set(:"@ran_proc_action", true) }
+    before_action(except: :show_without_action) {|c| c.instance_variable_set(:"@ran_proc_action", true) }
   end
 
   class ConditionalClassFilter
@@ -186,24 +186,24 @@ class FilterTest < ActionController::TestCase
   end
 
   class OnlyConditionClassController < ConditionalFilterController
-    before_action ConditionalClassFilter, :only => :show
+    before_action ConditionalClassFilter, only: :show
   end
 
   class ExceptConditionClassController < ConditionalFilterController
-    before_action ConditionalClassFilter, :except => :show_without_action
+    before_action ConditionalClassFilter, except: :show_without_action
   end
 
   class AnomolousYetValidConditionController < ConditionalFilterController
-    before_action(ConditionalClassFilter, :ensure_login, Proc.new {|c| c.instance_variable_set(:"@ran_proc_action1", true)}, :except => :show_without_action) { |c| c.instance_variable_set(:"@ran_proc_action2", true)}
+    before_action(ConditionalClassFilter, :ensure_login, Proc.new {|c| c.instance_variable_set(:"@ran_proc_action1", true)}, except: :show_without_action) { |c| c.instance_variable_set(:"@ran_proc_action2", true)}
   end
 
   class OnlyConditionalOptionsFilter < ConditionalFilterController
-    before_action :ensure_login, :only => :index, :if => Proc.new {|c| c.instance_variable_set(:"@ran_conditional_index_proc", true) }
+    before_action :ensure_login, only: :index, if: Proc.new {|c| c.instance_variable_set(:"@ran_conditional_index_proc", true) }
   end
 
   class ConditionalOptionsFilter < ConditionalFilterController
-    before_action :ensure_login, :if => Proc.new { |c| true }
-    before_action :clean_up_tmp, :if => Proc.new { |c| false }
+    before_action :ensure_login, if: Proc.new { |c| true }
+    before_action :clean_up_tmp, if: Proc.new { |c| false }
   end
 
   class ConditionalOptionsSkipFilter < ConditionalFilterController
@@ -255,7 +255,7 @@ class FilterTest < ActionController::TestCase
 
   class SkippingAndLimitedController < TestController
     skip_before_action :ensure_login
-    before_action :ensure_login, :only => :index
+    before_action :ensure_login, only: :index
 
     def index
       render plain: "ok"
@@ -283,17 +283,17 @@ class FilterTest < ActionController::TestCase
   end
 
   class ConditionalSkippingController < TestController
-    skip_before_action :ensure_login, :only => [ :login ]
-    skip_after_action  :clean_up,     :only => [ :login ]
+    skip_before_action :ensure_login, only: [ :login ]
+    skip_after_action  :clean_up,     only: [ :login ]
 
-    before_action :find_user, :only => [ :change_password ]
+    before_action :find_user, only: [ :change_password ]
 
     def login
-      render :inline => "ran action"
+      render inline: "ran action"
     end
 
     def change_password
-      render :inline => "ran action"
+      render inline: "ran action"
     end
 
     protected
@@ -304,8 +304,8 @@ class FilterTest < ActionController::TestCase
   end
 
   class ConditionalParentOfConditionalSkippingController < ConditionalFilterController
-    before_action :conditional_in_parent_before, :only => [:show, :another_action]
-    after_action  :conditional_in_parent_after, :only => [:show, :another_action]
+    before_action :conditional_in_parent_before, only: [:show, :another_action]
+    after_action  :conditional_in_parent_after, only: [:show, :another_action]
 
     private
 
@@ -321,12 +321,12 @@ class FilterTest < ActionController::TestCase
   end
 
   class ChildOfConditionalParentController < ConditionalParentOfConditionalSkippingController
-    skip_before_action :conditional_in_parent_before, :only => :another_action
-    skip_after_action  :conditional_in_parent_after, :only => :another_action
+    skip_before_action :conditional_in_parent_before, only: :another_action
+    skip_after_action  :conditional_in_parent_after, only: :another_action
   end
 
   class AnotherChildOfConditionalParentController < ConditionalParentOfConditionalSkippingController
-    skip_before_action :conditional_in_parent_before, :only => :show
+    skip_before_action :conditional_in_parent_before, only: :show
   end
 
   class ProcController < PrependingController
@@ -418,7 +418,7 @@ class FilterTest < ActionController::TestCase
     class OutOfOrder < StandardError; end
 
     before_action :first
-    before_action :second, :only => :foo
+    before_action :second, only: :foo
 
     def foo
       render plain: "foo"
@@ -501,7 +501,7 @@ class FilterTest < ActionController::TestCase
     after_action :action_three
 
     def index
-      render :inline => "index"
+      render inline: "index"
     end
 
     private
@@ -526,8 +526,8 @@ class FilterTest < ActionController::TestCase
   end
 
   class ImplicitActionsController < ActionController::Base
-    before_action :find_only, :only => :edit
-    before_action :find_except, :except => :edit
+    before_action :find_only, only: :edit
+    before_action :find_except, except: :edit
 
     private
 
@@ -859,14 +859,14 @@ class PostsController < ActionController::Base
 
   private
     def default_action
-      render :inline => "#{action_name} called"
+      render inline: "#{action_name} called"
     end
 end
 
 class ControllerWithSymbolAsFilter < PostsController
-  around_action :raise_before, :only => :raises_before
-  around_action :raise_after, :only => :raises_after
-  around_action :without_exception, :only => :no_raise
+  around_action :raise_before, only: :raises_before
+  around_action :raise_after, only: :raises_after
+  around_action :without_exception, only: :no_raise
 
   private
     def raise_before
@@ -898,7 +898,7 @@ class ControllerWithFilterClass < PostsController
     end
   end
 
-  around_action YieldingFilter, :only => :raises_after
+  around_action YieldingFilter, only: :raises_after
 end
 
 class ControllerWithFilterInstance < PostsController
@@ -909,11 +909,11 @@ class ControllerWithFilterInstance < PostsController
     end
   end
 
-  around_action YieldingFilter.new, :only => :raises_after
+  around_action YieldingFilter.new, only: :raises_after
 end
 
 class ControllerWithProcFilter < PostsController
-  around_action(:only => :no_raise) do |c,b|
+  around_action(only: :no_raise) do |c,b|
     c.instance_variable_set(:"@before", true)
     b.call
     c.instance_variable_set(:"@after", true)
@@ -921,7 +921,7 @@ class ControllerWithProcFilter < PostsController
 end
 
 class ControllerWithNestedFilters < ControllerWithSymbolAsFilter
-  around_action :raise_before, :raise_after, :without_exception, :only => :raises_both
+  around_action :raise_before, :raise_after, :without_exception, only: :raises_both
 end
 
 class ControllerWithAllTypesOfFilters < PostsController