1 files changed, 67 insertions, 4 deletions
diff --git a/spec/ruby/core/io/each_char_spec.rb b/spec/ruby/core/io/each_char_spec.rb
index 5d460a1e7c..7c1ca4f069 100644
--- a/spec/ruby/core/io/each_char_spec.rb
+++ b/spec/ruby/core/io/each_char_spec.rb
@@ -1,12 +1,75 @@
-# -*- encoding: utf-8 -*-
 require_relative '../../spec_helper'
 require_relative 'fixtures/classes'
-require_relative 'shared/chars'
 
 describe "IO#each_char" do
-  it_behaves_like :io_chars, :each_char
+  before :each do
+    @io = IOSpecs.io_fixture "lines.txt"
+    ScratchPad.record []
+  end
+
+  after :each do
+    @io.close unless @io.closed?
+  end
+
+  it "yields each character" do
+    @io.readline.should == "Voici la ligne une.\n"
+
+    count = 0
+    @io.each_char do |c|
+      ScratchPad << c
+      break if 4 < count += 1
+    end
+
+    ScratchPad.recorded.should == ["Q", "u", "i", " ", "è"]
+  end
+
+  describe "when no block is given" do
+    it "returns an Enumerator" do
+      enum = @io.each_char
+      enum.should.instance_of?(Enumerator)
+      enum.first(5).should == ["V", "o", "i", "c", "i"]
+    end
+
+    describe "returned Enumerator" do
+      describe "size" do
+        it "should return nil" do
+          @io.each_char.size.should == nil
+        end
+      end
+    end
+  end
+
+  it "returns itself" do
+    @io.each_char { |c| }.should.equal?(@io)
+  end
+
+  it "returns an enumerator for a closed stream" do
+    IOSpecs.closed_io.each_char.should.instance_of?(Enumerator)
+  end
+
+  it "raises an IOError when an enumerator created on a closed stream is accessed" do
+    -> { IOSpecs.closed_io.each_char.first }.should.raise(IOError)
+  end
+
+  it "raises IOError on closed stream" do
+    -> { IOSpecs.closed_io.each_char {} }.should.raise(IOError)
+  end
 end
 
 describe "IO#each_char" do
-  it_behaves_like :io_chars_empty, :each_char
+  before :each do
+    @name = tmp("io_each_char")
+    @io = new_io @name, "w+:utf-8"
+    ScratchPad.record []
+  end
+
+  after :each do
+    @io.close unless @io.closed?
+    rm_r @name
+  end
+
+  it "does not yield any characters on an empty stream" do
+    @io.each_char { |c| ScratchPad << c }
+    ScratchPad.recorded.should == []
+  end
 end