Fix tests. Tests with latest sidekiq versions and ruby versions

.gitignore

@@ -8,3 +8,4 @@ Gemfile.lock
 .ruby-version
 .idea/
 gemfiles/*.lock
+*.sw?

.travis.yml

@@ -2,16 +2,16 @@ language: ruby
 services:
   - redis-server
 rvm:
-  - 1.9.3
   - jruby-19mode
-  - rbx-19mode
+  - rbx2
   - 2.0.0
   - 2.1.0
+  - 2.2.1
 gemfile:
-  - gemfiles/sidekiq_2.15.gemfile
-  - gemfiles/sidekiq_2.16.gemfile
-  - gemfiles/sidekiq_2.17.gemfile
   - gemfiles/sidekiq_3.0.gemfile
+  - gemfiles/sidekiq_3.1.gemfile
+  - gemfiles/sidekiq_3.2.gemfile
+  - gemfiles/sidekiq_3.3.gemfile
   - gemfiles/sidekiq_develop.gemfile
 branches:
   only:
@@ -22,4 +22,4 @@ notifications:
       - [email protected]
 matrix:
   allow_failures:
-    - rvm: rbx-19mode
+    - rvm: rbx2

Appraisals

@@ -1,20 +1,23 @@
 appraise "sidekiq-develop" do
   gem 'sidekiq', github: 'mperham/sidekiq'
-  gem 'sidekiq', '3.0', :platform => :mri_19
 end
 
 appraise "sidekiq-2.17" do
-  gem 'sidekiq', '2.17'
+  gem 'sidekiq', '~> 2.17.0'
 end
 
-appraise "sidekiq-2.16" do
-  gem "sidekiq", '2.16'
+appraise "sidekiq-3.0" do
+  gem "sidekiq", '~> 3.0.0'
 end
 
-appraise "sidekiq-2.15" do
-  gem "sidekiq", '2.15'
+appraise "sidekiq-3.1" do
+  gem "sidekiq", '~> 3.1.0'
 end
 
-appraise "sidekiq-3.0" do
-  gem "sidekiq", '3.0'
+appraise "sidekiq-3.2" do
+  gem "sidekiq", '~> 3.2.0'
+end
+
+appraise "sidekiq-3.3" do
+  gem "sidekiq", '~> 3.3.0'
 end

gemfiles/sidekiq_2.17.gemfile

@@ -4,6 +4,6 @@ source "http://rubygems.org"
 
 gem "appraisal", "~> 1.0.0"
 gem "pry", :platform => :mri
-gem "sidekiq", "2.17"
+gem "sidekiq", "~> 2.17.0"
 
 gemspec :path => "../"

gemfiles/sidekiq_3.0.gemfile

@@ -4,6 +4,6 @@ source "http://rubygems.org"
 
 gem "appraisal", "~> 1.0.0"
 gem "pry", :platform => :mri
-gem "sidekiq", "3.0"
+gem "sidekiq", "~> 3.0.0"
 
 gemspec :path => "../"

gemfiles/sidekiq_3.1.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "appraisal", "~> 1.0.0"
+gem "pry", :platform => :mri
+gem "sidekiq", "~> 3.1.0"
+
+gemspec :path => "../"

gemfiles/sidekiq_3.2.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "appraisal", "~> 1.0.0"
+gem "pry", :platform => :mri
+gem "sidekiq", "~> 3.2.0"
+
+gemspec :path => "../"

gemfiles/sidekiq_3.3.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "appraisal", "~> 1.0.0"
+gem "pry", :platform => :mri
+gem "sidekiq", "~> 3.3.0"
+
+gemspec :path => "../"

gemfiles/sidekiq_develop.gemfile

@@ -4,6 +4,6 @@ source "http://rubygems.org"
 
 gem "appraisal", "~> 1.0.0"
 gem "pry", :platform => :mri
-gem "sidekiq", "3.0", :platform => :mri_19
+gem "sidekiq", :github => "mperham/sidekiq"
 
 gemspec :path => "../"

spec/lib/sidekiq_testing_enabled_spec.rb

@@ -9,21 +9,26 @@
 
 describe 'When Sidekiq::Testing is enabled' do
   describe 'when set to :fake!', sidekiq: :fake do
+
+    # Flush db before each test
+    before :each do
+      Sidekiq.redis(&:flushdb)
+    end
     context 'with unique worker' do
       it 'does not push duplicate messages' do
         param = 'work'
         expect(UniqueWorker.jobs.size).to eq(0)
-        UniqueWorker.perform_async(param)
+        expect(UniqueWorker.perform_async(param)).to_not be_nil
         expect(UniqueWorker.jobs.size).to eq(1)
         expect(UniqueWorker).to have_enqueued_job(param)
-        UniqueWorker.perform_async(param)
+        expect(UniqueWorker.perform_async(param)).to be_nil
         expect(UniqueWorker.jobs.size).to eq(1)
       end
 
       it 'adds the unique_hash to the message' do
         param = 'hash'
         hash = SidekiqUniqueJobs::PayloadHelper.get_payload(UniqueWorker, :working, [param])
-        UniqueWorker.perform_async(param)
+        expect(UniqueWorker.perform_async(param)).to_not be_nil
         expect(UniqueWorker.jobs.size).to eq(1)
         expect(UniqueWorker.jobs.first['unique_hash']).to eq(hash)
       end

spec/spec_helper.rb

@@ -18,7 +18,7 @@
 
 require 'sidekiq/redis_connection'
 redis_url = ENV['REDIS_URL'] || 'redis://localhost/15'
-REDIS = Sidekiq::RedisConnection.create(url: redis_url, namespace: 'testy')
+REDIS = Sidekiq::RedisConnection.create(url: redis_url, namespace: 'sidekiq-unique-jobs-testing')
 
 Dir[File.join(File.dirname(__FILE__), 'support', '**', '*.rb')].each { |f| require f }
 RSpec.configure do |_config|