Polish Enumerator's specs

Author: andrykonchin

spec/ruby/core/enumerator/chain/initialize_spec.rb

@@ -22,10 +22,10 @@
   end
 
   describe "on frozen instance" do
-    it "raises a RuntimeError" do
+    it "raises a FrozenError" do
       -> {
         @uninitialized.freeze.send(:initialize)
-      }.should raise_error(RuntimeError)
+      }.should raise_error(FrozenError)
     end
   end
 end

spec/ruby/core/enumerator/each_spec.rb

@@ -10,41 +10,41 @@ def object_each_with_arguments.each_with_arguments(arg, *args)
 
     @enum_with_arguments = object_each_with_arguments.to_enum(:each_with_arguments, :arg0, :arg1, :arg2)
 
-    @enum_with_yielder = Enumerator.new {|y| y.yield :ok}
+    @enum_with_yielder = Enumerator.new { |y| y.yield :ok }
   end
 
   it "yields each element of self to the given block" do
     acc = []
-    [1,2,3].to_enum.each {|e| acc << e }
-    acc.should == [1,2,3]
+    [1, 2, 3].to_enum.each { |e| acc << e }
+    acc.should == [1, 2, 3]
   end
 
   it "calls #each on the object given in the constructor by default" do
     each = mock('each')
     each.should_receive(:each)
-    each.to_enum.each {|e| e }
+    each.to_enum.each { |e| e }
   end
 
   it "calls #each on the underlying object until it's exhausted" do
     each = mock('each')
     each.should_receive(:each).and_yield(1).and_yield(2).and_yield(3)
     acc = []
-    each.to_enum.each {|e| acc << e }
-    acc.should == [1,2,3]
+    each.to_enum.each { |e| acc << e }
+    acc.should == [1, 2, 3]
   end
 
   it "calls the method given in the constructor instead of #each" do
     each = mock('peach')
     each.should_receive(:peach)
-    each.to_enum(:peach).each {|e| e }
+    each.to_enum(:peach).each { |e| e }
   end
 
   it "calls the method given in the constructor until it's exhausted" do
     each = mock('peach')
     each.should_receive(:peach).and_yield(1).and_yield(2).and_yield(3)
     acc = []
-    each.to_enum(:peach).each {|e| acc << e }
-    acc.should == [1,2,3]
+    each.to_enum(:peach).each { |e| acc << e }
+    acc.should == [1, 2, 3]
   end
 
   it "raises a NoMethodError if the object doesn't respond to #each" do

spec/ruby/core/enumerator/generator/initialize_spec.rb

@@ -17,10 +17,10 @@
   end
 
   describe "on frozen instance" do
-    it "raises a RuntimeError" do
+    it "raises a FrozenError" do
       -> {
         @uninitialized.freeze.send(:initialize) {}
-      }.should raise_error(RuntimeError)
+      }.should raise_error(FrozenError)
     end
   end
 end

spec/ruby/core/enumerator/initialize_spec.rb

@@ -48,10 +48,10 @@
   end
 
   describe "on frozen instance" do
-    it "raises a RuntimeError" do
+    it "raises a FrozenError" do
       -> {
         @uninitialized.freeze.send(:initialize) {}
-      }.should raise_error(RuntimeError)
+      }.should raise_error(FrozenError)
     end
   end
 end

spec/ruby/core/enumerator/lazy/initialize_spec.rb

@@ -56,8 +56,8 @@ def receiver.each
   end
 
   describe "on frozen instance" do
-    it "raises a RuntimeError" do
-      -> {  @uninitialized.freeze.send(:initialize, @receiver) {} }.should raise_error(RuntimeError)
+    it "raises a FrozenError" do
+      -> {  @uninitialized.freeze.send(:initialize, @receiver) {} }.should raise_error(FrozenError)
     end
   end
 end

spec/ruby/core/enumerator/product/each_spec.rb

@@ -45,6 +45,11 @@ def object2.each_entry
       enum.each.to_a.should == [[1, :a], [1, :b], [2, :a], [2, :b]]
     end
 
+    it "returns self if given a block" do
+      enum = Enumerator::Product.new([1, 2], [:a, :b])
+      enum.each {}.should.equal?(enum)
+    end
+
     it "doesn't accept arguments" do
       Enumerator::Product.instance_method(:each).arity.should == 0
     end

spec/ruby/core/enumerator/product_spec.rb

@@ -44,6 +44,10 @@
       elems.should == [[1, "X"], [1, "Y"], [2, "X"], [2, "Y"]]
     end
 
+    it "returns nil when a block passed" do
+      Enumerator.product(1..2) {}.should == nil
+    end
+
     it "reject keyword arguments" do
       -> {
         Enumerator.product(1..3, foo: 1, bar: 2)

spec/ruby/core/enumerator/rewind_spec.rb

@@ -14,7 +14,7 @@
   end
 
   it "returns self" do
-    @enum.rewind.should == @enum
+    @enum.rewind.should.equal? @enum
   end
 
   it "has no effect on a new enumerator" do
@@ -49,7 +49,7 @@
     obj = mock('rewinder')
     enum = obj.to_enum
     obj.should_receive(:each).at_most(1)
-    -> { enum.rewind.should == enum }.should_not raise_error
+    enum.rewind.should == enum
   end
 end
 

spec/ruby/core/kernel/initialize_copy_spec.rb

@@ -1,11 +1,18 @@
 require_relative '../../spec_helper'
 
 describe "Kernel#initialize_copy" do
+  it "returns self" do
+    obj = Object.new
+    obj.send(:initialize_copy, obj).should.equal?(obj)
+  end
+
   it "does nothing if the argument is the same as the receiver" do
     obj = Object.new
     obj.send(:initialize_copy, obj).should.equal?(obj)
-    obj.freeze
+
+    obj = Object.new.freeze
     obj.send(:initialize_copy, obj).should.equal?(obj)
+
     1.send(:initialize_copy, 1).should.equal?(1)
   end