resque_unit 0.2.8 → 0.3.0

data/lib/resque_unit/assertions.rb

@@ -6,22 +6,50 @@ module ResqueUnit::Assertions
   # least once. If +args+ is nil, it only asserts that the klass has
   # been queued. Otherwise, it asserts that the klass has been queued
   # with the correct arguments. Pass an empty array for +args+ if you
-  # 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}#{args ? " with #{args.inspect}" : ""} should have been queued in #{queue}: #{Resque.queue(queue).inspect}.") do 
+  # want to assert that klass has been queued without arguments. Pass a block
+  # if you want to assert something was queued within its execution.
+  def assert_queued(klass, args = nil, message = nil, &block)
+    queue_name = Resque.queue_for(klass)
+
+    queue = if block_given?
+      snapshot = Resque.size(queue_name)
+      yield
+      Resque.queue(queue_name)[snapshot..-1]
+    else
+      Resque.queue(queue_name)
+    end
+
+    assert_block (message || "#{klass}#{args ? " with #{args.inspect}" : ""} should have been queued in #{queue_name}: #{queue.inspect}.") do
       in_queue?(queue, klass, args)
     end
   end
+  alias assert_queues assert_queued
 
   # The opposite of +assert_queued+.
-  def assert_not_queued(klass, args = nil, message = nil)
-    queue = Resque.queue_for(klass)
-    assert_block (message || "#{klass}#{args ? " with #{args.inspect}" : ""} should not have been queued in #{queue}.") do 
+  def assert_not_queued(klass = nil, args = nil, message = nil, &block)
+    queue_name = Resque.queue_for(klass)
+
+    queue = if block_given?
+      snapshot = Resque.size(queue_name)
+      yield
+      Resque.queue(queue_name)[snapshot..-1]
+    else
+      Resque.queue(queue_name)
+    end
+
+    assert_block (message || "#{klass}#{args ? " with #{args.inspect}" : ""} should not have been queued in #{queue_name}.") do
       !in_queue?(queue, klass, args)
     end
   end
 
+  # Asserts no jobs were queued within the block passed.
+  def assert_nothing_queued(message = nil, &block)
+    snapshot = Resque.size
+    yield
+    present = Resque.size
+    assert_equal snapshot, present, message || "No jobs should have been queued"
+  end
+
   private
 
   def in_queue?(queue, klass, args = nil)
@@ -29,10 +57,11 @@ module ResqueUnit::Assertions
   end
 
   def matching_jobs(queue, klass, args = nil)
+    queue = Resque.queue(queue) if queue.is_a? Symbol
     if args # retrieve the elements that match klass and args in the queue
-      Resque.queue(queue).select {|e| e[:klass] == klass && e[:args] == args}
+      queue.select {|e| e[:klass] == klass && e[:args] == args}
     else # if no args were passed, retrieve all queued jobs that match klass
-      Resque.queue(queue).select {|e| e[:klass] == klass}
+      queue.select {|e| e[:klass] == klass}
     end
   end
 

data/lib/resque_unit/resque.rb

@@ -17,13 +17,18 @@ module Resque
     end
   end
 
+  # Returns a hash of all the queue names and jobs that have been queued. The
+  # format is <tt>{queue_name => [job, ..]}</tt>.
+  def self.queues
+    @queue || reset!
+  end
+
   # Returns an array of all the jobs that have been queued. Each
   # element is of the form +{:klass => klass, :args => args}+ where
   # +klass+ is the job's class and +args+ is an array of the arguments
   # passed to the job.
   def queue(queue_name)
-    self.reset! unless @queue
-    @queue[queue_name]
+    queues[queue_name]
   end
 
   # Executes all jobs in all queues in an undefined order.
@@ -53,7 +58,7 @@ module Resque
   # 3. Repeat 3
   def full_run!
     until empty_queues?
-      @queue.each do |k, v|
+      queues.each do |k, v|
         while job = v.shift
           job[:klass].perform(*job[:args])
         end
@@ -62,9 +67,12 @@ module Resque
   end
 
   # Returns the size of the given queue
-  def size(queue_name)
-    self.reset! unless @queue
-    @queue[queue_name].length
+  def size(queue_name = nil)
+    if queue_name
+      queues[queue_name].length
+    else
+      queues.values.flatten.length
+    end
   end
 
   # :nodoc: 
@@ -82,7 +90,7 @@ module Resque
 
   # :nodoc:
   def empty_queues?
-    @queue.all? do |k, v|
+    queues.all? do |k, v|
       v.empty?
     end
   end

data/test/resque_unit_test.rb

@@ -57,6 +57,69 @@ class ResqueUnitTest < Test::Unit::TestCase
     # assert number of jobs?
   end
 
+  context "Block assertions" do
+    should "pass the assert_queued(job) assertion when queued in block" do
+      assert_queues(HighPriorityJob) do
+        Resque.enqueue(HighPriorityJob)
+      end
+    end
+
+    should "pass the assert_queued(job) assertion when queued and not in block" do
+      Resque.enqueue(HighPriorityJob)
+      assert_queues(HighPriorityJob) do
+        Resque.enqueue(HighPriorityJob)
+      end
+    end
+
+    should "fail the assert_queued(job) assertion when not queued in block" do
+      Resque.enqueue(LowPriorityJob)
+      assert_raise Test::Unit::AssertionFailedError do
+        assert_queues(LowPriorityJob) do
+          # Nothing.
+        end
+      end
+    end
+
+    should "pass the assert_not_queued(job) assertion when not queued in block" do
+      Resque.enqueue(LowPriorityJob)
+      assert_not_queued(LowPriorityJob) do
+        # Nothing.
+      end
+    end
+
+    should "fail the assert_not_queued(job) assertion when not queued in block" do
+      assert_raise Test::Unit::AssertionFailedError do
+        assert_not_queued(LowPriorityJob) do
+          Resque.enqueue(LowPriorityJob)
+        end
+      end
+    end
+
+    should "fail the assert_not_queued(job) assertion when queued and not in block" do
+      assert_raise Test::Unit::AssertionFailedError do
+        Resque.enqueue(LowPriorityJob)
+        assert_not_queued(LowPriorityJob) do
+          Resque.enqueue(LowPriorityJob)
+        end
+      end
+    end
+
+    should "pass the assert_nothing_queued assertion when nothing queued in block" do
+      Resque.enqueue(LowPriorityJob)
+      assert_nothing_queued do
+        # Nothing.
+      end
+    end
+
+    should "fail the assert_nothing_queued assertion when queued in block" do
+      assert_raise Test::Unit::AssertionFailedError do
+        assert_nothing_queued do
+          Resque.enqueue(LowPriorityJob)
+        end
+      end
+    end
+  end
+
   context "An empty queue" do
     should "pass the assert_not_queued(job) assertion" do 
       assert_not_queued(LowPriorityJob)
@@ -199,9 +262,7 @@ class ResqueUnitTest < Test::Unit::TestCase
         end
       end
     end
-  end
 
-  context "An assertion message" do
     context "of assert_not_queued" do
       should "include job class and queue content" do
         begin
@@ -221,6 +282,19 @@ class ResqueUnitTest < Test::Unit::TestCase
         end
       end
     end
+
+    context "of assert_nothing_queued" do
+      should "include diff" do
+        begin
+          Resque.reset!
+          assert_nothing_queued do
+            Resque.enqueue(LowPriorityJob)
+          end
+        rescue Test::Unit::AssertionFailedError => error
+          assert_equal "No jobs should have been queued.\n<0> expected but was\n<1>.", error.message
+        end
+      end
+    end
   end
 
   context "A job that does not specify a queue" do

metadata

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