conform test to the rest of the suite

Author: hone

test/redis_queue_test.rb

@@ -1,82 +1,86 @@
 require 'test_helper'
 require 'resque/queue'
 
-module Resque
-  class TestQueue < MiniTest::Unit::TestCase
-    include Test::Unit::Assertions
+describe "Resque::Queue" do
+  include Test::Unit::Assertions
 
-    class Thing
-      attr_reader :inside
+  class Thing
+    attr_reader :inside
 
-      def initialize
-        @inside = "x"
-      end
-
-      def == other
-        super || @inside == other.inside
-      end
+    def initialize
+      @inside = "x"
     end
 
-    def test_sanity
-      queue = q
-      x = Thing.new
-      queue.push x
-      assert_equal x, queue.pop
+    def == other
+      super || @inside == other.inside
     end
+  end
 
-    def test_pop_blocks
-      queue1 = q
-      queue2 = q
+  it "acts sanely" do
+    queue = q
+    x = Thing.new
+    queue.push x
+    assert_equal x, queue.pop
+  end
 
-      t = Thread.new { queue1.pop }
-      x = Thing.new
+  it "blocks on pop" do
+    queue1 = q
+    queue2 = q
 
-      queue2.push x
-      assert_equal x, t.join.value
-    end
+    t = Thread.new { queue1.pop }
+    x = Thing.new
 
-    def test_nonblock_pop
-      queue1 = q
+    queue2.push x
+    assert_equal x, t.join.value
+  end
+
+  it "nonblocking pop works" do
+    queue1 = q
 
-      assert_raises ThreadError do
-        queue1.pop(true)
-      end
+    assert_raises ThreadError do
+      queue1.pop(true)
     end
+  end
 
-    def test_pop_blocks_forever
-      queue1 = q
-      assert_raises Timeout::Error do
-        Timeout.timeout(2) { queue1.pop }
-      end
+  it "blocks forever on pop" do
+    queue1 = q
+    assert_raises Timeout::Error do
+      Timeout.timeout(2) { queue1.pop }
     end
+  end
 
-    def test_size
-      queue = q
+  it "#size" do
+    queue = q
+
+    begin
       assert_equal 0, queue.size
 
       queue << Thing.new
       assert_equal 1, queue.size
     ensure
       queue.pop
     end
+  end
 
-    def test_empty?
-      queue = q
+  it "#empty?" do
+    queue = q
+
+    begin
       assert queue.empty?
 
       queue << Thing.new
       refute queue.empty?
     ensure
       queue.pop
     end
+  end
 
-    def q
-      Queue.new 'foo', backend
-    end
+  def q
+    Resque::Queue.new 'foo', backend
+  end
 
-    def backend
-      redis = Redis.new(:host => "127.0.0.1", :port => 9736)
-      Redis::Namespace.new :resque, :redis => redis
-    end
+  def backend
+    redis = Redis.new(:host => "127.0.0.1", :port => 9736)
+    Redis::Namespace.new :resque, :redis => redis
   end
 end