Fix filter :only and :except with implicit actions

The method_name argument is "default_render" for implicit actions
so use the action_name attribute to determine which callbacks to run.

[#5673 state:resolved]

2 files changed, 17 insertions, 12 deletions

diff --git a/actionpack/lib/abstract_controller/callbacks.rb b/actionpack/lib/abstract_controller/callbacks.rb
index 95992c2698..1943ca4436 100644
--- a/actionpack/lib/abstract_controller/callbacks.rb
+++ b/actionpack/lib/abstract_controller/callbacks.rb
@@ -14,7 +14,7 @@ module AbstractController
     # Override AbstractController::Base's process_action to run the
     # process_action callbacks around the normal behavior.
     def process_action(method_name, *args)
-      run_callbacks(:process_action, method_name) do
+      run_callbacks(:process_action, action_name) do
         super
       end
     end
diff --git a/actionpack/test/controller/filters_test.rb b/actionpack/test/controller/filters_test.rb
index c95332220b..9e44e8e088 100644
--- a/actionpack/test/controller/filters_test.rb
+++ b/actionpack/test/controller/filters_test.rb
@@ -506,12 +506,17 @@ class FilterTest < ActionController::TestCase
   end
 
   class ImplicitActionsController < ActionController::Base
-    before_filter :find_user, :only => :edit
+    before_filter :find_only, :only => :edit
+    before_filter :find_except, :except => :edit
 
     private
 
-    def find_user
-      @user = 'Jenny'
+    def find_only
+      @only = 'Only'
+    end
+
+    def find_except
+      @except = 'Except'
     end
   end
 
@@ -793,16 +798,16 @@ class FilterTest < ActionController::TestCase
     assert_equal("I rescued this: #<FilterTest::ErrorToRescue: Something made the bad noise.>", response.body)
   end
 
-  def test_filter_runs_for_implicitly_defined_action_when_needed
-    test_process(ImplicitActionsController, 'edit')
-    assert_equal 'Jenny', assigns(:user)
-    assert_equal 'edit', response.body
-  end
-
-  def test_filter_does_not_run_for_implicity_defined_action_when_not_needed
+  def test_filters_obey_only_and_except_for_implicit_actions
     test_process(ImplicitActionsController, 'show')
-    assert_nil assigns(:user)
+    assert_equal 'Except', assigns(:except)
+    assert_nil assigns(:only)
     assert_equal 'show', response.body
+
+    test_process(ImplicitActionsController, 'edit')
+    assert_equal 'Only', assigns(:only)
+    assert_nil assigns(:except)
+    assert_equal 'edit', response.body
   end
 
   private