rspec-sidekiq 1.0.0 → 1.1.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MjNiZmI2MTNlM2Q2ZDBjOTlmYTU4NTliYzlkZDUyODY0Y2RiNmE0Mw==
+    NTM0OGMwZTYyZGY4NTFkOTU0MjlhNGMxZDUzYTJmMzI5N2MwNTE1Zg==
   data.tar.gz: !binary |-
-    YzlmNjA3MjViZDdhNDhkMWM2Y2FiZjBiZjNlNmE3YzI3Yjk0MTk2OA==
+    Yzc5YWUwMWYwN2VlNzc4ZDlmNDI2OWQyOWNlMjJhOWRjYWI4Y2Q4Mg==
 SHA512:
   metadata.gz: !binary |-
-    NWE0YjVkYmE5YjZkZGZlNmIyN2JkNDdlNjNlZDE0MWI5NDY1ZGUxZTZmYzE3
-    YTMyZWM1MGY0YTkwNWI1YTBkN2E3MmQwNmU5ZjRlMGY4YTgyYjUxOGI2Nzkx
-    MDJhNjgyMGZkYmRkMDViODE0M2Y1Yzg1MTFkMzZkYjRhYTFjOWY=
+    ZTZkOWEyNzk2MTNhMzA4MzE5ZmE0MmE2MWU2NTQ5ZDJmMzcwYzZkOTViY2U3
+    MTFkMDEwMWIzYjE3NTRkZTA4MzU2Mjc0ZDAxZGY2Y2ZlNjQ2NGQ4YjI0NGQ2
+    M2FhYTg0MTg5YmU2YjQwYjQyMDI2M2NhZWUzZTM3ZmZiODY3Yzk=
   data.tar.gz: !binary |-
-    N2I3M2Y1ODZmYjY4YTA0MGVhYWM5ODhlNTU3YjBjYTQ5ZDcxYzdlNjM4NmM4
-    ODg3OTVjNzZmOTFiYzc4NTNjZWZhMThjZjZkOGIwMTk5MDM5YzVlY2JiZjE3
-    ZGU0ODYwMjBiODc0YmE0MDFhZTllYjZiNWNkNzYxZjhhNDMzMDc=
+    YmZiOTNjOGYxMGFhOTdhZDlmNDZiMjI5NDVkOWQ0ZjMyNGViZDJmNzI5ZGI3
+    ZmM1YmYxYjEwODRlYzIxZjk3MmE2OTkzNDc1ZWJjMGJhYjI4MmMwMDBlNGY3
+    NzA5ODgzY2Y3ZTNhNTM0YmFkMWVjMWQ5ZGMyZDMxMmJlMDhkZDM=

data/.gitignore

@@ -1,2 +1,2 @@
 Gemfile.lock
-spec_result
+spec/result

data/.rspec

@@ -1,3 +1,4 @@
 --colour
+--tty
 --format Fuubar
---format html --out spec_result/rspec.html
+--format html --out spec/result/index.html

data/.simplecov

@@ -1,5 +1,6 @@
+# encoding: utf-8
 SimpleCov.start do
-  add_filter "/spec/"
+  add_filter '/spec/'
 
-  coverage_dir "spec_result"
-end
+  coverage_dir 'spec/result/coverage'
+end

data/CHANGES.md

@@ -1,3 +1,13 @@
+1.1.0
+---
+* Added Support for RSpec 3 [TBAA#44]
+* Fix gem build error ERROR: (Gem::InvalidSpecificationException) [mourad-ifeelgoods#42]
+* Make sure sidekiq is required [mourad-ifeelgoods#43]
+* attempt at fixing 'undefined method `configure' for RSpec:Module' [homanchou#51]
+* Supports accessing the batch id [fabiokr#54]
+* Pass message hash to retries_exhausted block [layervault#52]
+* added support for unique scheduled worker matching [jkogara#55]
+
 1.0.0
 ---
 * Improve coverage and readability of README [philostler#26]

data/README.md

@@ -5,9 +5,8 @@
 [![Travis CI][travis_ci_badge]][travis_ci]
 [![Coveralls][coveralls_badge]][coveralls]
 [![Gemnasium][gemnasium_badge]][gemnasium]
-[![coderwall][coderwall_badge]][coderwall]
 
-*Simple testing of Sidekiq jobs via a collection of matchers and helpers*
+***Simple testing of Sidekiq jobs via a collection of matchers and helpers***
 
 [RubyGems][ruby_gems] |
 [Code Climate][code_climate] |
@@ -162,19 +161,17 @@ Issues/Pull Requests/Comments all welcome...
 
 [code_climate]: https://codeclimate.com/github/philostler/rspec-sidekiq
 [code_climate_badge]: https://codeclimate.com/github/philostler/rspec-sidekiq.png
-[coderwall]: https://coderwall.com/philostler
-[coderwall_badge]: https://api.coderwall.com/philostler/endorsecount.png
 [coveralls]: https://coveralls.io/r/philostler/rspec-sidekiq
 [coveralls_badge]: https://coveralls.io/repos/philostler/rspec-sidekiq/badge.png?branch=master
 [gem_version_badge]: https://badge.fury.io/rb/rspec-sidekiq.png
 [gemnasium]: https://gemnasium.com/philostler/rspec-sidekiq
 [gemnasium_badge]: https://gemnasium.com/philostler/rspec-sidekiq.png
 [github]: http://github.com/philostler/rspec-sidekiq
-[ruby_doc]: http://rubydoc.info/github/philostler/rspec-sidekiq/master/frames
+[ruby_doc]: http://rubydoc.info/gems/rspec-sidekiq/frames
 [ruby_gems]: http://rubygems.org/gems/rspec-sidekiq
 [ruby_toolbox]: http://www.ruby-toolbox.com/projects/rspec-sidekiq
 [travis_ci]: http://travis-ci.org/philostler/rspec-sidekiq
-[travis_ci_badge]: https://secure.travis-ci.org/philostler/rspec-sidekiq.png
+[travis_ci_badge]: https://travis-ci.org/philostler/rspec-sidekiq.svg?branch=master
 
 [rspec_sidekiq_wiki_faq_&_troubleshooting]: https://github.com/philostler/rspec-sidekiq/wiki/FAQ-&-Troubleshooting
 [sidekiq_wiki_batches]: https://github.com/mperham/sidekiq/wiki/Batches

data/lib/rspec-sidekiq.rb

@@ -1,7 +1,8 @@
+require "sidekiq"
 require "sidekiq/testing"
 
 require "rspec/sidekiq/batch"
 require "rspec/sidekiq/configuration"
 require "rspec/sidekiq/helpers"
 require "rspec/sidekiq/matchers"
-require "rspec/sidekiq/sidekiq"
+require "rspec/sidekiq/sidekiq"

data/lib/rspec/sidekiq/batch.rb

@@ -1,22 +1,37 @@
+require "rspec/core"
+
 if defined? Sidekiq::Batch
   module RSpec
     module Sidekiq
       class NullObject
-        def initialize(*)
-        end
-
         def method_missing(*args, &block)
           self
         end
       end
 
       class NullBatch < NullObject
+        attr_reader :bid
+
+        def initialize(bid = nil)
+          @bid = bid || SecureRandom.hex(8)
+        end
+
+        def status
+          NullStatus.new(@bid)
+        end
+
         def jobs(*)
           yield
         end
       end
 
       class NullStatus < NullObject
+        attr_reader :bid
+
+        def initialize(bid)
+          @bid = bid
+        end
+
         def join
           ::Sidekiq::Worker.drain_all
         end
@@ -32,10 +47,8 @@ if defined? Sidekiq::Batch
     config.before(:each) do
       if mocked_with_mocha?
         Sidekiq::Batch.stubs(:new) { RSpec::Sidekiq::NullBatch.new }
-        Sidekiq::Batch::Status.stubs(:new) { RSpec::Sidekiq::NullStatus.new }
       else
         Sidekiq::Batch.stub(:new) { RSpec::Sidekiq::NullBatch.new }
-        Sidekiq::Batch::Status.stub(:new) { RSpec::Sidekiq::NullStatus.new }
       end
     end
   end
@@ -44,4 +57,4 @@ if defined? Sidekiq::Batch
   def mocked_with_mocha?
     Sidekiq::Batch.respond_to? :stubs
   end
-end
+end

data/lib/rspec/sidekiq/helpers/within_sidekiq_retries_exhausted_block.rb

@@ -1,10 +1,18 @@
 module Sidekiq
   module Worker
     module ClassMethods
-      def within_sidekiq_retries_exhausted_block &block
+      def within_sidekiq_retries_exhausted_block user_msg = {}, &block
         block.call
+        self.sidekiq_retries_exhausted_block.call default_retries_exhausted_args.merge(user_msg)
+      end
 
-        self.sidekiq_retries_exhausted_block.call
+      def default_retries_exhausted_args
+        {
+          'queue' => get_sidekiq_options[:worker],
+          'class' => self.name,
+          'args' => [],
+          'error_message' => 'An error occured'
+        }
       end
     end
   end

data/lib/rspec/sidekiq/matchers/be_delayed.rb

@@ -46,6 +46,7 @@ module RSpec
         def negative_failure_message
           "expected #{@expected_method.receiver}.#{@expected_method.name} to not " + description
         end
+        alias_method :failure_message_when_negated, :negative_failure_message
 
         def until time
           @expected_time = time
@@ -64,4 +65,4 @@ module RSpec
       end
     end
   end
-end
+end

data/lib/rspec/sidekiq/matchers/be_processed_in.rb

@@ -27,7 +27,8 @@ module RSpec
         def negative_failure_message
           "expected #{@klass} to not be processed in the \"#{@expected_queue}\" queue"
         end
+        alias_method :failure_message_when_negated, :negative_failure_message
       end
     end
   end
-end
+end

data/lib/rspec/sidekiq/matchers/be_retryable.rb

@@ -33,7 +33,8 @@ module RSpec
         def negative_failure_message
           "expected #{@klass} to not #{description}".gsub "not not ", ""
         end
+        alias_method :failure_message_when_negated, :negative_failure_message
       end
     end
   end
-end
+end

data/lib/rspec/sidekiq/matchers/be_unique.rb

@@ -17,13 +17,14 @@ module RSpec
         def matches? job
           @klass = job.kind_of?(Class) ? job : job.class
           @actual = @klass.get_sidekiq_options["unique"]
-          @actual == true
+          [true, :all].include?(@actual)
         end
 
         def negative_failure_message
           "expected #{@klass} to not be unique in the queue"
         end
+        alias_method :failure_message_when_negated, :negative_failure_message
       end
     end
   end
-end
+end

data/lib/rspec/sidekiq/matchers/have_enqueued_job.rb

@@ -28,7 +28,8 @@ module RSpec
         def negative_failure_message
           "expected to not have an enqueued #{@klass} job with arguments #{@expected_arguments}"
         end
+        alias_method :failure_message_when_negated, :negative_failure_message
       end
     end
   end
-end
+end

data/lib/rspec/sidekiq/version.rb

@@ -1,5 +1,5 @@
 module RSpec
   module Sidekiq
-    VERSION = "1.0.0"
+    VERSION = "1.1.0"
   end
-end
+end

data/rspec-sidekiq.gemspec

@@ -12,13 +12,11 @@ Gem::Specification.new do |s|
   s.description = "Simple testing of Sidekiq jobs via a collection of matchers and helpers"
   s.license     = "MIT"
 
-  s.add_dependency "rspec", ">= 2.0.0"
+  s.add_dependency "rspec", "~> 2.0"
   s.add_dependency "sidekiq", ">= 2.4.0"
 
   s.add_development_dependency "coveralls", "~> 0.7.0"
   s.add_development_dependency "fuubar", ">= 1.1.0"
-  s.add_development_dependency "rspec", ">= 2.0.0"
-  s.add_development_dependency "sidekiq", ">= 2.4.0"
 
   s.files = Dir[".gitattributes"] +
             Dir[".gitignore"] +

data/spec/rspec/sidekiq/batch_spec.rb

@@ -13,15 +13,28 @@ describe "Batch" do
   describe "NullStatus" do
     describe "#total" do
       it "returns 0 when no jobs" do
-        null_status = RSpec::Sidekiq::NullStatus.new
+        null_status = Sidekiq::Batch.new.status
         expect(null_status.total).to eq(0)
       end
 
       it "returns 1 when 1 job" do
-        null_status = RSpec::Sidekiq::NullStatus.new
-        TestWorker.perform_async('5')
+        batch = Sidekiq::Batch.new
+
+        batch.jobs do
+          TestWorker.perform_async('5')
+        end
+
+        null_status = batch.status
+
         expect(null_status.total).to eq(1)
       end
     end
+
+    describe "#bid" do
+      it "returns a bid" do
+        null_status = Sidekiq::Batch.new
+        expect(null_status.bid).to_not be_nil
+      end
+    end
   end
-end
+end

data/spec/rspec/sidekiq/helpers/retries_exhausted_spec.rb

@@ -5,14 +5,25 @@ describe 'Retries Exhausted block' do
   class FooClass < TestWorkerAlternative
     sidekiq_retries_exhausted do |msg|
       bar('hello')
+      foo(msg)
     end
 
     def self.bar(input)
     end
+
+    def self.foo(msg)
+    end
   end
 
   it 'executes whatever is within the block' do
     FooClass.within_sidekiq_retries_exhausted_block { expect(FooClass).to receive(:bar).with('hello') }
   end
 
+  it 'passes arguments to the block' do
+    args = {'args' => ['a', 'b']}
+    FooClass.within_sidekiq_retries_exhausted_block(args) do
+      expect(FooClass).to receive(:foo).with(FooClass.default_retries_exhausted_args.merge(args))
+    end
+  end
+
 end

data/spec/rspec/sidekiq/matchers/be_unique_spec.rb

@@ -1,50 +1,62 @@
 require "spec_helper"
 
 describe RSpec::Sidekiq::Matchers::BeUnique do
-  let(:worker) { create_worker unique: true }
-  before(:each) { subject.matches? worker }
+  shared_context "a unique worker" do
+    before(:each) { subject.matches? @worker }
 
-  describe "expected usage" do
-    it "matches" do
-      expect(worker).to be_unique
-    end
-  end
+    describe "expected usage" do
+      it "matches" do
+        expect(@worker).to be_unique
+      end
+
+      describe "#failure_message" do
+        it "returns message" do
+          expect(subject.failure_message).to eq "expected #{@worker} to be unique in the queue"
+        end
+      end
 
-  describe "#be_unique" do
-    it "returns instance" do
-      expect(be_unique).to be_a RSpec::Sidekiq::Matchers::BeUnique
     end
-  end
 
-  describe "#description" do
-    it "returns description" do
-      expect(subject.description).to eq "be unique in the queue"
+    describe "#matches?" do
+      context "when condition matches" do
+        it "returns true" do
+          expect(subject.matches? @worker).to be true
+        end
+      end
+
+      context "when condition does not match" do
+        it "returns false" do
+          expect(subject.matches? create_worker unique: false).to be false
+        end
+      end
+
+      describe "#negative_failure_message" do
+        it "returns message" do
+          expect(subject.negative_failure_message).to eq "expected #{@worker} to not be unique in the queue"
+        end
+      end
     end
   end
 
-  describe "#failure_message" do
-    it "returns message" do
-      expect(subject.failure_message).to eq "expected #{worker} to be unique in the queue"
-    end
+  context "a scheduled worker" do
+    before { @worker =  create_worker unique: :all }
+    include_context "a unique worker"
   end
 
-  describe "#matches?" do
-    context "when condition matches" do
-      it "returns true" do
-        expect(subject.matches? worker).to be true
-      end
-    end
+  context "a regular worker" do
+    before { @worker =  create_worker unique: true}
+    include_context "a unique worker"
+  end
 
-    context "when condition does not match" do
-      it "returns false" do
-        expect(subject.matches? create_worker unique: false).to be false
-      end
+  describe "#be_unique" do
+    it "returns instance" do
+      expect(be_unique).to be_a RSpec::Sidekiq::Matchers::BeUnique
     end
   end
 
-  describe "#negative_failure_message" do
-    it "returns message" do
-      expect(subject.negative_failure_message).to eq "expected #{worker} to not be unique in the queue"
+  describe "#description" do
+    it "returns description" do
+      expect(subject.description).to eq "be unique in the queue"
     end
   end
-end
+end

data/spec/rspec/sidekiq/version_spec.rb

@@ -1,5 +1,5 @@
 require "spec_helper"
 
 describe RSpec::Sidekiq::VERSION do
-  expect_it { to eq("1.0.0") }
-end
+  expect_it { to eq("1.1.0") }
+end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: rspec-sidekiq
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Phil Ostler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-21 00:00:00.000000000 Z
+date: 2014-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: sidekiq
   requirement: !ruby/object:Gem::Requirement
@@ -66,34 +66,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.1.0
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.0.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.0.0
-- !ruby/object:Gem::Dependency
-  name: sidekiq
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.4.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.4.0
 description: Simple testing of Sidekiq jobs via a collection of matchers and helpers
 email: github@philostler.com
 executables: []
@@ -108,21 +80,21 @@ files:
 - Gemfile
 - LICENSE
 - README.md
-- rspec-sidekiq.gemspec
+- lib/rspec-sidekiq.rb
 - lib/rspec/sidekiq/batch.rb
 - lib/rspec/sidekiq/configuration.rb
-- lib/rspec/sidekiq/helpers/within_sidekiq_retries_exhausted_block.rb
 - lib/rspec/sidekiq/helpers.rb
+- lib/rspec/sidekiq/helpers/within_sidekiq_retries_exhausted_block.rb
+- lib/rspec/sidekiq/matchers.rb
 - lib/rspec/sidekiq/matchers/be_delayed.rb
 - lib/rspec/sidekiq/matchers/be_processed_in.rb
 - lib/rspec/sidekiq/matchers/be_retryable.rb
 - lib/rspec/sidekiq/matchers/be_unique.rb
 - lib/rspec/sidekiq/matchers/have_enqueued_job.rb
 - lib/rspec/sidekiq/matchers/have_enqueued_jobs.rb
-- lib/rspec/sidekiq/matchers.rb
 - lib/rspec/sidekiq/sidekiq.rb
 - lib/rspec/sidekiq/version.rb
-- lib/rspec-sidekiq.rb
+- rspec-sidekiq.gemspec
 - spec/rspec/sidekiq/batch_spec.rb
 - spec/rspec/sidekiq/helpers/retries_exhausted_spec.rb
 - spec/rspec/sidekiq/matchers/be_delayed_spec.rb
@@ -158,7 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: RSpec for Sidekiq