Better test logging [skip ci]

Andrew
1 parent 88893ca1
Showing 4 changed files with 7 additions and 5 deletions Show diff stats
test/support/activerecord.rb
test/support/cequel.rb
test/support/mongoid.rb
test/test_helper.rb
 require "active_record"
  
 # for debugging
-ActiveRecord::Base.logger = ActiveSupport::Logger.new(STDOUT) if ENV["VERBOSE"]
+ActiveRecord::Base.logger = $logger
  
 # rails does this in activerecord/lib/active_record/railtie.rb
 ActiveRecord::Base.default_timezone = :utc
@@ -5,7 +5,7 @@ cequel =
     keyspace: "searchkick_test",
     default_consistency: :all
   )
-cequel.logger = ActiveSupport::Logger.new(STDOUT) if ENV["VERBOSE"]
+cequel.logger = $logger
 cequel.schema.drop! if cequel.schema.exists?
 cequel.schema.create!
 Cequel::Record.connection = cequel
-Mongoid.logger.level = Logger::INFO
-Mongo::Logger.logger.level = Logger::INFO if defined?(Mongo::Logger)
+Mongoid.logger = $logger
+Mongo::Logger.logger = $logger if defined?(Mongo::Logger)
  
 Mongoid.configure do |config|
   config.connect_to "searchkick_test"
@@ -10,7 +10,9 @@ Searchkick.index_suffix = ENV[&quot;TEST_ENV_NUMBER&quot;]
  
 ENV["RACK_ENV"] = "test"
  
-Searchkick.client.transport.logger = ActiveSupport::Logger.new(STDOUT) if ENV["VERBOSE"]
+$logger = ActiveSupport::Logger.new(ENV["VERBOSE"] ? STDOUT : nil)
+
+Searchkick.client.transport.logger = $logger
 Searchkick.search_timeout = 5
  
 if defined?(Redis)
1	1	require "active_record"
2	2
3	3	# for debugging
4		-ActiveRecord::Base.logger = ActiveSupport::Logger.new(STDOUT) if ENV["VERBOSE"]
	4	+ActiveRecord::Base.logger = $logger
5	5
6	6	# rails does this in activerecord/lib/active_record/railtie.rb
7	7	ActiveRecord::Base.default_timezone = :utc
...	...
...	...	@@ -5,7 +5,7 @@ cequel =
5	5	keyspace: "searchkick_test",
6	6	default_consistency: :all
7	7	)
8		-cequel.logger = ActiveSupport::Logger.new(STDOUT) if ENV["VERBOSE"]
	8	+cequel.logger = $logger
9	9	cequel.schema.drop! if cequel.schema.exists?
10	10	cequel.schema.create!
11	11	Cequel::Record.connection = cequel
...	...
1		-Mongoid.logger.level = Logger::INFO
2		-Mongo::Logger.logger.level = Logger::INFO if defined?(Mongo::Logger)
	1	+Mongoid.logger = $logger
	2	+Mongo::Logger.logger = $logger if defined?(Mongo::Logger)
3	3
4	4	Mongoid.configure do \|config\|
5	5	config.connect_to "searchkick_test"
...	...
...	...	@@ -10,7 +10,9 @@ Searchkick.index_suffix = ENV["TEST_ENV_NUMBER"]
10	10
11	11	ENV["RACK_ENV"] = "test"
12	12
13		-Searchkick.client.transport.logger = ActiveSupport::Logger.new(STDOUT) if ENV["VERBOSE"]
	13	+$logger = ActiveSupport::Logger.new(ENV["VERBOSE"] ? STDOUT : nil)
	14	+
	15	+Searchkick.client.transport.logger = $logger
14	16	Searchkick.search_timeout = 5
15	17
16	18	if defined?(Redis)
...	...