rspec-activejob 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ed4f20a431ed47d9bac346276c28f5c66143cf5
-  data.tar.gz: 2ac30436e51224415b3a083acbfb008eeaf7a1c8
+  metadata.gz: 431377e4319168b42fb4104e7dc0c28a998f5133
+  data.tar.gz: 8034829d7058af0d12e4880bf524e86f973a3dcb
 SHA512:
-  metadata.gz: 41552e56407232b5f260b1b8459725916a86b3b5411938bf87a23074f84f62bf58c011195952fac04dad56519bbe3970c06d98bd7c01c7ad9a8ad92135b870f5
-  data.tar.gz: f057e07d01d62994ec8d586f56af964075bafe140c95c3843a29913eb79d46b01f37f2cfd90b984641f133a106042625cc02ba09e806ff42c0a894062bdb7cd9
+  metadata.gz: f8adb28bccf0d2cb6931743e167a7e97ad3122a19ec108b056fb87bb5254375e8553cc8cc9c6ef96f8839f6dacd774ab00abf8ffda381c4a8777239656702199
+  data.tar.gz: a725449f9766d47161b8831a8c8153da92c9ef58b8055b3b9f70f24c371154ec63960070e58d706b7db9620b7b3c1d36476cefc45293e5f2411df51aaab560a4

data/CHANGELOG.md

@@ -1,4 +1,8 @@
-## 0.3.0 - Unreleased
+## 0.4.0 - April 20, 2015
+
+- Added the `have_been_enqueued` matcher
+
+## 0.3.0 - March 21, 2015
 
 - Added the `deserialize_as` matcher
 

data/Gemfile.lock

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

data/lib/rspec/active_job.rb

@@ -8,6 +8,10 @@ module RSpec
       Matchers::EnqueueA.new(job_class)
     end
 
+    def have_been_enqueued
+      Matchers::EnqueueA.new
+    end
+
     def global_id(expected)
       Matchers::GlobalID.new(expected)
     end

data/lib/rspec/active_job/enqueue_a.rb

@@ -8,15 +8,21 @@ module RSpec
           @job_class = job_class
         end
 
-        def matches?(block)
-          @before_jobs = enqueued_jobs.dup
-          block.call
-          enqueued_something? && enqueued_correct_class? && with_correct_args?
+        def matches?(actual)
+          raise "must use a block with enqueue_a" if !actual.is_a?(Proc) && @job_class
+
+          if actual.is_a?(Proc)
+            @before_jobs = enqueued_jobs.dup
+            actual.call
+            enqueued_something? && enqueued_correct_class? && with_correct_args?
+          else
+            @job_class = actual
+            @before_jobs = []
+            enqueued_something? && enqueued_correct_class? && with_correct_args?
+          end
         end
 
         def with(*args)
-          raise "Must specify the job class when specifying arguments" unless job_class
-
           @argument_list_matcher = RSpec::Mocks::ArgumentListMatcher.new(*args)
           self
         end

data/lib/rspec/active_job/version.rb

@@ -1,5 +1,5 @@
 module RSpec
   module ActiveJob
-    VERSION = '0.3.0'.freeze
+    VERSION = '0.4.0'.freeze
   end
 end

data/spec/rspec/active_job/enqueue_a_spec.rb

@@ -11,62 +11,119 @@ RSpec.describe RSpec::ActiveJob::Matchers::EnqueueA do
 
   let(:job_class) { nil }
   let(:instance) { described_class.new(job_class) }
-  subject(:matches?) { instance.matches?(proc) }
-
-  context "when nothing gets enqueued" do
-    let(:proc) { -> {} }
-    it { is_expected.to be(false) }
-    specify do
-      matches?
-      expect(instance.failure_message).
-        to eq("expected to enqueue a job, enqueued nothing")
-    end
-  end
-
-  context "when something gets enqueued" do
-    let(:proc) { -> { enqueued_jobs << { job: AJob, args: [] } } }
 
-    it { is_expected.to be(true) }
-
-    context "when it enqueues the wrong job" do
-      let(:job_class) { BJob }
+  context "with a block" do
+    subject(:matches?) { instance.matches?(proc) }
 
+    context "when nothing gets enqueued" do
+      let(:proc) { -> {} }
       it { is_expected.to be(false) }
       specify do
         matches?
         expect(instance.failure_message).
-          to eq("expected to enqueue a BJob, enqueued a AJob")
+          to eq("expected to enqueue a job, enqueued nothing")
       end
     end
 
-    context "when it enqueues two jobs" do
+    context "when something gets enqueued" do
+      let(:proc) { -> { enqueued_jobs << { job: AJob, args: [] } } }
+
+      it { is_expected.to be(true) }
+
+      context "when it enqueues the wrong job" do
+        let(:job_class) { BJob }
+
+        it { is_expected.to be(false) }
+        specify do
+          matches?
+          expect(instance.failure_message).
+            to eq("expected to enqueue a BJob, enqueued a AJob")
+        end
+      end
+
+      context "when it enqueues two jobs" do
+        let(:proc) do
+          -> { enqueued_jobs << { job: AJob, args: [] } << { job: BJob, args: [] } }
+        end
+
+        it { is_expected.to be(true) }
+      end
+    end
+
+    context "with argument expectations" do
+      let(:job_class) { AJob }
+      let(:instance) { described_class.new(job_class).with(*arguments) }
+      let(:arguments) { [instance_of(BJob), hash_including(thing: 1)] }
+
       let(:proc) do
-        -> { enqueued_jobs << { job: AJob, args: [] } << { job: BJob, args: [] } }
+        -> { enqueued_jobs << { job: AJob, args: [BJob.new, { thing: 1, 'thing' => 2 }] } }
       end
 
       it { is_expected.to be(true) }
-    end
-  end
 
-  context "with argument expectations" do
-    let(:job_class) { AJob }
-    let(:instance) { described_class.new(job_class).with(*arguments) }
-    let(:arguments) { [instance_of(BJob), hash_including(thing: 1)] }
+      context "with mismatching arguments" do
+        let(:proc) { -> { enqueued_jobs << { job: AJob, args: [] } } }
 
-    let(:proc) do
-      -> { enqueued_jobs << { job: AJob, args: [BJob.new, { thing: 1, 'thing' => 2 }] } }
+        it { is_expected.to be(false) }
+        specify do
+          matches?
+          expect(instance.failure_message).
+            to eq("expected to enqueue a AJob with #{arguments}, but enqueued with []")
+        end
+      end
     end
+  end
 
-    it { is_expected.to be(true) }
-
-    context "with mismatching arguments" do
-      let(:proc) { -> { enqueued_jobs << { job: AJob, args: [] } } }
+  context "with job class" do
+    let(:instance) { described_class.new }
+    subject(:matches?) { instance.matches?(job_class) }
 
+    context "when nothing has been enqueued" do
       it { is_expected.to be(false) }
       specify do
         matches?
         expect(instance.failure_message).
-          to eq("expected to enqueue a AJob with #{arguments}, but enqueued with []")
+          to eq("expected to enqueue a job, enqueued nothing")
+      end
+    end
+
+    context "when something gets enqueued" do
+      let(:enqueued_jobs) { [{ job: AJob, args: [] }] }
+
+      it { is_expected.to be(true) }
+
+      context "when it enqueues the wrong job" do
+        let(:job_class) { BJob }
+
+        it { is_expected.to be(false) }
+        specify do
+          matches?
+          expect(instance.failure_message).
+            to eq("expected to enqueue a BJob, enqueued a AJob")
+        end
+      end
+
+      context "when it enqueues two jobs" do
+        let(:enqueued_jobs) { [{ job: AJob, args: [] }, { job: BJob, args: [] }] }
+        it { is_expected.to be(true) }
+      end
+
+      context "with argument expectations" do
+        let(:job_class) { AJob }
+        let(:instance) { described_class.new.with(*arguments) }
+        let(:arguments) { [instance_of(BJob), hash_including(thing: 1)] }
+        let(:enqueued_jobs) { [{ job: AJob, args: [BJob.new, { thing: 1, 'thing' => 2}] }] }
+        it { is_expected.to be(true) }
+
+        context "with mismatching arguments"do
+          let(:enqueued_jobs) { [{ job: AJob, args: [] }] }
+          it { is_expected.to be(false) }
+          specify do
+            matches?
+            expect(instance.failure_message).
+              to eq("expected to enqueue a AJob with #{arguments}, but enqueued with []")
+          end
+        end
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec-activejob
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Isaac Seymour
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-31 00:00:00.000000000 Z
+date: 2015-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob