diff options
author | Abdelkader Boudih <terminale@gmail.com> | 2014-08-17 13:23:24 +0000 |
---|---|---|
committer | Abdelkader Boudih <terminale@gmail.com> | 2014-08-17 23:10:45 +0000 |
commit | 931cfc40796bfd2f4638d8ca7a11723d7562e9cd (patch) | |
tree | 16b02f80182f49bff8e24aef35730111faf48f4d /activejob/test/cases | |
parent | 2f7b239fca6630e49ba8ad9df6fc7db25e1080f0 (diff) | |
download | rails-931cfc40796bfd2f4638d8ca7a11723d7562e9cd.tar.gz rails-931cfc40796bfd2f4638d8ca7a11723d7562e9cd.tar.bz2 rails-931cfc40796bfd2f4638d8ca7a11723d7562e9cd.zip |
[ActiveJob] Fix tests for sucker_punch
Diffstat (limited to 'activejob/test/cases')
-rw-r--r-- | activejob/test/cases/job_serialization_test.rb | 4 | ||||
-rw-r--r-- | activejob/test/cases/logging_test.rb | 2 | ||||
-rw-r--r-- | activejob/test/cases/queuing_test.rb | 6 | ||||
-rw-r--r-- | activejob/test/cases/rescue_test.rb | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/activejob/test/cases/job_serialization_test.rb b/activejob/test/cases/job_serialization_test.rb index f3b89d8899..fc1b77744c 100644 --- a/activejob/test/cases/job_serialization_test.rb +++ b/activejob/test/cases/job_serialization_test.rb @@ -4,12 +4,12 @@ require 'models/person' class JobSerializationTest < ActiveSupport::TestCase setup do - Thread.current[:ajbuffer] = [] + JobBuffer.clear @person = Person.find(5) end test 'serialize job with gid' do GidJob.enqueue @person - assert_equal "Person with ID: 5", Thread.current[:ajbuffer].pop + assert_equal "Person with ID: 5", JobBuffer.last_value end end diff --git a/activejob/test/cases/logging_test.rb b/activejob/test/cases/logging_test.rb index f0f315c906..888c183a0b 100644 --- a/activejob/test/cases/logging_test.rb +++ b/activejob/test/cases/logging_test.rb @@ -23,7 +23,7 @@ class AdapterTest < ActiveSupport::TestCase def setup super - Thread.current[:ajbuffer] = [] + JobBuffer.clear @old_logger = ActiveJob::Base.logger @logger = ActiveSupport::TaggedLogging.new(TestLogger.new) set_logger @logger diff --git a/activejob/test/cases/queuing_test.rb b/activejob/test/cases/queuing_test.rb index 49760ce9c0..f020316d7e 100644 --- a/activejob/test/cases/queuing_test.rb +++ b/activejob/test/cases/queuing_test.rb @@ -5,17 +5,17 @@ require 'active_support/core_ext/numeric/time' class QueuingTest < ActiveSupport::TestCase setup do - Thread.current[:ajbuffer] = [] + JobBuffer.clear end test 'run queued job' do HelloJob.enqueue - assert_equal "David says hello", Thread.current[:ajbuffer].pop + assert_equal "David says hello", JobBuffer.last_value end test 'run queued job with arguments' do HelloJob.enqueue "Jamie" - assert_equal "Jamie says hello", Thread.current[:ajbuffer].pop + assert_equal "Jamie says hello", JobBuffer.last_value end test 'run queued job later' do diff --git a/activejob/test/cases/rescue_test.rb b/activejob/test/cases/rescue_test.rb index 4fbd27fe6c..250ab68671 100644 --- a/activejob/test/cases/rescue_test.rb +++ b/activejob/test/cases/rescue_test.rb @@ -5,13 +5,13 @@ require 'active_support/core_ext/object/inclusion' class RescueTest < ActiveSupport::TestCase setup do - Thread.current[:ajbuffer] = [] + JobBuffer.clear end test 'rescue perform exception with retry' do job = RescueJob.new job.execute(SecureRandom.uuid, "david") - assert_equal [ "rescued from ArgumentError", "performed beautifully" ], Thread.current[:ajbuffer] + assert_equal [ "rescued from ArgumentError", "performed beautifully" ], JobBuffer.values end test 'let through unhandled perform exception' do |