Merge pull request #18213 from agrobbin/moar-concerns

Actually autoload all second-level directories called `app/*/concerns`

3 files changed, 34 insertions, 4 deletions

diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index cd7f3b1e2f..b32e9437a3 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -1 +1,5 @@
+*   Autoload any second level directories called `app/*/concerns`.
+
+    *Alex Robbin*
+
 Please check [4-2-stable](https://github.com/rails/rails/blob/4-2-stable/railties/CHANGELOG.md) for previous changes.
diff --git a/railties/lib/rails/engine/configuration.rb b/railties/lib/rails/engine/configuration.rb
index 10d1821709..62a4139d07 100644
--- a/railties/lib/rails/engine/configuration.rb
+++ b/railties/lib/rails/engine/configuration.rb
@@ -39,7 +39,7 @@ module Rails
         @paths ||= begin
           paths = Rails::Paths::Root.new(@root)
 
-          paths.add "app",                 eager_load: true, glob: "*"
+          paths.add "app",                 eager_load: true, glob: "{*,*/concerns}"
           paths.add "app/assets",          glob: "*"
           paths.add "app/controllers",     eager_load: true
           paths.add "app/helpers",         eager_load: true
@@ -47,9 +47,6 @@ module Rails
           paths.add "app/mailers",         eager_load: true
           paths.add "app/views"
 
-          paths.add "app/controllers/concerns", eager_load: true
-          paths.add "app/models/concerns",      eager_load: true
-
           paths.add "lib",                 load_path: true
           paths.add "lib/assets",          glob: "*"
           paths.add "lib/tasks",           glob: "**/*.rake"
diff --git a/railties/test/application/loading_test.rb b/railties/test/application/loading_test.rb
index 4f30f30f95..85066210f3 100644
--- a/railties/test/application/loading_test.rb
+++ b/railties/test/application/loading_test.rb
@@ -33,6 +33,35 @@ class LoadingTest < ActiveSupport::TestCase
     assert_equal 'omg', p.title
   end
 
+  test "concerns in app are autoloaded" do
+    app_file "app/controllers/concerns/trackable.rb", <<-CONCERN
+      module Trackable
+      end
+    CONCERN
+
+    app_file "app/mailers/concerns/email_loggable.rb", <<-CONCERN
+      module EmailLoggable
+      end
+    CONCERN
+
+    app_file "app/models/concerns/orderable.rb", <<-CONCERN
+      module Orderable
+      end
+    CONCERN
+
+    app_file "app/validators/concerns/matchable.rb", <<-CONCERN
+      module Matchable
+      end
+    CONCERN
+
+    require "#{rails_root}/config/environment"
+
+    assert_nothing_raised(NameError) { Trackable }
+    assert_nothing_raised(NameError) { EmailLoggable }
+    assert_nothing_raised(NameError) { Orderable }
+    assert_nothing_raised(NameError) { Matchable }
+  end
+
   test "models without table do not panic on scope definitions when loaded" do
     app_file "app/models/user.rb", <<-MODEL
       class User < ActiveRecord::Base