resque_unit 0.2.2 → 0.2.3

data/lib/resque_unit/assertions.rb

@@ -9,7 +9,7 @@ module ResqueUnit::Assertions
   # want to assert that klass has been queued without arguments.
   def assert_queued(klass, args = nil, message = nil)
     queue = Resque.queue_for(klass)
-    assert_block (message || "#{klass} should have been queued in #{queue}: #{Resque.queue(queue).inspect}.") do 
+    assert_block (message || "#{klass}#{args ? " with #{args.inspect}" : ""} should have been queued in #{queue}: #{Resque.queue(queue).inspect}.") do 
       in_queue?(queue, klass, args)
     end
   end
@@ -17,7 +17,7 @@ module ResqueUnit::Assertions
   # The opposite of +assert_queued+.
   def assert_not_queued(klass, args = nil, message = nil)
     queue = Resque.queue_for(klass)
-    assert_block (message || "#{klass} should not have been queued in #{queue}.") do 
+    assert_block (message || "#{klass}#{args ? " with #{args.inspect}" : ""} should not have been queued in #{queue}.") do 
       !in_queue?(queue, klass, args)
     end
   end

data/lib/resque_unit/resque.rb

@@ -20,7 +20,10 @@ module Resque
 
   # Executes all jobs in all queues in an undefined order.
   def self.run!
-    @queue.each do |k, v|
+    old_queue = @queue.dup
+    reset!
+
+    old_queue.each do |k, v|
       while job = v.shift
         job[:klass].perform(*job[:args])
       end

data/test/resque_unit_test.rb

@@ -101,7 +101,81 @@ class ResqueUnitTest < Test::Unit::TestCase
         assert_not_queued(JobWithArguments, [1, "test"])
       end
     end
+  end
+
+  context "A job that schedules a new resque job" do
+    setup do 
+      Resque.enqueue(JobThatCreatesANewJob)
+    end
+
+    should "pass the assert_queued(job) assertion" do 
+      assert_queued(JobThatCreatesANewJob)
+    end
 
+    should "fail the assert_not_queued(job) assertion" do 
+      assert_raise Test::Unit::AssertionFailedError do 
+        assert_not_queued(JobThatCreatesANewJob)
+      end
+    end
+
+    should "pass the assert_not_queued(LowPriorityJob) assertion" do
+      assert_not_queued(LowPriorityJob)
+    end
+
+    context ", when Resque.run! is called," do 
+      setup do 
+        Resque.run!
+      end
+
+      should "clear the job from the queue" do
+        assert_not_queued(JobThatCreatesANewJob)
+      end
+
+      should "add a LowPriorityJob" do
+        assert_queued(LowPriorityJob)
+      end
+    end
+  end
+
+  context "An assertion message" do
+    context "of assert_queued" do
+      should "include job class and queue content" do
+        begin
+          assert_not_queued(LowPriorityJob)
+        rescue Test::Unit::AssertionFailedError => error
+          assert_equal "LowPriorityJob should have been queued in low: [].", error.message
+        end
+      end
+      
+      should "include job arguments if provided" do
+        begin
+          assert_not_queued(JobWithArguments, [1, "test"])
+        rescue Test::Unit::AssertionFailedError => error
+          assert_equal "JobWithArguments with [1, \"test\"] should have been queued in medium: [].", error.message
+        end
+      end
+    end
   end
 
+  context "An assertion message" do
+    context "of assert_not_queued" do
+      should "include job class and queue content" do
+        begin
+          Resque.enqueue(LowPriorityJob)
+          assert_not_queued(LowPriorityJob)
+        rescue Test::Unit::AssertionFailedError => error
+            assert_equal "LowPriorityJob should not have been queued in low.", error.message
+        end
+      end
+      
+      should "include job arguments if provided" do
+        begin
+          Resque.enqueue(JobWithArguments, 1, "test")
+          assert_not_queued(JobWithArguments, [1, "test"])
+        rescue Test::Unit::AssertionFailedError => error
+          assert_equal "JobWithArguments with [1, \"test\"] should not have been queued in medium.", error.message
+        end
+      end
+    end
+  end
 end

data/test/sample_jobs.rb

@@ -12,7 +12,6 @@ class LowPriorityJob
   def self.run=(value)
     @run = value
   end
-
 end
 
 class MediumPriorityJob
@@ -28,3 +27,11 @@ class JobWithArguments
 
   end
 end
+
+class JobThatCreatesANewJob
+  @queue = :spawn
+
+  def self.perform
+    Resque.enqueue(LowPriorityJob)
+  end
+end

data/test/test_helper.rb

@@ -2,3 +2,4 @@ require 'rubygems'
 require 'shoulda'
 require 'resque_unit'
 require 'sample_jobs'
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: resque_unit
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 2
-  - 2
-  version: 0.2.2
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - Justin Weiss
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-22 00:00:00 -07:00
+date: 2010-07-26 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency