Document and clean up HideActions and Http

1 files changed, 8 insertions, 3 deletions

diff --git a/actionpack/test/controller/base_test.rb b/actionpack/test/controller/base_test.rb
index 3a4cdb81d9..03fd98a85c 100644
--- a/actionpack/test/controller/base_test.rb
+++ b/actionpack/test/controller/base_test.rb
@@ -87,11 +87,11 @@ class ControllerInstanceTests < Test::Unit::TestCase
   def test_action_methods
     @empty_controllers.each do |c|
       hide_mocha_methods_from_controller(c)
-      assert_equal Set.new, c.__send__(:action_methods), "#{c.controller_path} should be empty!"
+      assert_equal Set.new, c.class.__send__(:action_methods), "#{c.controller_path} should be empty!"
     end
     @non_empty_controllers.each do |c|
       hide_mocha_methods_from_controller(c)
-      assert_equal Set.new(%w(public_action)), c.__send__(:action_methods), "#{c.controller_path} should not be empty!"
+      assert_equal Set.new(%w(public_action)), c.class.__send__(:action_methods), "#{c.controller_path} should not be empty!"
     end
   end
 
@@ -145,7 +145,12 @@ class PerformActionTest < ActionController::TestCase
   
   def test_method_missing_is_not_an_action_name
     use_controller MethodMissingController
-    assert ! @controller.__send__(:action_methods).include?('method_missing')
+
+    if defined?(ActionController::Http)
+      assert ! @controller.__send__(:action_method?, 'method_missing')
+    else
+      assert ! @controller.__send__(:action_methods).include?('method_missing')
+    end
     
     get :method_missing
     assert_response :success