From 93123467997a2a803396f1d8ad59cf80146e3a3a Mon Sep 17 00:00:00 2001 From: Nils Sommer Date: Wed, 4 Mar 2020 22:45:25 +0100 Subject: [PATCH 1/2] Add spec to check #on_queue with symbol argument --- spec/rspec/rails/matchers/active_job_spec.rb | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/spec/rspec/rails/matchers/active_job_spec.rb b/spec/rspec/rails/matchers/active_job_spec.rb index bf57d5922b..6f8a93c0af 100644 --- a/spec/rspec/rails/matchers/active_job_spec.rb +++ b/spec/rspec/rails/matchers/active_job_spec.rb @@ -197,12 +197,18 @@ def self.name; "LoggingJob"; end }.to raise_error(/expected to enqueue at most 1 jobs, but enqueued 2/) end - it "passes with provided queue name" do + it "passes with provided queue name as string" do expect { hello_job.set(:queue => "low").perform_later }.to have_enqueued_job.on_queue("low") end + it "passes with provided queue name as symbol" do + expect { + hello_job.set(:queue => "low").perform_later + }.to have_enqueued_job.on_queue(:low) + end + it "passes with provided at date" do date = Date.tomorrow.noon expect { @@ -531,12 +537,18 @@ def self.name; "LoggingJob"; end }.to raise_error(/expected to perform at most 1 jobs, but performed 2/) end - it "passes with provided queue name" do + it "passes with provided queue name as string" do expect { hello_job.set(:queue => "low").perform_later }.to have_performed_job.on_queue("low") end + it "passes with provided queue name as symbol" do + expect { + hello_job.set(:queue => "low").perform_later + }.to have_performed_job.on_queue(:low) + end + it "passes with provided at date" do date = Date.tomorrow.noon expect { From 1e4ca2cdf79625a01678b8e626cdf62c6ae9dbda Mon Sep 17 00:00:00 2001 From: Nils Sommer Date: Wed, 4 Mar 2020 22:46:28 +0100 Subject: [PATCH 2/2] Make #on_queue work with symbol argument --- lib/rspec/rails/matchers/active_job.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/rspec/rails/matchers/active_job.rb b/lib/rspec/rails/matchers/active_job.rb index 707758a144..0b9ec44fb3 100644 --- a/lib/rspec/rails/matchers/active_job.rb +++ b/lib/rspec/rails/matchers/active_job.rb @@ -26,7 +26,7 @@ def with(*args, &block) end def on_queue(queue) - @queue = queue + @queue = queue.to_s self end