Merge pull request #164 from morgoth/rm-redis-dependency-from-tests

Use fakeredis for tests to not require Redis server running

.travis.yml

@@ -14,9 +14,6 @@ gemfile:
 
 sudo: false
 
-services:
-  - redis
-
 script: "bundle exec rake clean spec"
 
 notifications:

CONTRIBUTING

@@ -8,9 +8,6 @@ Testing
 
 Please don't commit code without tests. You can bootstrap the development environment by running `bundle install`. After that, running `rake` should just work. If it doesn't then file a bug.
 
-Dependencies for Testing:
-  - Redis. You need redis. For linux users, you can install the redis-server package and roll, Mac users will need to install it with homebrew, and I'm not entirely sure how to make it work with Windows users.
-
 Versioning
 =========
 

README.md

@@ -286,8 +286,7 @@ Yes.
 Contributing
 ------------
 
-Checkout out CONTRIBUTING. In short, you’ll need a redis server running
-for testing. Run all tests with
+Checkout out CONTRIBUTING. Run all tests with
 
 ````
 # Rspec on all versions

delayed_paperclip.gemspec

@@ -19,13 +19,13 @@ 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', '>= 4.0'
   s.add_development_dependency 'appraisal'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'bundler'
   s.add_development_dependency 'railties'
+  s.add_development_dependency 'fakeredis'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
 end
-

spec/integration/sidekiq_spec.rb

@@ -1,12 +1,14 @@
 require 'spec_helper'
-require 'sidekiq/api'
+require 'sidekiq/testing'
 
 describe "Sidekiq" do
-
   before :all do
     Sidekiq.logger.level = Logger::ERROR
     DelayedPaperclip.options[:background_job_class] = DelayedPaperclip::Jobs::Sidekiq
-    Sidekiq::Queue.new(:paperclip).clear
+  end
+
+  before :each do
+    Sidekiq::Queues["paperclip"].clear
   end
 
   let(:dummy) { Dummy.new(:image => File.open("#{ROOT}/spec/fixtures/12k.png")) }
@@ -30,19 +32,18 @@
   end
 
   def process_jobs
-    Sidekiq::Queue.new(:paperclip).each do |job|
-      worker = job.klass.constantize.new
-      args   = job.args
+    Sidekiq::Queues["paperclip"].each do |job|
+      worker = job["class"].constantize.new
+      args   = job["args"]
       begin
         worker.perform(*args)
       rescue # Assume sidekiq handle exception properly
       end
-      job.delete
     end
   end
 
   def jobs_count
-    Sidekiq::Queue.new(:paperclip).size
+    Sidekiq::Queues["paperclip"].size
   end
 
 end

spec/spec_helper.rb

@@ -6,6 +6,7 @@
 require 'active_support'
 require 'active_support/core_ext'
 require 'rspec'
+require 'fakeredis/rspec'
 require 'mocha/api'
 begin
   require 'active_job'