rspec-sidekiq 1.1.0 → 2.0.0.beta

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NTM0OGMwZTYyZGY4NTFkOTU0MjlhNGMxZDUzYTJmMzI5N2MwNTE1Zg==
-  data.tar.gz: !binary |-
-    Yzc5YWUwMWYwN2VlNzc4ZDlmNDI2OWQyOWNlMjJhOWRjYWI4Y2Q4Mg==
+SHA1:
+  metadata.gz: e07823fce83d1a7b7a549812ab5f596232cf5a31
+  data.tar.gz: e86beeb6f94c7ae2865bfbb0fbad4bab719b6dd6
 SHA512:
-  metadata.gz: !binary |-
-    ZTZkOWEyNzk2MTNhMzA4MzE5ZmE0MmE2MWU2NTQ5ZDJmMzcwYzZkOTViY2U3
-    MTFkMDEwMWIzYjE3NTRkZTA4MzU2Mjc0ZDAxZGY2Y2ZlNjQ2NGQ4YjI0NGQ2
-    M2FhYTg0MTg5YmU2YjQwYjQyMDI2M2NhZWUzZTM3ZmZiODY3Yzk=
-  data.tar.gz: !binary |-
-    YmZiOTNjOGYxMGFhOTdhZDlmNDZiMjI5NDVkOWQ0ZjMyNGViZDJmNzI5ZGI3
-    ZmM1YmYxYjEwODRlYzIxZjk3MmE2OTkzNDc1ZWJjMGJhYjI4MmMwMDBlNGY3
-    NzA5ODgzY2Y3ZTNhNTM0YmFkMWVjMWQ5ZGMyZDMxMmJlMDhkZDM=
+  metadata.gz: 22bd9129ac7853dda2f35e0950f3f4914b691b79571a3fde7958f26dcf87311e440dcd0333498435049161f8aac6c008b94e7d4e9874a4a5c636445ae4307609
+  data.tar.gz: 0002ff94652d3da4f4c6d567f262cec5a68cead531a245e0950522ab74f8c7001467df386e59acd5b0b7b3fdf2c61c907f649c6616950680ccc1a8f1c07b0060

data/.gitignore

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

data/.rspec

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

data/.simplecov

@@ -2,5 +2,5 @@
 SimpleCov.start do
   add_filter '/spec/'
 
-  coverage_dir 'spec/result/coverage'
+  coverage_dir 'tmp/spec_coverage'
 end

data/CHANGES.md

@@ -1,3 +1,8 @@
+2.0.0.beta
+---
+* Add support for 3.0.0 [yelled3#47]
+* Completely remove have_enqueued_jobs matcher [philostler#56]
+
 1.1.0
 ---
 * Added Support for RSpec 3 [TBAA#44]

data/Gemfile

@@ -1,9 +1,9 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
 platforms :rbx do
-  gem "rubysl", "~> 2.0"
-  gem "psych"
-  gem "rubinius-developer_tools"
+  gem 'rubysl', '~> 2.0'
+  gem 'psych'
+  gem 'rubinius-developer_tools'
 end
 
-gemspec
+gemspec

data/LICENSE

@@ -1,9 +1,9 @@
 The MIT License (MIT)
 
-Copyright (c) 2013 Phil Ostler
+Copyright (c) 2014 Phil Ostler
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
 The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -51,7 +51,6 @@ end
 * [be_retryable](#be_retryable)
 * [be_unique](#be_unique)
 * [have_enqueued_job](#have_enqueued_job)
-* ~~[have_enqueued_jobs](#have_enqueued_jobs)~~
 
 ### be_delayed
 *Describes a method that should be invoked asynchronously (See [Sidekiq Delayed Extensions][sidekiq_wiki_delayed_extensions])*
@@ -113,9 +112,6 @@ Awesomejob.perform_async "Awesome", true
 expect(AwesomeJob).to have_enqueued_job("Awesome", true)
 ```
 
-### ~~have_enqueued_jobs~~
-*Removed. [See the FAQ & Troubleshooting Wiki page][rspec_sidekiq_wiki_faq_&_troubleshooting] for alternative and more information*
-
 ## Example matcher usage
 ```ruby
 require "spec_helper"

data/lib/rspec-sidekiq.rb

@@ -1,8 +1,9 @@
-require "sidekiq"
-require "sidekiq/testing"
+# encoding: utf-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/batch'
+require 'rspec/sidekiq/configuration'
+require 'rspec/sidekiq/helpers'
+require 'rspec/sidekiq/matchers'
+require 'rspec/sidekiq/sidekiq'

data/lib/rspec/sidekiq/batch.rb

@@ -1,4 +1,5 @@
-require "rspec/core"
+# encoding: utf-8
+require 'rspec/core'
 
 if defined? Sidekiq::Batch
   module RSpec
@@ -48,7 +49,8 @@ if defined? Sidekiq::Batch
       if mocked_with_mocha?
         Sidekiq::Batch.stubs(:new) { RSpec::Sidekiq::NullBatch.new }
       else
-        Sidekiq::Batch.stub(:new) { RSpec::Sidekiq::NullBatch.new }
+        allow(Sidekiq::Batch).to receive(:new)  { RSpec::Sidekiq::NullBatch.new }
+        allow(Sidekiq::Batch::Status).to receive(:new)  { RSpec::Sidekiq::NullStatus.new }
       end
     end
   end

data/lib/rspec/sidekiq/configuration.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module RSpec
   module Sidekiq
     class Configuration
@@ -10,4 +11,4 @@ module RSpec
       end
     end
   end
-end
+end

data/lib/rspec/sidekiq/helpers.rb

@@ -1,2 +1,3 @@
-require "rspec/core"
-require "rspec/sidekiq/helpers/within_sidekiq_retries_exhausted_block"
+# encoding: utf-8
+require 'rspec/core'
+require 'rspec/sidekiq/helpers/within_sidekiq_retries_exhausted_block'

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

@@ -1,19 +1,20 @@
+# encoding: utf-8
 module Sidekiq
   module Worker
     module ClassMethods
-      def within_sidekiq_retries_exhausted_block user_msg = {}, &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)
+        sidekiq_retries_exhausted_block.call default_retries_exhausted_args.merge(user_msg)
       end
 
       def default_retries_exhausted_args
         {
           'queue' => get_sidekiq_options[:worker],
-          'class' => self.name,
+          'class' => name,
           'args' => [],
           'error_message' => 'An error occured'
         }
       end
     end
   end
-end
+end

data/lib/rspec/sidekiq/matchers.rb

@@ -1,11 +1,11 @@
-require "rspec/core"
-require "rspec/sidekiq/matchers/be_delayed"
-require "rspec/sidekiq/matchers/be_processed_in"
-require "rspec/sidekiq/matchers/be_retryable"
-require "rspec/sidekiq/matchers/be_unique"
-require "rspec/sidekiq/matchers/have_enqueued_job"
-require "rspec/sidekiq/matchers/have_enqueued_jobs"
+# encoding: utf-8
+require 'rspec/core'
+require 'rspec/sidekiq/matchers/be_delayed'
+require 'rspec/sidekiq/matchers/be_processed_in'
+require 'rspec/sidekiq/matchers/be_retryable'
+require 'rspec/sidekiq/matchers/be_unique'
+require 'rspec/sidekiq/matchers/have_enqueued_job'
 
 RSpec.configure do |config|
   config.include RSpec::Sidekiq::Matchers
-end
+end

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

@@ -43,10 +43,9 @@ module RSpec
           return false
         end
 
-        def negative_failure_message
+        def failure_message_when_negated
           "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

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

@@ -24,10 +24,9 @@ module RSpec
           @actual.to_s == @expected_queue.to_s
         end
 
-        def negative_failure_message
+        def failure_message_when_negated
           "expected #{@klass} to not be processed in the \"#{@expected_queue}\" queue"
         end
-        alias_method :failure_message_when_negated, :negative_failure_message
       end
     end
   end

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

@@ -30,10 +30,9 @@ module RSpec
           @actual == @expected_retry
         end
 
-        def negative_failure_message
+        def failure_message_when_negated
           "expected #{@klass} to not #{description}".gsub "not not ", ""
         end
-        alias_method :failure_message_when_negated, :negative_failure_message
       end
     end
   end

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

@@ -20,10 +20,9 @@ module RSpec
           [true, :all].include?(@actual)
         end
 
-        def negative_failure_message
+        def failure_message_when_negated
           "expected #{@klass} to not be unique in the queue"
         end
-        alias_method :failure_message_when_negated, :negative_failure_message
       end
     end
   end

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

@@ -6,29 +6,39 @@ module RSpec
       end
 
       class HaveEnqueuedJob
-        def initialize expected_arguments
+
+        attr_reader :klass, :expected_arguments, :actual
+
+        def initialize(expected_arguments)
           @expected_arguments = expected_arguments
         end
 
         def description
-          "have an enqueued #{@klass} job with arguments #{@expected_arguments}"
+          "have an enqueued #{klass} job with arguments #{expected_arguments}"
         end
 
         def failure_message
-          "expected to have an enqueued #{@klass} job with arguments #{@expected_arguments}\n\n" +
-          "found: #{@actual}"
+          "expected to have an enqueued #{klass} job with arguments #{expected_arguments}\n\n" +
+          "found: #{actual}"
         end
 
-        def matches? klass
+        def matches?(klass)
           @klass = klass
           @actual = klass.jobs.map { |job| job["args"] }
-          @actual.any? { |arguments| Array(@expected_arguments) == arguments }
+          @actual.any? { |arguments| contain_exactly?(arguments) }
+        end
+
+        def failure_message_when_negated
+          "expected to not have an enqueued #{klass} job with arguments #{expected_arguments}"
         end
 
-        def negative_failure_message
-          "expected to not have an enqueued #{@klass} job with arguments #{@expected_arguments}"
+        private
+
+        def contain_exactly?(arguments)
+          exactly = RSpec::Matchers::BuiltIn::ContainExactly.new(expected_arguments)
+          exactly.matches?(arguments)
         end
-        alias_method :failure_message_when_negated, :negative_failure_message
+
       end
     end
   end

data/lib/rspec/sidekiq/sidekiq.rb

@@ -1,7 +1,8 @@
+# encoding: utf-8
 module RSpec
   module Sidekiq
     class << self
-      def configure &block
+      def configure(&block)
         yield configuration if block
       end
 
@@ -14,7 +15,7 @@ end
 
 RSpec.configure do |config|
   config.before(:suite) do
-    message = "[rspec-sidekiq] WARNING! Sidekiq will *NOT* process jobs in this environment. See https://github.com/philostler/rspec-sidekiq/wiki/FAQ-&-Troubleshooting"
+    message = '[rspec-sidekiq] WARNING! Sidekiq will *NOT* process jobs in this environment. See https://github.com/philostler/rspec-sidekiq/wiki/FAQ-&-Troubleshooting'
     message = "\e[33m#{message}\e[0m" if RSpec::Sidekiq.configuration.enable_terminal_colours
     puts message if RSpec::Sidekiq.configuration.warn_when_jobs_not_processed_by_sidekiq
   end
@@ -22,4 +23,4 @@ RSpec.configure do |config|
   config.before(:each) do
     Sidekiq::Worker.clear_all if RSpec::Sidekiq.configuration.clear_all_enqueued_jobs
   end
-end
+end

data/lib/rspec/sidekiq/version.rb

@@ -1,5 +1,6 @@
+# encoding: utf-8
 module RSpec
   module Sidekiq
-    VERSION = "1.1.0"
+    VERSION = '2.0.0.beta'
   end
 end

data/rspec-sidekiq.gemspec

@@ -1,33 +1,33 @@
-# -*- encoding: utf-8 -*-
-require File.expand_path("../lib/rspec/sidekiq/version", __FILE__)
+# encoding: utf-8
+require File.expand_path('../lib/rspec/sidekiq/version', __FILE__)
 
 Gem::Specification.new do |s|
-  s.name        = "rspec-sidekiq"
+  s.name        = 'rspec-sidekiq'
   s.version     = RSpec::Sidekiq::VERSION
   s.platform    = Gem::Platform::RUBY
-  s.author      = "Phil Ostler"
-  s.email       = "github@philostler.com"
-  s.homepage    = "http://github.com/philostler/rspec-sidekiq"
-  s.summary     = "RSpec for Sidekiq"
-  s.description = "Simple testing of Sidekiq jobs via a collection of matchers and helpers"
-  s.license     = "MIT"
+  s.author      = 'Phil Ostler'
+  s.email       = 'github@philostler.com'
+  s.homepage    = 'http://github.com/philostler/rspec-sidekiq'
+  s.summary     = 'RSpec for Sidekiq'
+  s.description = 'Simple testing of Sidekiq jobs via a collection of matchers and helpers'
+  s.license     = 'MIT'
 
-  s.add_dependency "rspec", "~> 2.0"
-  s.add_dependency "sidekiq", ">= 2.4.0"
+  s.add_dependency 'rspec', '>= 3.0.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 'coveralls', '~> 0.7.1'
+  s.add_development_dependency 'fuubar', '>= 2.0.0'
 
-  s.files = Dir[".gitattributes"] +
-            Dir[".gitignore"] +
-            Dir[".rspec"] +
-            Dir[".simplecov"] +
-            Dir[".travis"] +
-            Dir["CHANGES.md"] +
-            Dir["Gemfile"] +
-            Dir["LICENSE"] +
-            Dir["README.md"] +
-            Dir["rspec-sidekiq.gemspec"] +
-            Dir["**/*.rb"]
-  s.require_paths = ["lib"]
+  s.files = Dir['.gitattributes'] +
+            Dir['.gitignore'] +
+            Dir['.rspec'] +
+            Dir['.simplecov'] +
+            Dir['.travis'] +
+            Dir['CHANGES.md'] +
+            Dir['Gemfile'] +
+            Dir['LICENSE'] +
+            Dir['README.md'] +
+            Dir['rspec-sidekiq.gemspec'] +
+            Dir['**/*.rb']
+  s.require_paths = ['lib']
 end

data/spec/rspec/sidekiq/batch_spec.rb

@@ -1,6 +1,7 @@
-require "spec_helper"
+# encoding: utf-8
+require 'spec_helper'
 
-describe "Batch" do
+describe 'Batch' do
   module Sidekiq
     module Batch
       class Status
@@ -8,16 +9,16 @@ describe "Batch" do
     end
   end
 
-  load File.expand_path(File.join(File.dirname(__FILE__), "../../../lib/rspec/sidekiq/batch.rb"))
+  load File.expand_path(File.join(File.dirname(__FILE__), '../../../lib/rspec/sidekiq/batch.rb'))
 
-  describe "NullStatus" do
-    describe "#total" do
-      it "returns 0 when no jobs" do
+  describe 'NullStatus' do
+    describe '#total' do
+      it 'returns 0 when no jobs' do
         null_status = Sidekiq::Batch.new.status
         expect(null_status.total).to eq(0)
       end
 
-      it "returns 1 when 1 job" do
+      it 'returns 1 when 1 job' do
         batch = Sidekiq::Batch.new
 
         batch.jobs do
@@ -30,8 +31,8 @@ describe "Batch" do
       end
     end
 
-    describe "#bid" do
-      it "returns a bid" do
+    describe '#bid' do
+      it 'returns a bid' do
         null_status = Sidekiq::Batch.new
         expect(null_status.bid).to_not be_nil
       end

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

@@ -1,7 +1,7 @@
+# encoding: utf-8
 require 'spec_helper'
 
 describe 'Retries Exhausted block' do
-
   class FooClass < TestWorkerAlternative
     sidekiq_retries_exhausted do |msg|
       bar('hello')
@@ -20,7 +20,7 @@ describe 'Retries Exhausted block' do
   end
 
   it 'passes arguments to the block' do
-    args = {'args' => ['a', 'b']}
+    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