Add config.action_controller.include behavior to plugins.

1 files changed, 16 insertions, 0 deletions

diff --git a/railties/test/plugins/configuration_test.rb b/railties/test/plugins/configuration_test.rb
index 5786316d1d..0843d05577 100644
--- a/railties/test/plugins/configuration_test.rb
+++ b/railties/test/plugins/configuration_test.rb
@@ -8,6 +8,10 @@ module PluginsTest
       require "rails"
     end
 
+    module Bar; end
+    module Baz; end
+    module All; end
+
     test "config is available to plugins" do
       class Foo < Rails::Plugin ; end
       assert_nil Foo.config.action_controller.foo
@@ -24,6 +28,18 @@ module PluginsTest
       assert_equal "hello", AppTemplate::Application.config.foo.greetings
     end
 
+    test "plugin configurations allow modules to be given" do
+      class Foo < Rails::Plugin ; config.foo.include(Bar, Baz) ; end
+      assert_equal [Bar, Baz], Foo.config.foo.includes
+    end
+
+    test "plugin includes given modules in given class" do
+      class Foo < Rails::Plugin ; config.foo.include(Bar, "PluginsTest::ConfigurationTest::Baz") ; include_modules_in All ; end
+      Foo.new.run_initializers(Foo)
+      assert All.ancestors.include?(Bar)
+      assert All.ancestors.include?(Baz)
+    end
+
     test "plugin config merges are deep" do
       class Foo < Rails::Plugin ; config.foo.greetings = 'hello' ; end
       class MyApp < Rails::Application