Update to ruby/spec@35a9fba

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66888 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 37 insertions, 2 deletions

diff --git a/spec/ruby/core/enumerator/new_spec.rb b/spec/ruby/core/enumerator/new_spec.rb
index 86d2d38022..170809dbc1 100644
--- a/spec/ruby/core/enumerator/new_spec.rb
+++ b/spec/ruby/core/enumerator/new_spec.rb
@@ -1,6 +1,41 @@
 require_relative '../../spec_helper'
-require_relative '../../shared/enumerator/new'
 
 describe "Enumerator.new" do
-  it_behaves_like :enum_new, :new
+  it "creates a new custom enumerator with the given object, iterator and arguments" do
+    enum = Enumerator.new(1, :upto, 3)
+    enum.should be_an_instance_of(Enumerator)
+  end
+
+  it "creates a new custom enumerator that responds to #each" do
+    enum = Enumerator.new(1, :upto, 3)
+    enum.respond_to?(:each).should == true
+  end
+
+  it "creates a new custom enumerator that runs correctly" do
+    Enumerator.new(1, :upto, 3).map{|x|x}.should == [1,2,3]
+  end
+
+  it "aliases the second argument to :each" do
+    Enumerator.new(1..2).to_a.should == Enumerator.new(1..2, :each).to_a
+  end
+
+  it "doesn't check for the presence of the iterator method" do
+    Enumerator.new(nil).should be_an_instance_of(Enumerator)
+  end
+
+  it "uses the latest define iterator method" do
+    class StrangeEach
+      def each
+        yield :foo
+      end
+    end
+    enum = Enumerator.new(StrangeEach.new)
+    enum.to_a.should == [:foo]
+    class StrangeEach
+      def each
+        yield :bar
+      end
+    end
+    enum.to_a.should == [:bar]
+  end
 end