1 files changed, 14 insertions, 10 deletions
diff --git a/spec/ruby/core/enumerable/zip_spec.rb b/spec/ruby/core/enumerable/zip_spec.rb
index 2d090f335c..c5f9a3e4d4 100644
--- a/spec/ruby/core/enumerable/zip_spec.rb
+++ b/spec/ruby/core/enumerable/zip_spec.rb
@@ -1,5 +1,5 @@
-require File.expand_path('../../../spec_helper', __FILE__)
-require File.expand_path('../fixtures/classes', __FILE__)
+require_relative '../../spec_helper'
+require_relative 'fixtures/classes'
 
 describe "Enumerable#zip" do
 
@@ -21,16 +21,16 @@ describe "Enumerable#zip" do
   end
 
   it "converts arguments to arrays using #to_ary" do
-    convertable = EnumerableSpecs::ArrayConvertable.new(4,5,6)
-    EnumerableSpecs::Numerous.new(1,2,3).zip(convertable).should == [[1,4],[2,5],[3,6]]
-    convertable.called.should == :to_ary
+    convertible = EnumerableSpecs::ArrayConvertible.new(4,5,6)
+    EnumerableSpecs::Numerous.new(1,2,3).zip(convertible).should == [[1,4],[2,5],[3,6]]
+    convertible.called.should == :to_ary
   end
 
   it "converts arguments to enums using #to_enum" do
-    convertable = EnumerableSpecs::EnumConvertable.new(4..6)
-    EnumerableSpecs::Numerous.new(1,2,3).zip(convertable).should == [[1,4],[2,5],[3,6]]
-    convertable.called.should == :to_enum
-    convertable.sym.should == :each
+    convertible = EnumerableSpecs::EnumConvertible.new(4..6)
+    EnumerableSpecs::Numerous.new(1,2,3).zip(convertible).should == [[1,4],[2,5],[3,6]]
+    convertible.called.should == :to_enum
+    convertible.sym.should == :each
   end
 
   it "gathers whole arrays as elements when each yields multiple" do
@@ -38,5 +38,9 @@ describe "Enumerable#zip" do
     multi.zip(multi).should == [[[1, 2], [1, 2]], [[3, 4, 5], [3, 4, 5]], [[6, 7, 8, 9], [6, 7, 8, 9]]]
   end
 
+  it "raises TypeError when some argument isn't Array and doesn't respond to #to_ary and #to_enum" do
+    -> { EnumerableSpecs::Numerous.new(1,2,3).zip(Object.new) }.should.raise(TypeError, "wrong argument type Object (must respond to :each)")
+    -> { EnumerableSpecs::Numerous.new(1,2,3).zip(1) }.should.raise(TypeError, "wrong argument type Integer (must respond to :each)")
+    -> { EnumerableSpecs::Numerous.new(1,2,3).zip(true) }.should.raise(TypeError, "wrong argument type TrueClass (must respond to :each)")
+  end
 end
-