From 1b0526eaac87342b5413183e082b51b10a6ace6e Mon Sep 17 00:00:00 2001
From: Shuhei Kagawa <s-kagawa@m3.com>
Date: Fri, 27 Mar 2015 15:41:05 +0900
Subject: [PATCH] Return super in ActionController::Parameters.const_missing

The current implementation of ActionController::Parameters.const_missing
returns `ActionController::Parameters.always_permitted_parameters` even
if its `super` returns a constant without raising error. This prevents its
subclass in a autoloading module/class from taking advantage of
autoloading constants.

    class SomeParameters < ActionController::Parameters
      def do_something
        DefinedSomewhere.do_something
      end
    end

In the code above, `DefinedSomewhere` is to be autoloaded with
`Module.const_missing` but `ActionController::Parameters.const_missing`
returns `always_permitted_parameters` instead of the autoloaded
constant.

This pull request fixes the issue respecting `const_missing`'s `super`.
---
 .../lib/action_controller/metal/strong_parameters.rb     | 2 +-
 .../parameters/always_permitted_parameters_test.rb       | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/actionpack/lib/action_controller/metal/strong_parameters.rb b/actionpack/lib/action_controller/metal/strong_parameters.rb
index f19c4201ba..e30c9c5ade 100644
--- a/actionpack/lib/action_controller/metal/strong_parameters.rb
+++ b/actionpack/lib/action_controller/metal/strong_parameters.rb
@@ -117,7 +117,7 @@ module ActionController
     self.always_permitted_parameters = %w( controller action )
 
     def self.const_missing(const_name)
-      super unless const_name == :NEVER_UNPERMITTED_PARAMS
+      return super unless const_name == :NEVER_UNPERMITTED_PARAMS
       ActiveSupport::Deprecation.warn(<<-MSG.squish)
         `ActionController::Parameters::NEVER_UNPERMITTED_PARAMS` has been deprecated.
         Use `ActionController::Parameters.always_permitted_parameters` instead.
diff --git a/actionpack/test/controller/parameters/always_permitted_parameters_test.rb b/actionpack/test/controller/parameters/always_permitted_parameters_test.rb
index 059f310d49..59be08db54 100644
--- a/actionpack/test/controller/parameters/always_permitted_parameters_test.rb
+++ b/actionpack/test/controller/parameters/always_permitted_parameters_test.rb
@@ -1,5 +1,6 @@
 require 'abstract_unit'
 require 'action_controller/metal/strong_parameters'
+require 'minitest/mock'
 
 class AlwaysPermittedParametersTest < ActiveSupport::TestCase
   def setup
@@ -14,7 +15,13 @@ class AlwaysPermittedParametersTest < ActiveSupport::TestCase
 
   test "shows deprecations warning on NEVER_UNPERMITTED_PARAMS" do
     assert_deprecated do
-       ActionController::Parameters::NEVER_UNPERMITTED_PARAMS
+      ActionController::Parameters::NEVER_UNPERMITTED_PARAMS
+    end
+  end
+
+  test "returns super on missing constant other than NEVER_UNPERMITTED_PARAMS" do
+    ActionController::Parameters.superclass.stub :const_missing, "super" do
+      assert_equal "super", ActionController::Parameters::NON_EXISTING_CONSTANT
     end
   end