jruby · Jun 5, 2015 · Jun 5, 2015
diff --git a/spec/ruby/.travis.yml b/spec/ruby/.travis.yml
@@ -3,8 +3,8 @@ os:
   - linux
   - osx
 rvm:
-  - 2.0.0
-  - 2.1
+  - 2.0.0-p598
+  - 2.1.5
   - 2.2.2
   - ruby-head
 script:

diff --git a/spec/ruby/core/argf/shared/each_byte.rb b/spec/ruby/core/argf/shared/each_byte.rb
@@ -36,4 +36,27 @@
       bytes.should == @bytes
     end
   end
+
+  describe "when no block is given" do
+    it "returns an Enumerator" do
+      argv [@file1_name, @file2_name] do
+        enum = ARGF.send(@method)
+        enum.should be_an_instance_of(enumerator_class)
+
+        bytes = []
+        enum.each { |b| bytes << b }
+        bytes.should == @bytes
+      end
+    end
+
+    describe "returned Enumerator" do
+      describe "size" do
+        it "should return nil" do
+          argv [@file1_name, @file2_name] do
+            ARGF.send(@method).size.should == nil
+          end
+        end
+      end
+    end
+  end
 end
diff --git a/spec/ruby/core/argf/shared/each_char.rb b/spec/ruby/core/argf/shared/each_char.rb
@@ -36,4 +36,27 @@
       chars.should == @chars
     end
   end
+
+  describe "when no block is given" do
+    it "returns an Enumerator" do
+      argv [@file1_name, @file2_name] do
+        enum = ARGF.send(@method)
+        enum.should be_an_instance_of(enumerator_class)
+
+        chars = []
+        enum.each { |c| chars << c }
+        chars.should == @chars
+      end
+    end
+
+    describe "returned Enumerator" do
+      describe "size" do
+        it "should return nil" do
+          argv [@file1_name, @file2_name] do
+            ARGF.send(@method).size.should == nil
+          end
+        end
+      end
+    end
+  end
 end
diff --git a/spec/ruby/core/argf/shared/each_codepoint.rb b/spec/ruby/core/argf/shared/each_codepoint.rb
@@ -41,4 +41,22 @@
       ARGF.send(@method).to_a.should == @codepoints
     end
   end
+
+  describe "when no block is given" do
+    it "returns an Enumerator" do
+      argv @filenames do
+        ARGF.send(@method).should be_an_instance_of(enumerator_class)
+      end
+    end
+
+    describe "returned Enumerator" do
+      describe "size" do
+        it "should return nil" do
+          argv @filenames do
+            ARGF.send(@method).size.should == nil
+          end
+        end
+      end
+    end
+  end
 end
diff --git a/spec/ruby/core/argf/shared/each_line.rb b/spec/ruby/core/argf/shared/each_line.rb
@@ -37,12 +37,6 @@
     end
   end
 
-  it "returns an Enumerator when passed no block" do
-    argv [@file1_name, @file2_name] do
-      ARGF.send(@method).should be_an_instance_of(enumerator_class)
-    end
-  end
-
   describe "with a separator" do
     it "yields each separated section of all streams" do
       argv [@file1_name, @file2_name] do
@@ -51,4 +45,22 @@
       end
     end
   end
+
+  describe "when no block is given" do
+    it "returns an Enumerator" do
+      argv [@file1_name, @file2_name] do
+        ARGF.send(@method).should be_an_instance_of(enumerator_class)
+      end
+    end
+
+    describe "returned Enumerator" do
+      describe "size" do
+        it "should return nil" do
+          argv [@file1_name, @file2_name] do
+            ARGF.send(@method).size.should == nil
+          end
+        end
+      end
+    end
+  end
 end
diff --git a/spec/ruby/core/array/bsearch_spec.rb b/spec/ruby/core/array/bsearch_spec.rb
@@ -1,10 +1,13 @@
 require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../../enumerable/shared/enumeratorized', __FILE__)
 
 describe "Array#bsearch" do
   it "returns an Enumerator when not passed a block" do
     [1].bsearch.should be_an_instance_of(enumerator_class)
   end
 
+  it_behaves_like :enumeratorized_with_unknown_size, :bsearch, [1,2,3]
+
   it "raises a TypeError if the block returns an Object" do
     lambda { [1].bsearch { Object.new } }.should raise_error(TypeError)
   end

diff --git a/spec/ruby/core/array/combination_spec.rb b/spec/ruby/core/array/combination_spec.rb
@@ -50,4 +50,25 @@
     end
     accum.should == [[1, 2], [1, 3], [1, 4], [2, 3], [2, 4], [3, 4]]
   end
+
+  describe "when no block is given" do
+    describe "returned Enumerator" do
+      describe "size" do
+        it "returns 0 when the number of combinations is < 0" do
+          @array.combination(-1).size.should == 0
+          [].combination(-2).size.should == 0
+        end
+        it "returns the binomial coeficient between the array size the number of combinations" do
+          @array.combination(5).size.should == 0
+          @array.combination(4).size.should == 1
+          @array.combination(3).size.should == 4
+          @array.combination(2).size.should == 6
+          @array.combination(1).size.should == 4
+          @array.combination(0).size.should == 1
+          [].combination(0).size.should == 1
+          [].combination(1).size.should == 0
+        end
+      end
+    end
+  end
 end
diff --git a/spec/ruby/core/array/concat_spec.rb b/spec/ruby/core/array/concat_spec.rb
@@ -96,4 +96,17 @@
     ary[2].untrusted?.should be_true
     ary[3].untrusted?.should be_false
   end
+
+  it "appends elements to an Array with enough capacity that has been shifted" do
+    ary = [1, 2, 3, 4, 5]
+    2.times { ary.shift }
+    2.times { ary.pop }
+    ary.concat([5, 6]).should == [3, 5, 6]
+  end
+
+  it "appends elements to an Array without enough capacity that has been shifted" do
+    ary = [1, 2, 3, 4]
+    3.times { ary.shift }
+    ary.concat([5, 6]).should == [4, 5, 6]
+  end
 end
diff --git a/spec/ruby/core/array/cycle_spec.rb b/spec/ruby/core/array/cycle_spec.rb
@@ -1,4 +1,5 @@
 require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../../enumerable/shared/enumeratorized', __FILE__)
 
 describe "Array#cycle" do
   before :each do
@@ -91,4 +92,10 @@
   it "raises a TypeError if passed false" do
     lambda { @array.cycle(false) { } }.should raise_error(TypeError)
   end
+
+  before :all do
+    @object = [1, 2, 3, 4]
+    @empty_object = []
+  end
+  it_should_behave_like :enumeratorized_with_cycle_size
 end
diff --git a/spec/ruby/core/array/delete_if_spec.rb b/spec/ruby/core/array/delete_if_spec.rb
@@ -1,6 +1,7 @@
 require File.expand_path('../../../spec_helper', __FILE__)
 require File.expand_path('../fixtures/classes', __FILE__)
 require File.expand_path('../shared/enumeratorize', __FILE__)
+require File.expand_path('../../enumerable/shared/enumeratorized', __FILE__)
 
 describe "Array#delete_if" do
   before do
@@ -58,4 +59,6 @@
     @a.delete_if{ true }
     @a.untrusted?.should be_true
   end
+
+  it_behaves_like :enumeratorized_with_origin_size, :delete_if, [1,2,3]
 end
diff --git a/spec/ruby/core/array/each_index_spec.rb b/spec/ruby/core/array/each_index_spec.rb
@@ -1,6 +1,7 @@
 require File.expand_path('../../../spec_helper', __FILE__)
 require File.expand_path('../fixtures/classes', __FILE__)
 require File.expand_path('../shared/enumeratorize', __FILE__)
+require File.expand_path('../../enumerable/shared/enumeratorized', __FILE__)
 
 # Modifying a collection while the contents are being iterated
 # gives undefined behavior. See
@@ -37,4 +38,5 @@
   end
 
   it_behaves_like :enumeratorize, :each_index
+  it_behaves_like :enumeratorized_with_origin_size, :each_index, [1,2,3]
 end
diff --git a/spec/ruby/core/array/each_spec.rb b/spec/ruby/core/array/each_spec.rb
@@ -1,6 +1,7 @@
 require File.expand_path('../../../spec_helper', __FILE__)
 require File.expand_path('../fixtures/classes', __FILE__)
 require File.expand_path('../shared/enumeratorize', __FILE__)
+require File.expand_path('../../enumerable/shared/enumeratorized', __FILE__)
 
 # Modifying a collection while the contents are being iterated
 # gives undefined behavior. See
@@ -27,4 +28,5 @@
   end
 
   it_behaves_like :enumeratorize, :each
+  it_behaves_like :enumeratorized_with_origin_size, :each, [1,2,3]
 end
diff --git a/spec/ruby/core/array/permutation_spec.rb b/spec/ruby/core/array/permutation_spec.rb
@@ -106,4 +106,33 @@
 
     accum.should == [[1, 2, 3], [1, 3, 2], [2, 1, 3], [2, 3, 1], [3, 1, 2], [3, 2, 1]]
   end
+
+  describe "when no block is given" do
+    describe "returned Enumerator" do
+      describe "size" do
+        describe "with an array size greater than 0" do
+          it "returns the descending factorial of array size and given length" do
+            @numbers.permutation(4).size.should == 0
+            @numbers.permutation(3).size.should == 6
+            @numbers.permutation(2).size.should == 6
+            @numbers.permutation(1).size.should == 3
+            @numbers.permutation(0).size.should == 1
+          end
+          it "returns the descending factorial of array size with array size when there's no param" do
+            @numbers.permutation.size.should == 6
+            [1,2,3,4].permutation.size.should == 24
+            [1].permutation.size.should == 1
+          end
+        end
+        describe "with an empty array" do
+          it "returns 1 when the given length is 0" do
+            [].permutation(0).size.should == 1
+          end
+          it "returns 1 when there's param" do
+            [].permutation.size.should == 1
+          end
+        end
+      end
+    end
+  end
 end
diff --git a/spec/ruby/core/array/reject_spec.rb b/spec/ruby/core/array/reject_spec.rb
@@ -1,6 +1,7 @@
 require File.expand_path('../../../spec_helper', __FILE__)
 require File.expand_path('../fixtures/classes', __FILE__)
 require File.expand_path('../shared/enumeratorize', __FILE__)
+require File.expand_path('../../enumerable/shared/enumeratorized', __FILE__)
 
 describe "Array#reject" do
   it "returns a new array without elements for which block is true" do
@@ -42,6 +43,7 @@
   end
 
   it_behaves_like :enumeratorize, :reject
+  it_behaves_like :enumeratorized_with_origin_size, :reject, [1,2,3]
 end
 
 describe "Array#reject!" do
@@ -109,4 +111,5 @@
   end
 
   it_behaves_like :enumeratorize, :reject!
+  it_behaves_like :enumeratorized_with_origin_size, :reject!, [1,2,3]
 end
diff --git a/spec/ruby/core/array/repeated_combination_spec.rb b/spec/ruby/core/array/repeated_combination_spec.rb
@@ -54,4 +54,31 @@
     end
     accum.sort.should == [[10, 10], [10, 11], [10, 12], [11, 11], [11, 12], [12, 12]]
   end
+
+  describe "when no block is given" do
+    describe "returned Enumerator" do
+      describe "size" do
+        it "returns 0 when the combination_size is < 0" do
+          @array.repeated_combination(-1).size.should == 0
+          [].repeated_combination(-2).size.should == 0
+        end
+
+        it "returns 1 when the combination_size is 0" do
+          @array.repeated_combination(0).size.should == 1
+          [].repeated_combination(0).size.should == 1
+        end
+
+        it "returns the binomial coeficient between combination_size and array size + combination_size -1" do
+          @array.repeated_combination(5).size.should == 21
+          @array.repeated_combination(4).size.should == 15
+          @array.repeated_combination(3).size.should == 10
+          @array.repeated_combination(2).size.should == 6
+          @array.repeated_combination(1).size.should == 3
+          @array.repeated_combination(0).size.should == 1
+          [].repeated_combination(0).size.should == 1
+          [].repeated_combination(1).size.should == 0
+        end
+      end
+    end
+  end
 end
diff --git a/spec/ruby/core/array/repeated_permutation_spec.rb b/spec/ruby/core/array/repeated_permutation_spec.rb
@@ -67,4 +67,28 @@
        [1, 2, 2], [2, 1, 1], [2, 1, 2],
        [2, 2, 1], [2, 2, 2]]
   end
+
+  describe "when no block is given" do
+    describe "returned Enumerator" do
+      describe "size" do
+        it "returns 0 when combination_size is < 0" do
+          @numbers.repeated_permutation(-1).size.should == 0
+          [].repeated_permutation(-1).size.should == 0
+        end
+
+        it "returns array size ** combination_size" do
+          @numbers.repeated_permutation(4).size.should == 81
+          @numbers.repeated_permutation(3).size.should == 27
+          @numbers.repeated_permutation(2).size.should == 9
+          @numbers.repeated_permutation(1).size.should == 3
+          @numbers.repeated_permutation(0).size.should == 1
+          [].repeated_permutation(4).size.should == 0
+          [].repeated_permutation(3).size.should == 0
+          [].repeated_permutation(2).size.should == 0
+          [].repeated_permutation(1).size.should == 0
+          [].repeated_permutation(0).size.should == 1
+        end
+      end
+    end
+  end
 end
diff --git a/spec/ruby/core/array/reverse_each_spec.rb b/spec/ruby/core/array/reverse_each_spec.rb
@@ -1,6 +1,7 @@
 require File.expand_path('../../../spec_helper', __FILE__)
 require File.expand_path('../fixtures/classes', __FILE__)
 require File.expand_path('../shared/enumeratorize', __FILE__)
+require File.expand_path('../../enumerable/shared/enumeratorized', __FILE__)
 
 # Modifying a collection while the contents are being iterated
 # gives undefined behavior. See
@@ -33,5 +34,10 @@
     ScratchPad.recorded.should == [array, array, array, array, array, 3.0, 'two', 1]
   end
 
+  it "returns the correct size when no block is given" do
+    [1, 2, 3].reverse_each.size.should == 3
+  end
+
   it_behaves_like :enumeratorize, :reverse_each
+  it_behaves_like :enumeratorized_with_origin_size, :reverse_each, [1,2,3]
 end
diff --git a/spec/ruby/core/array/rindex_spec.rb b/spec/ruby/core/array/rindex_spec.rb
@@ -1,5 +1,6 @@
 require File.expand_path('../../../spec_helper', __FILE__)
 require File.expand_path('../fixtures/classes', __FILE__)
+require File.expand_path('../../enumerable/shared/enumeratorized', __FILE__)
 
 # Modifying a collection while the contents are being iterated
 # gives undefined behavior. See
@@ -72,4 +73,6 @@
       enum.each { |x| x < 2 }.should == 4
     end
   end
+
+  it_behaves_like :enumeratorized_with_unknown_size, :bsearch, [1,2,3]
 end
-Original file line number
+Diff line change
@@ @@ -3,8 +3,8 @@ os: @@
       - linux
       - osx
     rvm:
-      - 2.0.0
-      - 2.1
+      - 2.0.0-p598
+      - 2.1.5
       - 2.2.2
       - ruby-head
     script: