rspec-activejob 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 67fc94e6b07a0f9566fa7fc4687563affa38629a
-  data.tar.gz: 5650bb54c6add28bd7b7ae830e3fec9d2a7ae925
+  metadata.gz: 9d09b4563475ff8556cae29a398448b78a3da4c7
+  data.tar.gz: 678218734197d92b674770b9a9fd91988e58c865
 SHA512:
-  metadata.gz: 32f2e4850d9ce2f45f6639d1a656a4045f91d1158a1a822b3686ed588e4219c491489fc27900bd0dff99e02dfa0dd83bd6299ff18757d7172af0a3c14a81d03b
-  data.tar.gz: 50c75b3434f3033d92129f09e99d2b09346c45444f33348f97a816a00303ee8f6a2b3fa430e86523fd8ad4fea0acc73b811fd871e1fa5e7c3204350968b79e3f
+  metadata.gz: 2f14e3e32d634747c09cc672f0eae2dfcf78c6fcd0f5af6e6fe39ff6426f62ad41b0a833c607042e9b97c8e957b672c56bf5c03c8c61ec18e8d55004d6b835d2
+  data.tar.gz: d0240dc8b98a58f4cfbdf13da957c5b37d51052ba27112fd67d55f6b618e55490715f7664da4a304e8b32007b1ccd3038fcce4649e7c3b520bb117394908a784

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.6.0 - October 15, 2015
+
+- Add `once` and `times(n)` modifiers - patch by [@antstorm](https://github.com/antstorm)
+
 ## 0.5.0 - September 16, 2015
 
 - Add `to_run_at` modifier - patch by [@vidmantas](https://github.com/vidmantas)

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rspec-activejob (0.5.0)
+    rspec-activejob (0.6.0)
       activejob (>= 4.2)
       rspec-mocks
 

data/README.md

@@ -58,8 +58,10 @@ This gem defines four matchers:
   takes the job class as its argument, and can be modified with a `.with(*args)` call to expect specific arguments.
   This will use the same argument list matcher as rspec-mocks' `receive(:message).with(*args)` matcher.
   If your job uses `set(wait_until: time)`, you can use `.to_run_at(time)` chain after `enqueue_a` call as well.
+  In order to check for the right number of enqueued jobs use a `.once` or `.times(n)` modifiers.
 
-* `have_been_enqueued`: expects to have enqueued an job in the ActiveJob test adapter. Can be modified with a `.with(*args)` call to expect specific arguments. This will use the same argument list matcher as rspec-mocks' `receive(:message).with(*args)` matcher.
+* `have_been_enqueued`: expects to have enqueued an job in the ActiveJob test adapter. Optionally accepts all the
+  same modifiers as `enqueue_a`.
 
 * `global_id(model_or_class)`: an argument matcher, matching ActiveJob-serialized versions of model classes or
   specific models (or any other class which implements `to_global_id`). If you pass a model class, it will match

data/lib/rspec/active_job/enqueue_a.rb

@@ -32,10 +32,21 @@ module RSpec
           self
         end
 
+        def once
+          @number_of_times = 1
+          self
+        end
+
+        def times(n)
+          @number_of_times = n
+          self
+        end
+
         def failure_message
           enqueued_nothing_message ||
             enqueued_wrong_class_message ||
             enqueued_at_wrong_time_message ||
+            enqueued_wrong_number_of_times_message ||
             wrong_arguments_message
         end
 
@@ -67,13 +78,14 @@ module RSpec
         private
 
         attr_reader :before_count, :after_count, :job_class, :argument_list_matcher,
-                    :run_time
+                    :run_time, :number_of_times
 
         def all_checks_pass?
           enqueued_something? &&
             enqueued_correct_class? &&
             with_correct_args? &&
-            at_correct_time?
+            at_correct_time? &&
+            enqueued_correct_number_of_times?
         end
 
         def enqueued_something?
@@ -113,6 +125,17 @@ module RSpec
           "#{new_jobs_with_correct_class.first[:args]}"
         end
 
+        def enqueued_wrong_number_of_times_message
+          return if enqueued_correct_number_of_times?
+          "expected to enqueue a #{job_class} " \
+          "#{times_count(number_of_times)}, but enqueued " \
+          "#{times_count(new_jobs.count)}"
+        end
+
+        def times_count(n)
+          n == 1 ? 'once' : "#{n} times"
+        end
+
         def new_jobs
           enqueued_jobs - @before_jobs
         end
@@ -139,6 +162,12 @@ module RSpec
         def format_enqueued_times
           new_jobs_with_correct_class.map { |job| Time.at(job[:at]).utc.to_s }.join(', ')
         end
+
+        def enqueued_correct_number_of_times?
+          return true unless number_of_times
+
+          new_jobs.count == number_of_times
+        end
       end
     end
   end

data/lib/rspec/active_job/version.rb

@@ -1,5 +1,5 @@
 module RSpec
   module ActiveJob
-    VERSION = '0.5.0'.freeze
+    VERSION = '0.6.0'.freeze
   end
 end

data/spec/rspec/active_job/enqueue_a_spec.rb

@@ -124,7 +124,16 @@ RSpec.describe RSpec::ActiveJob::Matchers::EnqueueA do
 
       context "when it enqueues two jobs" do
         let(:enqueued_jobs) { [{ job: AJob, args: [] }, { job: BJob, args: [] }] }
-        it { is_expected.to be(true) }
+
+        context "matches first job" do
+          let(:job_class) { AJob }
+          it { is_expected.to be(true) }
+        end
+
+        context "matches second job" do
+          let(:job_class) { BJob }
+          it { is_expected.to be(true) }
+        end
       end
 
       context "with argument expectations" do
@@ -175,4 +184,58 @@ RSpec.describe RSpec::ActiveJob::Matchers::EnqueueA do
       end
     end
   end
+
+  context "with number of times expectations" do
+    let(:instance) { described_class.new }
+
+    context "once" do
+      subject(:matches?) { instance.once.matches?(AJob) }
+
+      context "correct number of times" do
+        let(:enqueued_jobs) { [{ job: AJob, args: [] }] }
+
+        it { is_expected.to be(true) }
+      end
+
+      context "wrong number of times" do
+        let(:enqueued_jobs) do
+          [{ job: AJob, args: [] }, { job: AJob, args: [] }]
+        end
+
+        it { is_expected.to be(false) }
+
+        specify do
+          matches?
+          expect(instance.failure_message).
+            to eq("expected to enqueue a AJob once, but enqueued 2 times")
+        end
+      end
+    end
+
+    context "mutiple times" do
+      subject(:matches?) { instance.times(2).matches?(AJob) }
+
+      context "correct number of times" do
+        let(:enqueued_jobs) do
+          [{ job: AJob, args: [] }, { job: AJob, args: [] }]
+        end
+
+        it { is_expected.to be(true) }
+      end
+
+      context "wrong number of times" do
+        let(:enqueued_jobs) do
+          [{ job: AJob, args: [] }]
+        end
+
+        it { is_expected.to be(false) }
+
+        specify do
+          matches?
+          expect(instance.failure_message).
+            to eq("expected to enqueue a AJob 2 times, but enqueued once")
+        end
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec-activejob
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Isaac Seymour
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-16 00:00:00.000000000 Z
+date: 2015-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob
@@ -141,9 +141,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: RSpec matchers to test ActiveJob
 test_files: []
-has_rdoc: false