resque_unit 0.3.0 → 0.3.1

data/lib/resque_unit/assertions.rb

@@ -19,9 +19,8 @@ module ResqueUnit::Assertions
       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
+    assert_with_custom_message(in_queue?(queue, klass, args),
+      message || "#{klass}#{args ? " with #{args.inspect}" : ""} should have been queued in #{queue_name}: #{queue.inspect}.")
   end
   alias assert_queues assert_queued
 
@@ -37,9 +36,8 @@ module ResqueUnit::Assertions
       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
+    assert_with_custom_message(!in_queue?(queue, klass, args),
+      message || "#{klass}#{args ? " with #{args.inspect}" : ""} should not have been queued in #{queue_name}.")
   end
 
   # Asserts no jobs were queued within the block passed.
@@ -52,6 +50,21 @@ module ResqueUnit::Assertions
 
   private
 
+  # In Test::Unit, +assert_block+ displays only the message on a test
+  # failure and +assert+ always appends a message to the end of the
+  # passed-in assertion message. In MiniTest, it's the other way
+  # around. This abstracts those differences and never appends a
+  # message to the one the user passed in.
+  def assert_with_custom_message(value, message = nil)
+    if defined?(MiniTest::Assertions)
+      assert value, message
+    else
+      assert_block message do
+        value
+      end
+    end
+  end
+  
   def in_queue?(queue, klass, args = nil)
     !matching_jobs(queue, klass, args).empty?
   end

data/lib/resque_unit/resque.rb

@@ -57,13 +57,7 @@ module Resque
   # 2. Check if new jobs were announced, and execute them.
   # 3. Repeat 3
   def full_run!
-    until empty_queues?
-      queues.each do |k, v|
-        while job = v.shift
-          job[:klass].perform(*job[:args])
-        end
-      end
-    end
+    run! until empty_queues?
   end
 
   # Returns the size of the given queue

data/test/test_helper.rb

@@ -3,3 +3,7 @@ require 'shoulda'
 require 'resque_unit'
 require 'sample_jobs'
 
+# Fix shoulda under 1.9.2. See https://github.com/thoughtbot/shoulda/issues/issue/117
+unless defined?(Test::Unit::AssertionFailedError)
+  Test::Unit::AssertionFailedError = MiniTest::Assertion
+end

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
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Justin Weiss