aboutsummaryrefslogtreecommitdiffstats
path: root/activejob/test/support/integration/test_case_helpers.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/support/integration/test_case_helpers.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/support/integration/test_case_helpers.rb')
-rw-r--r--activejob/test/support/integration/test_case_helpers.rb10
1 files changed, 4 insertions, 6 deletions
diff --git a/activejob/test/support/integration/test_case_helpers.rb b/activejob/test/support/integration/test_case_helpers.rb
index 3d9b265b66..973ee07764 100644
--- a/activejob/test/support/integration/test_case_helpers.rb
+++ b/activejob/test/support/integration/test_case_helpers.rb
@@ -33,14 +33,12 @@ module TestCaseHelpers
end
def wait_for_jobs_to_finish_for(seconds = 60)
- begin
- Timeout.timeout(seconds) do
- while !job_executed do
- sleep 0.25
- end
+ Timeout.timeout(seconds) do
+ while !job_executed do
+ sleep 0.25
end
- rescue Timeout::Error
end
+ rescue Timeout::Error
end
def job_file(id)