3 files changed, 97 insertions, 13 deletions
diff --git a/spec/ruby/shared/sizedqueue/enque.rb b/spec/ruby/shared/sizedqueue/enque.rb
index 6ef12349f8..014056acda 100644
--- a/spec/ruby/shared/sizedqueue/enque.rb
+++ b/spec/ruby/shared/sizedqueue/enque.rb
@@ -29,7 +29,7 @@ describe :sizedqueue_enq, shared: true do
     q.size.should == 1
     add_to_queue.call
     q.size.should == 2
-    add_to_queue.should raise_error(ThreadError)
+    add_to_queue.should.raise(ThreadError)
   end
 
   it "interrupts enqueuing threads with ClosedQueueError when the queue is closed" do
@@ -37,7 +37,7 @@ describe :sizedqueue_enq, shared: true do
     q << 1
 
     t = Thread.new {
-      -> { q.send(@method, 2) }.should raise_error(ClosedQueueError)
+      -> { q.send(@method, 2) }.should.raise(ClosedQueueError, "queue closed")
     }
 
     Thread.pass until q.num_waiting == 1
@@ -47,4 +47,83 @@ describe :sizedqueue_enq, shared: true do
     t.join
     q.pop.should == 1
   end
+
+  describe "with a timeout" do
+    it "returns self if the item was pushed in time" do
+      q = @object.call(1)
+      q << 1
+
+      t = Thread.new {
+        q.send(@method, 2, timeout: TIME_TOLERANCE).should == q
+      }
+      Thread.pass until t.status == "sleep" && q.num_waiting == 1
+      q.pop
+      t.join
+    end
+
+    it "does nothing if the timeout is nil" do
+      q = @object.call(1)
+      q << 1
+      t = Thread.new {
+        q.send(@method, 2, timeout: nil).should == q
+      }
+      t.join(0.2).should == nil
+      q.pop
+      t.join
+    end
+
+    it "returns nil if no space is available and timeout is 0" do
+      q = @object.call(1)
+      q.send(@method, 1, timeout: 0).should == q
+      q.send(@method, 2, timeout: 0).should == nil
+    end
+
+    it "returns nil if no space is available in time" do
+      q = @object.call(1)
+      q << 1
+      Thread.new {
+        q.send(@method, 2, timeout: 0.001).should == nil
+      }.join
+    end
+
+    it "raise TypeError if timeout is not a valid numeric" do
+      q = @object.call(1)
+      -> {
+        q.send(@method, 2, timeout: "1")
+      }.should raise_consistent_error(TypeError, "no implicit conversion of String into Float")
+
+      -> {
+        q.send(@method, 2, timeout: false)
+      }.should raise_consistent_error(TypeError, "no implicit conversion of false into Float")
+    end
+
+    it "raise ArgumentError if non_block = true is passed too" do
+      q = @object.call(1)
+      -> {
+        q.send(@method, 2, true, timeout: 1)
+      }.should.raise(ArgumentError, "can't set a timeout if non_block is enabled")
+    end
+
+    it "raise ClosedQueueError when closed before enqueued" do
+      q = @object.call(1)
+      q.close
+      -> { q.send(@method, 2, timeout: 1) }.should.raise(ClosedQueueError, "queue closed")
+    end
+
+    it "interrupts enqueuing threads with ClosedQueueError when the queue is closed" do
+      q = @object.call(1)
+      q << 1
+
+      t = Thread.new {
+        -> { q.send(@method, 1, timeout: TIME_TOLERANCE) }.should.raise(ClosedQueueError, "queue closed")
+      }
+
+      Thread.pass until q.num_waiting == 1
+
+      q.close
+
+      t.join
+      q.pop.should == 1
+    end
+  end
 end
diff --git a/spec/ruby/shared/sizedqueue/max.rb b/spec/ruby/shared/sizedqueue/max.rb
index ea10d24be0..167f669275 100644
--- a/spec/ruby/shared/sizedqueue/max.rb
+++ b/spec/ruby/shared/sizedqueue/max.rb
@@ -19,7 +19,7 @@ describe :sizedqueue_max=, shared: true do
     q.enq 2
     q.enq 3
     q.max = 2
-    (q.size > q.max).should be_true
+    (q.size > q.max).should == true
     q.deq.should == 1
     q.deq.should == 2
     q.deq.should == 3
@@ -27,21 +27,21 @@ describe :sizedqueue_max=, shared: true do
 
   it "raises a TypeError when given a non-numeric value" do
     q = @object.call(5)
-    -> { q.max = "foo" }.should raise_error(TypeError)
-    -> { q.max = Object.new }.should raise_error(TypeError)
+    -> { q.max = "foo" }.should.raise(TypeError)
+    -> { q.max = Object.new }.should.raise(TypeError)
   end
 
   it "raises an argument error when set to zero" do
     q = @object.call(5)
     q.max.should == 5
-    -> { q.max = 0 }.should raise_error(ArgumentError)
+    -> { q.max = 0 }.should.raise(ArgumentError)
     q.max.should == 5
   end
 
   it "raises an argument error when set to a negative number" do
     q = @object.call(5)
     q.max.should == 5
-    -> { q.max = -1 }.should raise_error(ArgumentError)
+    -> { q.max = -1 }.should.raise(ArgumentError)
     q.max.should == 5
   end
 end
diff --git a/spec/ruby/shared/sizedqueue/new.rb b/spec/ruby/shared/sizedqueue/new.rb
index 713785fb50..2904422a45 100644
--- a/spec/ruby/shared/sizedqueue/new.rb
+++ b/spec/ruby/shared/sizedqueue/new.rb
@@ -1,18 +1,23 @@
 describe :sizedqueue_new, shared: true do
-  it "raises a TypeError when the given argument is not Numeric" do
-    -> { @object.call("foo") }.should raise_error(TypeError)
-    -> { @object.call(Object.new) }.should raise_error(TypeError)
+  it "raises a TypeError when the given argument doesn't respond to #to_int" do
+    -> { @object.call("12") }.should.raise(TypeError)
+    -> { @object.call(Object.new) }.should.raise(TypeError)
+
+    @object.call(12.9).max.should == 12
+    object = Object.new
+    object.define_singleton_method(:to_int) { 42 }
+    @object.call(object).max.should == 42
   end
 
   it "raises an argument error when no argument is given" do
-    -> { @object.call }.should raise_error(ArgumentError)
+    -> { @object.call }.should.raise(ArgumentError)
   end
 
   it "raises an argument error when the given argument is zero" do
-    -> { @object.call(0) }.should raise_error(ArgumentError)
+    -> { @object.call(0) }.should.raise(ArgumentError)
   end
 
   it "raises an argument error when the given argument is negative" do
-    -> { @object.call(-1) }.should raise_error(ArgumentError)
+    -> { @object.call(-1) }.should.raise(ArgumentError)
   end
 end