spec/spec_helper.rb in resque-bus-0.3.7 vs spec/spec_helper.rb in resque-bus-0.5.7

@@ -1,70 +1,70 @@
 require 'timecop'
-require 'resque-bus'
-require 'resque/scheduler'
+require 'queue-bus'
+require 'adapter/support'
 
-module ResqueBus
+reset_test_adapter
+
+module QueueBus
   class Runner
     def self.value
       @value ||= 0
     end
-    
+
     def self.attributes
       @attributes
     end
-    
+
     def self.run(attrs)
       @value ||= 0
       @value += 1
       @attributes = attrs
     end
-    
+
     def self.reset
       @value = nil
       @attributes = nil
     end
   end
-  
+
   class Runner1 < Runner
   end
-  
+
   class Runner2 < Runner
   end
 end
 
-def perform_next_job(worker, &block)
-  return unless job = worker.reserve
-  worker.perform(job, &block)
-  worker.done_working
-end
-
 def test_sub(event_name, queue="default")
   matcher = {"bus_event_type" => event_name}
-  ResqueBus::Subscription.new(queue, event_name, "::ResqueBus::Rider", matcher, nil)
+  QueueBus::Subscription.new(queue, event_name, "::QueueBus::Rider", matcher, nil)
 end
 
 def test_list(*args)
-  out = ResqueBus::SubscriptionList.new
+  out = QueueBus::SubscriptionList.new
   args.each do |sub|
     out.add(sub)
   end
   out
 end
 
 RSpec.configure do |config|
-  config.mock_framework = :rspec
-  
+  config.mock_with :rspec do |c|
+    c.syntax = :should
+  end
+  config.expect_with :rspec do |c|
+    c.syntax = :should
+  end
+
   config.before(:each) do
-    ResqueBus.send(:reset)
+    reset_test_adapter
+    ResqueBus.show_deprecations = true
   end
   config.after(:each) do
     begin
-      ResqueBus.redis.flushall
+      QueueBus.redis { |redis| redis.flushall }
     rescue
     end
-    ResqueBus.send(:reset)
-    ResqueBus::Runner1.reset
-    ResqueBus::Runner2.reset
+    QueueBus.send(:reset)
+    QueueBus::Runner1.reset
+    QueueBus::Runner2.reset
   end
 end
-
-ResqueBus.redis.namespace = "resquebus_test"