8 files changed, 80 insertions, 9 deletions
diff --git a/spec/ruby/core/enumerator/each_spec.rb b/spec/ruby/core/enumerator/each_spec.rb
index a6ecf2af2d..68ff0436f8 100644
--- a/spec/ruby/core/enumerator/each_spec.rb
+++ b/spec/ruby/core/enumerator/each_spec.rb
@@ -1,5 +1,5 @@
 require File.expand_path('../../../shared/enumerator/each', __FILE__)
 
 describe "Enumerator#each" do
-  it_behaves_like(:enum_each, :each)
+  it_behaves_like :enum_each, :each
 end
diff --git a/spec/ruby/core/enumerator/each_with_index_spec.rb b/spec/ruby/core/enumerator/each_with_index_spec.rb
index c8cb0bd496..bc5c425093 100644
--- a/spec/ruby/core/enumerator/each_with_index_spec.rb
+++ b/spec/ruby/core/enumerator/each_with_index_spec.rb
@@ -3,8 +3,8 @@ require File.expand_path('../../../shared/enumerator/with_index', __FILE__)
 require File.expand_path('../../enumerable/shared/enumeratorized', __FILE__)
 
 describe "Enumerator#each_with_index" do
-  it_behaves_like(:enum_with_index, :each_with_index)
-  it_behaves_like(:enumeratorized_with_origin_size, :each_with_index, [1,2,3].select)
+  it_behaves_like :enum_with_index, :each_with_index
+  it_behaves_like :enumeratorized_with_origin_size, :each_with_index, [1,2,3].select
 
   it "returns a new Enumerator when no block is given" do
     enum1 = [1,2,3].select
diff --git a/spec/ruby/core/enumerator/inject_spec.rb b/spec/ruby/core/enumerator/inject_spec.rb
index 64085a03c5..ca7786ae04 100644
--- a/spec/ruby/core/enumerator/inject_spec.rb
+++ b/spec/ruby/core/enumerator/inject_spec.rb
@@ -1,7 +1,7 @@
 require File.expand_path('../../../shared/enumerator/each', __FILE__)
 
 describe "Enumerator#inject" do
-  it_behaves_like(:enum_each, :each)
+  it_behaves_like :enum_each, :each
 
   it "works when chained against each_with_index" do
     passed_values = []
diff --git a/spec/ruby/core/enumerator/lazy/chunk_spec.rb b/spec/ruby/core/enumerator/lazy/chunk_spec.rb
new file mode 100644
index 0000000000..3e9d9e9dfd
--- /dev/null
+++ b/spec/ruby/core/enumerator/lazy/chunk_spec.rb
@@ -0,0 +1,71 @@
+# -*- encoding: us-ascii -*-
+
+require File.expand_path('../../../../spec_helper', __FILE__)
+require File.expand_path('../fixtures/classes', __FILE__)
+
+describe "Enumerator::Lazy#chunk" do
+
+  before :each do
+    @yieldsmixed = EnumeratorLazySpecs::YieldsMixed.new.to_enum.lazy
+    @eventsmixed = EnumeratorLazySpecs::EventsMixed.new.to_enum.lazy
+    ScratchPad.record []
+  end
+
+  after :each do
+    ScratchPad.clear
+  end
+
+  it "returns a new instance of Enumerator::Lazy" do
+    ret = @yieldsmixed.chunk {}
+    ret.should be_an_instance_of(Enumerator::Lazy)
+    ret.should_not equal(@yieldsmixed)
+  end
+
+  it "sets #size to nil" do
+    Enumerator::Lazy.new(Object.new, 100) {}.chunk { |v| v }.size.should == nil
+  end
+
+  ruby_version_is ""..."2.4" do
+    it "raises an ArgumentError if called without a block" do
+      lambda do
+        @yieldsmixed.chunk
+      end.should raise_error(ArgumentError)
+    end
+  end
+
+  ruby_version_is "2.4" do
+    it "returns an Enumerator if called without a block" do
+      chunk = @yieldsmixed.chunk
+      chunk.should be_an_instance_of(Enumerator::Lazy)
+
+      res = chunk.each { |v| true }.force
+      res.should == [[true, EnumeratorLazySpecs::YieldsMixed.gathered_yields]]
+    end
+  end
+
+  describe "when the returned lazy enumerator is evaluated by Enumerable#first" do
+    it "stops after specified times" do
+      first_two = (0..Float::INFINITY).lazy.chunk { |n| n.even? }.first(2)
+      first_two.should == [[true, [0]], [false, [1]]]
+    end
+  end
+
+  it "calls the block with gathered values when yield with multiple arguments" do
+    yields = []
+    @yieldsmixed.chunk { |v| yields << v; true }.force
+    yields.should == EnumeratorLazySpecs::YieldsMixed.gathered_yields
+  end
+
+  describe "on a nested Lazy" do
+    it "sets #size to nil" do
+      Enumerator::Lazy.new(Object.new, 100) {}.take(20).chunk { |v| v }.size.should == nil
+    end
+
+    describe "when the returned lazy enumerator is evaluated by Enumerable#first" do
+      it "stops after specified times" do
+        remains_lazy = (0..Float::INFINITY).lazy.chunk { |n| n }
+        remains_lazy.chunk { |n| n }.first(2).size.should == 2
+      end
+    end
+  end
+end
diff --git a/spec/ruby/core/enumerator/new_spec.rb b/spec/ruby/core/enumerator/new_spec.rb
index e8e0572a40..4960d0c394 100644
--- a/spec/ruby/core/enumerator/new_spec.rb
+++ b/spec/ruby/core/enumerator/new_spec.rb
@@ -2,5 +2,5 @@ require File.expand_path('../../../spec_helper', __FILE__)
 require File.expand_path('../../../shared/enumerator/new', __FILE__)
 
 describe "Enumerator.new" do
-  it_behaves_like(:enum_new, :new)
+  it_behaves_like :enum_new, :new
 end
diff --git a/spec/ruby/core/enumerator/next_spec.rb b/spec/ruby/core/enumerator/next_spec.rb
index 6b3309a2bc..cec0cadfe4 100644
--- a/spec/ruby/core/enumerator/next_spec.rb
+++ b/spec/ruby/core/enumerator/next_spec.rb
@@ -2,5 +2,5 @@ require File.expand_path('../../../spec_helper', __FILE__)
 require File.expand_path('../../../shared/enumerator/next', __FILE__)
 
 describe "Enumerator#next" do
-  it_behaves_like(:enum_next,:next)
+  it_behaves_like :enum_next,:next
 end
diff --git a/spec/ruby/core/enumerator/rewind_spec.rb b/spec/ruby/core/enumerator/rewind_spec.rb
index 666136d74a..127e0a0da1 100644
--- a/spec/ruby/core/enumerator/rewind_spec.rb
+++ b/spec/ruby/core/enumerator/rewind_spec.rb
@@ -3,7 +3,7 @@ require File.expand_path('../../../shared/enumerator/rewind', __FILE__)
 require File.expand_path('../fixtures/common', __FILE__)
 
 describe "Enumerator#rewind" do
-  it_behaves_like(:enum_rewind, :rewind)
+  it_behaves_like :enum_rewind, :rewind
 
   it "calls the enclosed object's rewind method if one exists" do
     obj = mock('rewinder')
diff --git a/spec/ruby/core/enumerator/with_index_spec.rb b/spec/ruby/core/enumerator/with_index_spec.rb
index 3d0ec0a298..62e4c8b5b9 100644
--- a/spec/ruby/core/enumerator/with_index_spec.rb
+++ b/spec/ruby/core/enumerator/with_index_spec.rb
@@ -3,8 +3,8 @@ require File.expand_path('../../../shared/enumerator/with_index', __FILE__)
 require File.expand_path('../../enumerable/shared/enumeratorized', __FILE__)
 
 describe "Enumerator#with_index" do
-  it_behaves_like(:enum_with_index, :with_index)
-  it_behaves_like(:enumeratorized_with_origin_size, :with_index, [1,2,3].select)
+  it_behaves_like :enum_with_index, :with_index
+  it_behaves_like :enumeratorized_with_origin_size, :with_index, [1,2,3].select
 
   it "returns a new Enumerator when no block is given" do
     enum1 = [1,2,3].select