move `MissingHelperError` out of the `ClassMethods` module.

3 files changed, 23 insertions, 16 deletions

diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index 3105dbcc42..28597451ba 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -1,3 +1,7 @@
+*   Move `MissingHelperError` out of the `ClassMethods` module.
+
+    *Yves Senn*
+
 *   Fix an issue where rails raise exception about missing helper where it
     should throw `LoadError`. When helper file exists and only loaded file from
     this helper does not exist rails should throw LoadError instead of
diff --git a/actionpack/lib/abstract_controller/helpers.rb b/actionpack/lib/abstract_controller/helpers.rb
index a928205963..e77e4e01e9 100644
--- a/actionpack/lib/abstract_controller/helpers.rb
+++ b/actionpack/lib/abstract_controller/helpers.rb
@@ -12,7 +12,24 @@ module AbstractController
       self._helper_methods = Array.new
     end
 
+    class MissingHelperError < LoadError
+      def initialize(error, path)
+        @error = error
+        @path  = "helpers/#{path}.rb"
+        set_backtrace error.backtrace
+
+        if error.path =~ /^#{path}(\.rb)?$/
+          super("Missing helper file helpers/%s.rb" % path)
+        else
+          raise error
+        end
+      end
+    end
+
     module ClassMethods
+      MissingHelperError = ActiveSupport::Deprecation::DeprecatedConstantProxy.new('AbstractController::Helpers::ClassMethods::MissingHelperError',
+                                                                                   'AbstractController::Helpers::MissingHelperError')
+
       # When a class is inherited, wrap its helper module in a new module.
       # This ensures that the parent class's module can be changed
       # independently of the child class's.
@@ -134,7 +151,7 @@ module AbstractController
             begin
               require_dependency(file_name)
             rescue LoadError => e
-              raise MissingHelperError.new(e, file_name)
+              raise AbstractController::Helpers::MissingHelperError.new(e, file_name)
             end
             file_name.camelize.constantize
           when Module
@@ -145,20 +162,6 @@ module AbstractController
         end
       end
 
-      class MissingHelperError < LoadError
-        def initialize(error, path)
-          @error = error
-          @path  = "helpers/#{path}.rb"
-          set_backtrace error.backtrace
-
-          if error.path =~ /^#{path}(\.rb)?$/
-            super("Missing helper file helpers/%s.rb" % path)
-          else
-            raise error
-          end
-        end
-      end
-
       private
       # Makes all the (instance) methods in the helper module available to templates
       # rendered through this controller.
diff --git a/actionpack/test/abstract/helper_test.rb b/actionpack/test/abstract/helper_test.rb
index 2cc27fbecd..8616e9837f 100644
--- a/actionpack/test/abstract/helper_test.rb
+++ b/actionpack/test/abstract/helper_test.rb
@@ -113,7 +113,7 @@ module AbstractController
       end
 
       def test_controller_raise_error_about_missing_helper
-        e = assert_raise(Helpers::ClassMethods::MissingHelperError) { AbstractInvalidHelpers.helper(:missing) }
+        e = assert_raise(AbstractController::Helpers::MissingHelperError) { AbstractInvalidHelpers.helper(:missing) }
         assert_equal "Missing helper file helpers/missing_helper.rb", e.message
       end
     end