5 files changed, 55 insertions, 12 deletions
diff --git a/spec/ruby/core/queue/deq_spec.rb b/spec/ruby/core/queue/deq_spec.rb
index 9510978eac..a2784e6a63 100644
--- a/spec/ruby/core/queue/deq_spec.rb
+++ b/spec/ruby/core/queue/deq_spec.rb
@@ -1,6 +1,11 @@
 require_relative '../../spec_helper'
 require_relative '../../shared/queue/deque'
+require_relative '../../shared/types/rb_num2dbl_fails'
 
 describe "Queue#deq" do
   it_behaves_like :queue_deq, :deq, -> { Queue.new }
 end
+
+describe "Queue operations with timeout" do
+  it_behaves_like :rb_num2dbl_fails, nil, -> v { q = Queue.new; q.push(1); q.deq(timeout: v) }
+end
diff --git a/spec/ruby/core/queue/freeze_spec.rb b/spec/ruby/core/queue/freeze_spec.rb
new file mode 100644
index 0000000000..ced2cc52dd
--- /dev/null
+++ b/spec/ruby/core/queue/freeze_spec.rb
@@ -0,0 +1,6 @@
+require_relative '../../spec_helper'
+require_relative '../../shared/queue/freeze'
+
+describe "Queue#freeze" do
+  it_behaves_like :queue_freeze, :freeze, -> { Queue.new }
+end
diff --git a/spec/ruby/core/queue/initialize_spec.rb b/spec/ruby/core/queue/initialize_spec.rb
index 83c7e595fe..592fbe2487 100644
--- a/spec/ruby/core/queue/initialize_spec.rb
+++ b/spec/ruby/core/queue/initialize_spec.rb
@@ -7,17 +7,21 @@ describe "Queue#initialize" do
     q.should.empty?
   end
 
-  ruby_version_is '3.1' do
-    it "adds all elements of the passed Enumerable to self" do
-      q = Queue.new([1, 2, 3])
-      q.size.should == 3
-      q.should_not.empty?
-      q.pop.should == 1
-      q.pop.should == 2
-      q.pop.should == 3
-      q.should.empty?
-    end
+  it "is a private method" do
+    Queue.private_instance_methods.include?(:initialize).should == true
+  end
+
+  it "adds all elements of the passed Enumerable to self" do
+    q = Queue.new([1, 2, 3])
+    q.size.should == 3
+    q.should_not.empty?
+    q.pop.should == 1
+    q.pop.should == 2
+    q.pop.should == 3
+    q.should.empty?
+  end
 
+  describe "converts the given argument to an Array using #to_a" do
     it "uses #to_a on the provided Enumerable" do
       enumerable = MockObject.new('mock-enumerable')
       enumerable.should_receive(:to_a).and_return([1, 2, 3])
@@ -30,9 +34,27 @@ describe "Queue#initialize" do
       q.should.empty?
     end
 
-    it "raises if the provided Enumerable does not respond to #to_a" do
+    it "raises a TypeError if the given argument can't be converted to an Array" do
+      -> { Queue.new(42) }.should raise_error(TypeError)
+      -> { Queue.new(:abc) }.should raise_error(TypeError)
+    end
+
+    it "raises a NoMethodError if the given argument raises a NoMethodError during type coercion to an Array" do
       enumerable = MockObject.new('mock-enumerable')
-      -> { Queue.new(enumerable) }.should raise_error(TypeError, "can't convert MockObject into Array")
+      enumerable.should_receive(:to_a).and_raise(NoMethodError)
+      -> { Queue.new(enumerable) }.should raise_error(NoMethodError)
     end
   end
+
+  it "raises TypeError if the provided Enumerable does not respond to #to_a" do
+    enumerable = MockObject.new('mock-enumerable')
+    -> { Queue.new(enumerable) }.should raise_error(TypeError, "can't convert MockObject into Array")
+  end
+
+  it "raises TypeError if #to_a does not return Array" do
+    enumerable = MockObject.new('mock-enumerable')
+    enumerable.should_receive(:to_a).and_return("string")
+
+    -> { Queue.new(enumerable) }.should raise_error(TypeError, "can't convert MockObject to Array (MockObject#to_a gives String)")
+  end
 end
diff --git a/spec/ruby/core/queue/pop_spec.rb b/spec/ruby/core/queue/pop_spec.rb
index 1ce9231685..3dff7db242 100644
--- a/spec/ruby/core/queue/pop_spec.rb
+++ b/spec/ruby/core/queue/pop_spec.rb
@@ -1,6 +1,11 @@
 require_relative '../../spec_helper'
 require_relative '../../shared/queue/deque'
+require_relative '../../shared/types/rb_num2dbl_fails'
 
 describe "Queue#pop" do
   it_behaves_like :queue_deq, :pop, -> { Queue.new }
 end
+
+describe "Queue operations with timeout" do
+  it_behaves_like :rb_num2dbl_fails, nil, -> v { q = Queue.new; q.push(1); q.pop(timeout: v) }
+end
diff --git a/spec/ruby/core/queue/shift_spec.rb b/spec/ruby/core/queue/shift_spec.rb
index f84058e1df..c105da74b2 100644
--- a/spec/ruby/core/queue/shift_spec.rb
+++ b/spec/ruby/core/queue/shift_spec.rb
@@ -1,6 +1,11 @@
 require_relative '../../spec_helper'
 require_relative '../../shared/queue/deque'
+require_relative '../../shared/types/rb_num2dbl_fails'
 
 describe "Queue#shift" do
   it_behaves_like :queue_deq, :shift, -> { Queue.new }
 end
+
+describe "Queue operations with timeout" do
+  it_behaves_like :rb_num2dbl_fails, nil, -> v { q = Queue.new; q.push(1); q.shift(timeout: v) }
+end