spec/spec_helper.rb in gush-0.4.1 vs spec/spec_helper.rb in gush-1.0.0

@@ -1,21 +1,22 @@
 require 'gush'
 require 'fakeredis'
-require 'sidekiq/testing'
+require 'json'
+require 'pry'
 
-Sidekiq::Testing.fake!
-Sidekiq::Logging.logger = nil
+ActiveJob::Base.queue_adapter = :test
+ActiveJob::Base.logger = nil
 
 class Prepare < Gush::Job; end
 class FetchFirstJob < Gush::Job; end
 class FetchSecondJob < Gush::Job; end
 class PersistFirstJob < Gush::Job; end
 class PersistSecondJob < Gush::Job; end
 class NormalizeJob < Gush::Job; end
 class BobJob < Gush::Job; end
 
-GUSHFILE  = Pathname.new(__FILE__).parent.join("Gushfile.rb")
+GUSHFILE  = Pathname.new(__FILE__).parent.join("Gushfile")
 
 class TestWorkflow < Gush::Workflow
   def configure
     run Prepare
 
@@ -45,10 +46,19 @@
 module GushHelpers
   def redis
     @redis ||= Redis.new(url: REDIS_URL)
   end
 
+  def perform_one
+    job = ActiveJob::Base.queue_adapter.enqueued_jobs.first
+    if job
+      Gush::Worker.new.perform(*job[:args])
+      ActiveJob::Base.queue_adapter.performed_jobs << job
+      ActiveJob::Base.queue_adapter.enqueued_jobs.shift
+    end
+  end
+
   def jobs_with_id(jobs_array)
     jobs_array.map {|job_name| job_with_id(job_name) }
   end
 
   def job_with_id(job_name)
@@ -57,36 +67,40 @@
 end
 
 RSpec::Matchers.define :have_jobs do |flow, jobs|
   match do |actual|
     expected = jobs.map do |job|
-      hash_including("args" => include(flow, job))
+      hash_including(args: include(flow, job))
     end
-    expect(Gush::Worker.jobs).to match_array(expected)
+    expect(ActiveJob::Base.queue_adapter.enqueued_jobs).to match_array(expected)
   end
 
   failure_message do |actual|
-    "expected queue to have #{jobs}, but instead has: #{actual.jobs.map{ |j| j["args"][1]}}"
+    "expected queue to have #{jobs}, but instead has: #{ActiveJob::Base.queue_adapter.enqueued_jobs.map{ |j| j[:args][1]}}"
   end
 end
 
 RSpec.configure do |config|
+  config.include ActiveJob::TestHelper
   config.include GushHelpers
 
   config.mock_with :rspec do |mocks|
     mocks.verify_partial_doubles = true
   end
 
   config.before(:each) do
+    clear_enqueued_jobs
+    clear_performed_jobs
+
     Gush.configure do |config|
       config.redis_url = REDIS_URL
-      config.environment = 'test'
       config.gushfile = GUSHFILE
     end
   end
 
 
   config.after(:each) do
-    Sidekiq::Worker.clear_all
+    clear_enqueued_jobs
+    clear_performed_jobs
     redis.flushdb
   end
 end