0
@@ -1,3 +1,4 @@
0
+# FIXME: helper { ... } is broken on Ruby 1.9
0
 module ActionController #:nodoc:
0
   module Helpers #:nodoc:
0
     HELPERS_DIR = (defined?(RAILS_ROOT) ? "#{RAILS_ROOT}/app/helpers" : "app/helpers")
0
@@ -120,7 +121,7 @@ module ActionController #:nodoc:
0
               begin
0
                 require_dependency(file_name)
0
               rescue LoadError => load_error
0
-                requiree = / -- (.*?)(\.rb)?$/.match(load_error).to_a[1]
0
+                requiree = / -- (.*?)(\.rb)?$/.match(load_error.message).to_a[1]
0
                 if requiree == file_name
0
                   msg = "Missing helper file helpers/#{file_name}.rb"
0
                   raise LoadError.new(msg).copy_blame!(load_error)

0
@@ -1,6 +1,6 @@
0
 require File.dirname(__FILE__) + '/../abstract_unit'
0
 
0
-silence_warnings { ActionController::Helpers::HELPERS_DIR = File.dirname(__FILE__) + '/../fixtures/helpers' }
0
+ActionController::Helpers::HELPERS_DIR.replace File.dirname(__FILE__) + '/../fixtures/helpers'
0
 
0
 class TestController < ActionController::Base
0
   attr_accessor :delegate_attr
0
@@ -130,23 +130,25 @@ class HelperTest < Test::Unit::TestCase
0
   end
0
 
0
   def test_all_helpers
0
+    methods = ApplicationController.master_helper_module.instance_methods.map(&:to_s)
0
+
0
     # abc_helper.rb
0
-    assert ApplicationController.master_helper_module.instance_methods.include?("bare_a")
0
+    assert methods.include?('bare_a')
0
 
0
     # fun/games_helper.rb
0
-    assert ApplicationController.master_helper_module.instance_methods.include?("stratego")
0
+    assert methods.include?('stratego')
0
 
0
     # fun/pdf_helper.rb
0
-    assert ApplicationController.master_helper_module.instance_methods.include?("foobar")
0
+    assert methods.include?('foobar')
0
   end
0
 
0
   private
0
     def expected_helper_methods
0
-      TestHelper.instance_methods
0
+      TestHelper.instance_methods.map(&:to_s)
0
     end
0
 
0
     def master_helper_methods
0
-      @controller_class.master_helper_module.instance_methods
0
+      @controller_class.master_helper_module.instance_methods.map(&:to_s)
0
     end
0
 
0
     def missing_methods