aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKasper Timm Hansen <kaspth@gmail.com>2017-07-19 10:14:41 +0200
committerGitHub <noreply@github.com>2017-07-19 10:14:41 +0200
commitd1281cdc2c11ebf26a4e040b02ac1da21f2010a0 (patch)
tree0e260b517310d208d170e565128db14b7448eb3b
parent14e24304243f9c3ed94236c9737eb0752b7dad40 (diff)
parent2966f9598e28e0cfa04ce9f711176d01814d60c2 (diff)
downloadrails-d1281cdc2c11ebf26a4e040b02ac1da21f2010a0.tar.gz
rails-d1281cdc2c11ebf26a4e040b02ac1da21f2010a0.tar.bz2
rails-d1281cdc2c11ebf26a4e040b02ac1da21f2010a0.zip
Merge pull request #29843 from y-yagi/fix_ruby_warnings
Fix `warning: circular argument reference`
-rw-r--r--activejob/lib/active_job/test_helper.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/activejob/lib/active_job/test_helper.rb b/activejob/lib/active_job/test_helper.rb
index dd3a709f55..2ffedf2999 100644
--- a/activejob/lib/active_job/test_helper.rb
+++ b/activejob/lib/active_job/test_helper.rb
@@ -116,7 +116,7 @@ module ActiveJob
# HelloJob.perform_later('elfassy')
# end
# end
- def assert_enqueued_jobs(number, only: nil, except: except, queue: nil)
+ def assert_enqueued_jobs(number, only: nil, except: nil, queue: nil)
if block_given?
original_count = enqueued_jobs_size(only: only, except: except, queue: queue)
yield
@@ -163,7 +163,7 @@ module ActiveJob
# Note: This assertion is simply a shortcut for:
#
# assert_enqueued_jobs 0, &block
- def assert_no_enqueued_jobs(only: nil, except: except, &block)
+ def assert_no_enqueued_jobs(only: nil, except: nil, &block)
assert_enqueued_jobs 0, only: only, except: except, &block
end