config.plugins should still work with an array of strings

This commit is contained in:
Joshua Peek
2010-01-05 23:37:40 -06:00
parent 10389a4c29
commit bbe80ae652
2 changed files with 11 additions and 4 deletions

View File

@@ -91,9 +91,10 @@ module Rails
# TODO: Fix this method
def plugins
@plugins ||= begin
plugin_names = config.plugins || [:all]
Railtie.plugins.select { |p| plugin_names.include?(:all) || plugin_names.include?(p.plugin_name) }.map { |p| p.new } +
Plugin.all(config.plugins || [:all], config.paths.vendor.plugins)
plugin_names = (config.plugins || [:all]).map { |p| p.to_sym }
Railtie.plugins.select { |p|
plugin_names.include?(:all) || plugin_names.include?(p.plugin_name)
}.map { |p| p.new } + Plugin.all(plugin_names, config.paths.vendor.plugins)
end
end

View File

@@ -191,5 +191,11 @@ module PluginsTest
boot_rails
assert_equal [:a, :c, :b], $arr
end
test "plugin order array is strings" do
add_to_config "config.plugins = %w( c_plugin all )"
boot_rails
assert_equal [:c, :a, :b], $arr
end
end
end
end