1 files changed, 8 insertions, 3 deletions
diff --git a/actionpack/test/abstract/helper_test.rb b/actionpack/test/abstract/helper_test.rb
index b28a5b5afb..e79008fa9d 100644
--- a/actionpack/test/abstract/helper_test.rb
+++ b/actionpack/test/abstract/helper_test.rb
@@ -7,7 +7,7 @@ module AbstractController
 
     class ControllerWithHelpers < AbstractController::Base
       include AbstractController::Rendering
-      include Helpers
+      include AbstractController::Helpers
 
       def with_module
         render :inline => "Module <%= included_method %>"
@@ -44,7 +44,7 @@ module AbstractController
 
     class AbstractHelpersBlock < ControllerWithHelpers
       helper do
-        include ::AbstractController::Testing::HelperyTest
+        include AbstractController::Testing::HelperyTest
       end
     end
 
@@ -69,7 +69,12 @@ module AbstractController
       end
 
       def test_declare_missing_helper
-        assert_raise(MissingSourceFile) { AbstractHelpers.helper :missing }
+        begin
+          AbstractHelpers.helper :missing
+          flunk "should have raised an exception"
+        rescue LoadError => e
+          assert_equal "helpers/missing_helper.rb", e.path
+        end
       end
 
       def test_helpers_with_module_through_block