Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: specs failed if discourse-push-notifications booted

This commit is contained in:
Sam 2017-07-25 15:52:44 -04:00
parent ec2506c32b
commit a20bb931b1
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spec/rails_helper.rb
View File

@ -64,7 +64,6 @@ Spork.prefork do
config.infer_base_class_for_anonymous_controllers = true config.infer_base_class_for_anonymous_controllers = true
config.before(:suite) do config.before(:suite) do
Sidekiq.error_handlers.clear Sidekiq.error_handlers.clear
# Ugly, but needed until we have a user creator # Ugly, but needed until we have a user creator
@ -81,7 +80,8 @@ Spork.prefork do
# and pretend they are default. # and pretend they are default.
# There are a bunch of settings that are seeded, they must be loaded as defaults # There are a bunch of settings that are seeded, they must be loaded as defaults
SiteSetting.current.each do |k,v| SiteSetting.current.each do |k,v|
SiteSetting.defaults[k] = v # skip setting defauls for settings that are in unloaded plugins
SiteSetting.defaults[k] = v if SiteSetting.respond_to? k
end end
require_dependency 'site_settings/local_process_provider' require_dependency 'site_settings/local_process_provider'