Merge branch 'master' of git://github.com/rails/rails

Conflicts:
	railties/test/railties/plugin_test.rb

1 files changed, 17 insertions, 0 deletions

diff --git a/railties/test/railties/plugin_ordering_test.rb b/railties/test/railties/plugin_ordering_test.rb
index a72e59952e..f6ca493fdf 100644
--- a/railties/test/railties/plugin_ordering_test.rb
+++ b/railties/test/railties/plugin_ordering_test.rb
@@ -51,5 +51,22 @@ module RailtiesTest
       boot_rails
       assert_equal [:c, :a, :b], $arr
     end
+
+    test "can require lib file from a different plugin" do
+      plugin "foo", "require 'bar'" do |plugin|
+        plugin.write "lib/foo.rb", "$foo = true"
+      end
+
+      plugin "bar", "require 'foo'" do |plugin|
+        plugin.write "lib/bar.rb", "$bar = true"
+      end
+
+      add_to_config "config.plugins = [:foo, :bar]"
+
+      boot_rails
+
+      assert $foo
+      assert $bar
+    end
   end
 end
\ No newline at end of file