Ruby 1.9 compat, consistent load paths

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7719 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

1 files changed, 4 insertions, 4 deletions

diff --git a/actionpack/test/controller/base_test.rb b/actionpack/test/controller/base_test.rb
index bf1f6227fd..60e61b6285 100644
--- a/actionpack/test/controller/base_test.rb
+++ b/actionpack/test/controller/base_test.rb
@@ -75,11 +75,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.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('public_action'), c.send(:action_methods), "#{c.controller_path} should not be empty!"
+      assert_equal Set.new(%w(public_action)), c.send!(:action_methods), "#{c.controller_path} should not be empty!"
     end
   end
 
@@ -88,7 +88,7 @@ class ControllerInstanceTests < Test::Unit::TestCase
     # considered actions, so explicitly hide_action them.
     def hide_mocha_methods_from_controller(controller)
       mocha_methods = [:expects, :metaclass, :mocha, :mocha_inspect, :reset_mocha, :stubba_object, :stubba_method, :stubs, :verify, :__metaclass__, :__is_a__]
-      controller.class.send(:hide_action, *mocha_methods)
+      controller.class.send!(:hide_action, *mocha_methods)
     end
 end
 
@@ -116,7 +116,7 @@ class PerformActionTest < Test::Unit::TestCase
   
   def test_method_missing_is_not_an_action_name
     use_controller MethodMissingController
-    assert ! @controller.send(:action_methods).include?('method_missing')
+    assert ! @controller.send!(:action_methods).include?('method_missing')
     
     get :method_missing
     assert_response :success