diff options
Diffstat (limited to 'test/cases')
| -rw-r--r-- | test/cases/callbacks_test.rb | 2 | ||||
| -rw-r--r-- | test/cases/logging_test.rb | 10 | ||||
| -rw-r--r-- | test/cases/rescue_test.rb | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/test/cases/callbacks_test.rb b/test/cases/callbacks_test.rb index 01a9b9d26b..9a0657ee89 100644 --- a/test/cases/callbacks_test.rb +++ b/test/cases/callbacks_test.rb @@ -5,7 +5,7 @@ require 'active_support/core_ext/object/inclusion' class CallbacksTest < ActiveSupport::TestCase test 'perform callbacks' do - performed_callback_job = CallbackJob.new.tap { |j| j.execute } + performed_callback_job = CallbackJob.new.tap { |j| j.execute("A-JOB-ID") } assert "CallbackJob ran before_perform".in? performed_callback_job.history assert "CallbackJob ran after_perform".in? performed_callback_job.history assert "CallbackJob ran around_perform_start".in? performed_callback_job.history diff --git a/test/cases/logging_test.rb b/test/cases/logging_test.rb index 194944db11..537702edd4 100644 --- a/test/cases/logging_test.rb +++ b/test/cases/logging_test.rb @@ -46,7 +46,7 @@ class AdapterTest < ActiveSupport::TestCase def test_enqueue_job_logging HelloJob.enqueue "Cristian" - assert_match(/Enqueued HelloJob to .*?:.*Cristian/, @logger.messages) + assert_match(/Enqueued HelloJob \(Job ID: .*?\) to .*?:.*Cristian/, @logger.messages) end def test_perform_job_logging @@ -69,9 +69,9 @@ class AdapterTest < ActiveSupport::TestCase def test_perform_nested_jobs_logging NestedJob.enqueue assert_match(/\[LoggingJob\] \[.*?\]/, @logger.messages) - assert_match(/\[ActiveJob\] Enqueued NestedJob to/, @logger.messages) + assert_match(/\[ActiveJob\] Enqueued NestedJob \(Job ID: .*\) to/, @logger.messages) assert_match(/\[ActiveJob\] \[NestedJob\] \[NESTED-JOB-ID\] Performing NestedJob from/, @logger.messages) - assert_match(/\[ActiveJob\] \[NestedJob\] \[NESTED-JOB-ID\] Enqueued LoggingJob to .* with arguments: "NestedJob"/, @logger.messages) + assert_match(/\[ActiveJob\] \[NestedJob\] \[NESTED-JOB-ID\] Enqueued LoggingJob \(Job ID: .*?\) to .* with arguments: "NestedJob"/, @logger.messages) assert_match(/\[ActiveJob\].*\[LoggingJob\] \[LOGGING-JOB-ID\] Performing LoggingJob from .* with arguments: "NestedJob"/, @logger.messages) assert_match(/\[ActiveJob\].*\[LoggingJob\] \[LOGGING-JOB-ID\] Dummy, here is it: NestedJob/, @logger.messages) assert_match(/\[ActiveJob\].*\[LoggingJob\] \[LOGGING-JOB-ID\] Performed LoggingJob from .* in/, @logger.messages) @@ -80,14 +80,14 @@ class AdapterTest < ActiveSupport::TestCase def test_enqueue_at_job_logging HelloJob.enqueue_at 1, "Cristian" - assert_match(/Enqueued HelloJob to .*? at.*Cristian/, @logger.messages) + assert_match(/Enqueued HelloJob \(Job ID: .*\) to .*? at.*Cristian/, @logger.messages) rescue NotImplementedError skip end def test_enqueue_in_job_logging HelloJob.enqueue_in 2, "Cristian" - assert_match(/Enqueued HelloJob to .*? at.*Cristian/, @logger.messages) + assert_match(/Enqueued HelloJob \(Job ID: .*\) to .*? at.*Cristian/, @logger.messages) rescue NotImplementedError skip end diff --git a/test/cases/rescue_test.rb b/test/cases/rescue_test.rb index aea8b036d4..3d4831bc62 100644 --- a/test/cases/rescue_test.rb +++ b/test/cases/rescue_test.rb @@ -7,17 +7,17 @@ class RescueTest < ActiveSupport::TestCase setup do $BUFFER = [] end - + test 'rescue perform exception with retry' do job = RescueJob.new - job.execute("david") + job.execute(SecureRandom.uuid, "david") assert_equal [ "rescued from ArgumentError", "performed beautifully" ], $BUFFER end test 'let through unhandled perform exception' do job = RescueJob.new assert_raises(RescueJob::OtherError) do - job.execute("other") + job.execute(SecureRandom.uuid, "other") end end end |