15954: Merge branch 'master'

[arvados.git] / apps / workbench / config / application.rb

diff --git a/apps/workbench/config/application.rb b/apps/workbench/config/application.rb
index 1c7a9d0dac8866511f795e1fea048d7f4989a300..2d331c70ad3a13941f933ab09b054fcdf4cd504e 100644 (file)
--- a/apps/workbench/config/application.rb
+++ b/apps/workbench/config/application.rb
@@ -19,8 +19,15 @@ require "rails/test_unit/railtie"
 
 Bundler.require(:default, Rails.env)
 
+if Rails.env == 'test'
+  Rails.logger = ActiveSupport::TaggedLogging.new(Logger.new(STDOUT))
+end
+
 module ArvadosWorkbench
   class Application < Rails::Application
+
+    require_relative "arvados_config.rb"
+
     # Settings in config/environments/* take precedence over those specified here.
     # Application configuration should go into files in config/initializers
     # -- all .rb files in that directory are automatically loaded.
@@ -71,5 +78,3 @@ module ArvadosWorkbench
     config.assets.paths << Rails.root.join('node_modules')
   end
 end
-
-require File.expand_path('../load_config', __FILE__)