aboutsummaryrefslogtreecommitdiffstats
path: root/activejob/test/integration/queuing_test.rb
diff options
context:
space:
mode:
authorRyuta Kamizono <kamipo@gmail.com>2018-12-21 17:36:30 +0900
committerGitHub <noreply@github.com>2018-12-21 17:36:30 +0900
commitb75192845a6aa89b35c857e9f3de443ae1a0fbd5 (patch)
treec300f14774b7556a21514ee35a45b850fae7806b /activejob/test/integration/queuing_test.rb
parent07235ec37130437cb97c90e14fc8d990f46e4024 (diff)
parent892e38c78e03c11afaa5f01d995e3a21bd92b415 (diff)
downloadrails-b75192845a6aa89b35c857e9f3de443ae1a0fbd5.tar.gz
rails-b75192845a6aa89b35c857e9f3de443ae1a0fbd5.tar.bz2
rails-b75192845a6aa89b35c857e9f3de443ae1a0fbd5.zip
Merge pull request #34764 from kamipo/avoid_redundant_begin
Enable `Style/RedundantBegin` cop to avoid newly adding redundant begin block
Diffstat (limited to 'activejob/test/integration/queuing_test.rb')
-rw-r--r--activejob/test/integration/queuing_test.rb28
1 files changed, 12 insertions, 16 deletions
diff --git a/activejob/test/integration/queuing_test.rb b/activejob/test/integration/queuing_test.rb
index 96253773c7..1fa68a8ad5 100644
--- a/activejob/test/integration/queuing_test.rb
+++ b/activejob/test/integration/queuing_test.rb
@@ -60,25 +60,21 @@ class QueuingTest < ActiveSupport::TestCase
end
test "should not run job enqueued in the future" do
- begin
- TestJob.set(wait: 10.minutes).perform_later @id
- wait_for_jobs_to_finish_for(5.seconds)
- assert_not job_executed
- rescue NotImplementedError
- skip
- end
+ TestJob.set(wait: 10.minutes).perform_later @id
+ wait_for_jobs_to_finish_for(5.seconds)
+ assert_not job_executed
+ rescue NotImplementedError
+ skip
end
test "should run job enqueued in the future at the specified time" do
- begin
- TestJob.set(wait: 5.seconds).perform_later @id
- wait_for_jobs_to_finish_for(2.seconds)
- assert_not job_executed
- wait_for_jobs_to_finish_for(10.seconds)
- assert job_executed
- rescue NotImplementedError
- skip
- end
+ TestJob.set(wait: 5.seconds).perform_later @id
+ wait_for_jobs_to_finish_for(2.seconds)
+ assert_not job_executed
+ wait_for_jobs_to_finish_for(10.seconds)
+ assert job_executed
+ rescue NotImplementedError
+ skip
end
test "should supply a provider_job_id when available for immediate jobs" do