Merge pull request #89 from mrnugget/support_sidekiq_3

Scott Carleton · Scott Carleton · commit 2cbc1dd7e527 · 2014-05-16T12:01:48.000-04:00
Add support for Sidekiq 3.x
diff --git a/delayed_paperclip.gemspec b/delayed_paperclip.gemspec
@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'delayed_job'
   s.add_development_dependency 'delayed_job_active_record'
   s.add_development_dependency 'resque'
-  s.add_development_dependency 'sidekiq', '< 3.0'
+  s.add_development_dependency 'sidekiq'
   s.add_development_dependency 'appraisal'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'bundler'
diff --git a/gemfiles/rails3_1.gemfile.lock b/gemfiles/rails3_1.gemfile.lock
@@ -159,5 +159,5 @@ DEPENDENCIES
   rake
   resque
   rspec
-  sidekiq (< 3.0)
+  sidekiq
   sqlite3
diff --git a/gemfiles/rails3_2.gemfile.lock b/gemfiles/rails3_2.gemfile.lock
@@ -157,5 +157,5 @@ DEPENDENCIES
   rake
   resque
   rspec
-  sidekiq (< 3.0)
+  sidekiq
   sqlite3
diff --git a/gemfiles/rails4.gemfile.lock b/gemfiles/rails4.gemfile.lock
@@ -153,5 +153,5 @@ DEPENDENCIES
   rake
   resque
   rspec
-  sidekiq (< 3.0)
+  sidekiq
   sqlite3
diff --git a/spec/integration/sidekiq_spec.rb b/spec/integration/sidekiq_spec.rb
@@ -1,5 +1,5 @@
 require 'spec_helper'
-require 'sidekiq'
+require 'sidekiq/api'
 
 describe "Sidekiq" do
 
@@ -45,4 +45,4 @@ def jobs_count
     Sidekiq::Queue.new(:paperclip).size
   end
 
-end
+end

-Original file line number
+Diff line change
   rake
   resque
   rspec
 -  sidekiq (< 3.0)
 +  sidekiq
   sqlite3