aboutsummaryrefslogtreecommitdiffstats
path: root/activejob/test/cases
diff options
context:
space:
mode:
authorRafael França <rafaelmfranca@gmail.com>2016-06-17 13:07:33 -0400
committerGitHub <noreply@github.com>2016-06-17 13:07:33 -0400
commit94ef224aa61ace3fa643eab161ff9056b7d90a62 (patch)
treef4cb10eadb3eaddbe6a787d179e55fffa1040711 /activejob/test/cases
parent6d4df1d3305ecacae26cfde71d06bd374c245418 (diff)
parentbe491ecec28cb644c3cbfa785c0313e4eccc49af (diff)
downloadrails-94ef224aa61ace3fa643eab161ff9056b7d90a62.tar.gz
rails-94ef224aa61ace3fa643eab161ff9056b7d90a62.tar.bz2
rails-94ef224aa61ace3fa643eab161ff9056b7d90a62.zip
Merge pull request #25426 from Shopify/fix-activejob-logger
Fix jobs overriding AJ::Base#logger
Diffstat (limited to 'activejob/test/cases')
-rw-r--r--activejob/test/cases/logging_test.rb7
1 files changed, 6 insertions, 1 deletions
diff --git a/activejob/test/cases/logging_test.rb b/activejob/test/cases/logging_test.rb
index 820e9112de..bf8a66432a 100644
--- a/activejob/test/cases/logging_test.rb
+++ b/activejob/test/cases/logging_test.rb
@@ -3,6 +3,7 @@ require "active_support/log_subscriber/test_helper"
require 'active_support/core_ext/numeric/time'
require 'jobs/hello_job'
require 'jobs/logging_job'
+require 'jobs/overridden_logging_job'
require 'jobs/nested_job'
require 'models/person'
@@ -41,7 +42,6 @@ class LoggingTest < ActiveSupport::TestCase
ActiveJob::Base.logger = logger
end
-
def test_uses_active_job_as_tag
HelloJob.perform_later "Cristian"
assert_match(/\[ActiveJob\]/, @logger.messages)
@@ -119,4 +119,9 @@ class LoggingTest < ActiveSupport::TestCase
rescue NotImplementedError
skip
end
+
+ def test_for_tagged_logger_support_is_consistent
+ set_logger ::Logger.new(nil)
+ OverriddenLoggingJob.perform_later "Dummy"
+ end
end