Merge pull request #1902 from vikhyat/plugin-test-server-side-javascript-2
Don't clear DiscoursePluginRegistry if LOAD_PLUGINS=true.
This commit is contained in:
commit
391cfe15ab
|
@ -76,7 +76,7 @@ Spork.prefork do
|
||||||
end
|
end
|
||||||
|
|
||||||
config.before(:all) do
|
config.before(:all) do
|
||||||
DiscoursePluginRegistry.clear
|
DiscoursePluginRegistry.clear if ENV['LOAD_PLUGINS'] != "true"
|
||||||
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
|
||||||
|
|
Loading…
Reference in New Issue