8 files changed, 86 insertions, 10 deletions
diff --git a/spec/ruby/core/queue/deq_spec.rb b/spec/ruby/core/queue/deq_spec.rb
index 9510978eac..374611366e 100644
--- a/spec/ruby/core/queue/deq_spec.rb
+++ b/spec/ruby/core/queue/deq_spec.rb
@@ -1,6 +1,7 @@
 require_relative '../../spec_helper'
-require_relative '../../shared/queue/deque'
 
 describe "Queue#deq" do
-  it_behaves_like :queue_deq, :deq, -> { Queue.new }
+  it "is an alias of Queue#pop" do
+    Queue.instance_method(:deq).should == Queue.instance_method(:pop)
+  end
 end
diff --git a/spec/ruby/core/queue/enq_spec.rb b/spec/ruby/core/queue/enq_spec.rb
index c69c496fbc..76ecf0ca5f 100644
--- a/spec/ruby/core/queue/enq_spec.rb
+++ b/spec/ruby/core/queue/enq_spec.rb
@@ -1,6 +1,7 @@
 require_relative '../../spec_helper'
-require_relative '../../shared/queue/enque'
 
 describe "Queue#enq" do
-  it_behaves_like :queue_enq, :enq, -> { Queue.new }
+  it "is an alias of Queue#<<" do
+    Queue.instance_method(:enq).should == Queue.instance_method(:<<)
+  end
 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
new file mode 100644
index 0000000000..080e4d0abd
--- /dev/null
+++ b/spec/ruby/core/queue/initialize_spec.rb
@@ -0,0 +1,60 @@
+require_relative '../../spec_helper'
+
+describe "Queue#initialize" do
+  it "can be passed no arguments for an empty Queue" do
+    q = Queue.new
+    q.size.should == 0
+    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])
+      q = Queue.new(enumerable)
+      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 "raises a TypeError if the given argument can't be converted to an Array" do
+      -> { Queue.new(42) }.should.raise(TypeError)
+      -> { Queue.new(:abc) }.should.raise(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')
+      enumerable.should_receive(:to_a).and_raise(NoMethodError)
+      -> { Queue.new(enumerable) }.should.raise(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(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_consistent_error(TypeError, "can't convert MockObject into Array (MockObject#to_a gives String)")
+  end
+end
diff --git a/spec/ruby/core/queue/length_spec.rb b/spec/ruby/core/queue/length_spec.rb
index 25399b2b76..0566b1d547 100644
--- a/spec/ruby/core/queue/length_spec.rb
+++ b/spec/ruby/core/queue/length_spec.rb
@@ -1,6 +1,7 @@
 require_relative '../../spec_helper'
-require_relative '../../shared/queue/length'
 
 describe "Queue#length" do
-  it_behaves_like :queue_length, :length, -> { Queue.new }
+  it "is an alias of Queue#size" do
+    Queue.instance_method(:length).should == Queue.instance_method(:size)
+  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/push_spec.rb b/spec/ruby/core/queue/push_spec.rb
index e936f9d282..ef622ac89d 100644
--- a/spec/ruby/core/queue/push_spec.rb
+++ b/spec/ruby/core/queue/push_spec.rb
@@ -1,6 +1,7 @@
 require_relative '../../spec_helper'
-require_relative '../../shared/queue/enque'
 
 describe "Queue#push" do
-  it_behaves_like :queue_enq, :push, -> { Queue.new }
+  it "is an alias of Queue#<<" do
+    Queue.instance_method(:push).should == Queue.instance_method(:<<)
+  end
 end
diff --git a/spec/ruby/core/queue/shift_spec.rb b/spec/ruby/core/queue/shift_spec.rb
index f84058e1df..074332359c 100644
--- a/spec/ruby/core/queue/shift_spec.rb
+++ b/spec/ruby/core/queue/shift_spec.rb
@@ -1,6 +1,7 @@
 require_relative '../../spec_helper'
-require_relative '../../shared/queue/deque'
 
 describe "Queue#shift" do
-  it_behaves_like :queue_deq, :shift, -> { Queue.new }
+  it "is an alias of Queue#pop" do
+    Queue.instance_method(:shift).should == Queue.instance_method(:pop)
+  end
 end