github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-24 11:33:06 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #1904 from vikhyat/load-plugins-1

Browse Source 
Use LOAD_PLUGINS=1 instead of LOAD_PLUGINS=true for consistency.
This commit is contained in:
Régis Hanol 2014-02-05 10:22:25 +01:00
commit e45a2bd064
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/application.rb
View File

@ -157,7 +157,7 @@ module Discourse
config.active_record.whitelist_attributes = false unless rails4? config.active_record.whitelist_attributes = false unless rails4?
require 'auth' 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 config.after_initialize do
# So open id logs somewhere sane # So open id logs somewhere sane

2
lib/tasks/plugin.rake
View File

@ -49,7 +49,7 @@ task 'plugin:spec', :plugin do |t, args|
ruby = `which ruby`.strip ruby = `which ruby`.strip
files = Dir.glob("./plugins/#{args[:plugin]}/spec/**/*.rb") files = Dir.glob("./plugins/#{args[:plugin]}/spec/**/*.rb")
if files.length > 0 if files.length > 0
sh "LOAD_PLUGINS=true #{ruby} -S rspec #{files.join(' ')}" sh "LOAD_PLUGINS=1 #{ruby} -S rspec #{files.join(' ')}"
else else
abort "No specs found." abort "No specs found."
end end

2
spec/spec_helper.rb
View File

@ -76,7 +76,7 @@ Spork.prefork do
end end
config.before(:all) do config.before(:all) do
DiscoursePluginRegistry.clear if ENV['LOAD_PLUGINS'] != "true" DiscoursePluginRegistry.clear if ENV['LOAD_PLUGINS'] != "1"
Discourse.current_user_provider = TestCurrentUserProvider Discourse.current_user_provider = TestCurrentUserProvider
# a bit odd, but this setting is actually preloaded # a bit odd, but this setting is actually preloaded