Permalink
Browse files

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

Conflicts:
	railties/test/railties/plugin_test.rb
  • Loading branch information...
2 parents 49be331 + 3086dbd commit a89c8cb5289d5af32352ed46eca74138685a3259 @josevalim josevalim committed Jan 25, 2010
Showing with 17 additions and 0 deletions.
  1. +17 −0 railties/test/railties/plugin_ordering_test.rb
View
17 railties/test/railties/plugin_ordering_test.rb
@@ -51,5 +51,22 @@ def boot_rails
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

0 comments on commit a89c8cb

Please sign in to comment.