mirror of
https://github.com/discourse/discourse.git
synced 2024-11-24 05:50:14 +08:00
Merge pull request #1904 from vikhyat/load-plugins-1
Use LOAD_PLUGINS=1 instead of LOAD_PLUGINS=true for consistency.
This commit is contained in:
commit
e45a2bd064
|
@ -157,7 +157,7 @@ module Discourse
|
|||
config.active_record.whitelist_attributes = false unless rails4?
|
||||
|
||||
require 'auth'
|
||||
Discourse.activate_plugins! unless Rails.env.test? and ENV['LOAD_PLUGINS'] != "true"
|
||||
Discourse.activate_plugins! unless Rails.env.test? and ENV['LOAD_PLUGINS'] != "1"
|
||||
|
||||
config.after_initialize do
|
||||
# So open id logs somewhere sane
|
||||
|
|
|
@ -49,7 +49,7 @@ task 'plugin:spec', :plugin do |t, args|
|
|||
ruby = `which ruby`.strip
|
||||
files = Dir.glob("./plugins/#{args[:plugin]}/spec/**/*.rb")
|
||||
if files.length > 0
|
||||
sh "LOAD_PLUGINS=true #{ruby} -S rspec #{files.join(' ')}"
|
||||
sh "LOAD_PLUGINS=1 #{ruby} -S rspec #{files.join(' ')}"
|
||||
else
|
||||
abort "No specs found."
|
||||
end
|
||||
|
|
|
@ -76,7 +76,7 @@ Spork.prefork do
|
|||
end
|
||||
|
||||
config.before(:all) do
|
||||
DiscoursePluginRegistry.clear if ENV['LOAD_PLUGINS'] != "true"
|
||||
DiscoursePluginRegistry.clear if ENV['LOAD_PLUGINS'] != "1"
|
||||
Discourse.current_user_provider = TestCurrentUserProvider
|
||||
|
||||
# a bit odd, but this setting is actually preloaded
|
||||
|
|
Loading…
Reference in New Issue
Block a user