mirror of
https://github.com/github/rails.git
synced 2026-04-26 03:00:59 -04:00
config.plugins should still work with an array of strings
This commit is contained in:
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user