From b8576425eeee2eaa82c5acb08227f5bb2dcd07b7 Mon Sep 17 00:00:00 2001
From: bogdanvlviv <bogdanvlviv@gmail.com>
Date: Thu, 16 Aug 2018 22:48:18 +0300
Subject: DRY in `assert_enqueued_jobs`
---
activejob/lib/active_job/test_helper.rb | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/activejob/lib/active_job/test_helper.rb b/activejob/lib/active_job/test_helper.rb
index dbf9bfb3a4..bb9e3e6ca4 100644
--- a/activejob/lib/active_job/test_helper.rb
+++ b/activejob/lib/active_job/test_helper.rb
@@ -118,13 +118,17 @@ module ActiveJob
def assert_enqueued_jobs(number, only: nil, except: nil, queue: nil)
if block_given?
original_count = enqueued_jobs_with(only: only, except: except, queue: queue)
+
yield
+
new_count = enqueued_jobs_with(only: only, except: except, queue: queue)
- assert_equal number, new_count - original_count, "#{number} jobs expected, but #{new_count - original_count} were enqueued"
+
+ actual_count = new_count - original_count
else
actual_count = enqueued_jobs_with(only: only, except: except, queue: queue)
- assert_equal number, actual_count, "#{number} jobs expected, but #{actual_count} were enqueued"
end
+
+ assert_equal number, actual_count, "#{number} jobs expected, but #{actual_count} were enqueued"
end
# Asserts that no jobs have been enqueued.
--
cgit v1.2.3