Update to ruby/spec@7de852d

1 files changed, 142 insertions, 144 deletions

diff --git a/spec/ruby/core/io/set_encoding_spec.rb b/spec/ruby/core/io/set_encoding_spec.rb
index 9875d64ab8..a9d783325c 100644
--- a/spec/ruby/core/io/set_encoding_spec.rb
+++ b/spec/ruby/core/io/set_encoding_spec.rb
@@ -1,193 +1,191 @@
 require_relative '../../spec_helper'
 
-with_feature :encoding do
-  describe :io_set_encoding_write, shared: true do
-    it "sets the encodings to nil" do
-      @io = new_io @name, "#{@object}:ibm437:ibm866"
-      @io.set_encoding nil, nil
+describe :io_set_encoding_write, shared: true do
+  it "sets the encodings to nil" do
+    @io = new_io @name, "#{@object}:ibm437:ibm866"
+    @io.set_encoding nil, nil
 
-      @io.external_encoding.should be_nil
-      @io.internal_encoding.should be_nil
-    end
+    @io.external_encoding.should be_nil
+    @io.internal_encoding.should be_nil
+  end
 
-    it "prevents the encodings from changing when Encoding defaults are changed" do
-      @io = new_io @name, "#{@object}:utf-8:us-ascii"
-      @io.set_encoding nil, nil
+  it "prevents the encodings from changing when Encoding defaults are changed" do
+    @io = new_io @name, "#{@object}:utf-8:us-ascii"
+    @io.set_encoding nil, nil
 
-      Encoding.default_external = Encoding::IBM437
-      Encoding.default_internal = Encoding::IBM866
+    Encoding.default_external = Encoding::IBM437
+    Encoding.default_internal = Encoding::IBM866
 
-      @io.external_encoding.should be_nil
-      @io.internal_encoding.should be_nil
-    end
+    @io.external_encoding.should be_nil
+    @io.internal_encoding.should be_nil
+  end
 
-    it "sets the encodings to the current Encoding defaults" do
-      @io = new_io @name, @object
+  it "sets the encodings to the current Encoding defaults" do
+    @io = new_io @name, @object
 
-      Encoding.default_external = Encoding::IBM437
-      Encoding.default_internal = Encoding::IBM866
+    Encoding.default_external = Encoding::IBM437
+    Encoding.default_internal = Encoding::IBM866
 
-      @io.set_encoding nil, nil
+    @io.set_encoding nil, nil
 
-      @io.external_encoding.should == Encoding::IBM437
-      @io.internal_encoding.should == Encoding::IBM866
-    end
+    @io.external_encoding.should == Encoding::IBM437
+    @io.internal_encoding.should == Encoding::IBM866
   end
+end
 
-  describe "IO#set_encoding when passed nil, nil" do
-    before :each do
-      @external = Encoding.default_external
-      @internal = Encoding.default_internal
+describe "IO#set_encoding when passed nil, nil" do
+  before :each do
+    @external = Encoding.default_external
+    @internal = Encoding.default_internal
 
-      Encoding.default_external = Encoding::UTF_8
-      Encoding.default_internal = nil
+    Encoding.default_external = Encoding::UTF_8
+    Encoding.default_internal = nil
 
-      @name = tmp('io_set_encoding.txt')
-      touch(@name)
-    end
+    @name = tmp('io_set_encoding.txt')
+    touch(@name)
+  end
 
-    after :each do
-      Encoding.default_external = @external
-      Encoding.default_internal = @internal
+  after :each do
+    Encoding.default_external = @external
+    Encoding.default_internal = @internal
 
-      @io.close if @io and not @io.closed?
-      rm_r @name
-    end
+    @io.close if @io and not @io.closed?
+    rm_r @name
+  end
 
-    describe "with 'r' mode" do
-      it "sets the encodings to the current Encoding defaults" do
-        @io = new_io @name, "r"
+  describe "with 'r' mode" do
+    it "sets the encodings to the current Encoding defaults" do
+      @io = new_io @name, "r"
 
-        Encoding.default_external = Encoding::IBM437
-        Encoding.default_internal = Encoding::IBM866
+      Encoding.default_external = Encoding::IBM437
+      Encoding.default_internal = Encoding::IBM866
 
-        @io.set_encoding nil, nil
-        @io.external_encoding.should equal(Encoding::IBM437)
-        @io.internal_encoding.should equal(Encoding::IBM866)
-      end
+      @io.set_encoding nil, nil
+      @io.external_encoding.should equal(Encoding::IBM437)
+      @io.internal_encoding.should equal(Encoding::IBM866)
+    end
 
-      it "prevents the #internal_encoding from changing when Encoding.default_internal is changed" do
-        @io = new_io @name, "r"
-        @io.set_encoding nil, nil
+    it "prevents the #internal_encoding from changing when Encoding.default_internal is changed" do
+      @io = new_io @name, "r"
+      @io.set_encoding nil, nil
 
-        Encoding.default_internal = Encoding::IBM437
+      Encoding.default_internal = Encoding::IBM437
 
-        @io.internal_encoding.should be_nil
-      end
+      @io.internal_encoding.should be_nil
+    end
 
-      it "allows the #external_encoding to change when Encoding.default_external is changed" do
-        @io = new_io @name, "r"
-        @io.set_encoding nil, nil
+    it "allows the #external_encoding to change when Encoding.default_external is changed" do
+      @io = new_io @name, "r"
+      @io.set_encoding nil, nil
 
-        Encoding.default_external = Encoding::IBM437
+      Encoding.default_external = Encoding::IBM437
 
-        @io.external_encoding.should equal(Encoding::IBM437)
-      end
+      @io.external_encoding.should equal(Encoding::IBM437)
     end
+  end
 
-    describe "with 'rb' mode" do
-      it "returns Encoding.default_external" do
-        @io = new_io @name, "rb"
-        @io.external_encoding.should equal(Encoding::ASCII_8BIT)
+  describe "with 'rb' mode" do
+    it "returns Encoding.default_external" do
+      @io = new_io @name, "rb"
+      @io.external_encoding.should equal(Encoding::ASCII_8BIT)
 
-        @io.set_encoding nil, nil
-        @io.external_encoding.should equal(Encoding.default_external)
-      end
+      @io.set_encoding nil, nil
+      @io.external_encoding.should equal(Encoding.default_external)
     end
+  end
 
-    describe "with 'r+' mode" do
-      it_behaves_like :io_set_encoding_write, nil, "r+"
-    end
+  describe "with 'r+' mode" do
+    it_behaves_like :io_set_encoding_write, nil, "r+"
+  end
 
-    describe "with 'w' mode" do
-      it_behaves_like :io_set_encoding_write, nil, "w"
-    end
+  describe "with 'w' mode" do
+    it_behaves_like :io_set_encoding_write, nil, "w"
+  end
 
-    describe "with 'w+' mode" do
-      it_behaves_like :io_set_encoding_write, nil, "w+"
-    end
+  describe "with 'w+' mode" do
+    it_behaves_like :io_set_encoding_write, nil, "w+"
+  end
 
-    describe "with 'a' mode" do
-      it_behaves_like :io_set_encoding_write, nil, "a"
-    end
+  describe "with 'a' mode" do
+    it_behaves_like :io_set_encoding_write, nil, "a"
+  end
 
-    describe "with 'a+' mode" do
-      it_behaves_like :io_set_encoding_write, nil, "a+"
-    end
+  describe "with 'a+' mode" do
+    it_behaves_like :io_set_encoding_write, nil, "a+"
   end
+end
 
-  describe "IO#set_encoding" do
-    before :each do
-      @name = tmp('io_set_encoding.txt')
-      touch(@name)
-      @io = new_io @name
-    end
+describe "IO#set_encoding" do
+  before :each do
+    @name = tmp('io_set_encoding.txt')
+    touch(@name)
+    @io = new_io @name
+  end
 
-    after :each do
-      @io.close unless @io.closed?
-      rm_r @name
-    end
+  after :each do
+    @io.close unless @io.closed?
+    rm_r @name
+  end
 
-    it "returns self" do
-      @io.set_encoding(Encoding::UTF_8).should equal(@io)
-    end
+  it "returns self" do
+    @io.set_encoding(Encoding::UTF_8).should equal(@io)
+  end
 
-    it "sets the external encoding when passed an Encoding argument" do
-      @io.set_encoding(Encoding::UTF_8)
-      @io.external_encoding.should == Encoding::UTF_8
-      @io.internal_encoding.should be_nil
-    end
+  it "sets the external encoding when passed an Encoding argument" do
+    @io.set_encoding(Encoding::UTF_8)
+    @io.external_encoding.should == Encoding::UTF_8
+    @io.internal_encoding.should be_nil
+  end
 
-    it "sets the external and internal encoding when passed two Encoding arguments" do
-      @io.set_encoding(Encoding::UTF_8, Encoding::UTF_16BE)
-      @io.external_encoding.should == Encoding::UTF_8
-      @io.internal_encoding.should == Encoding::UTF_16BE
-    end
+  it "sets the external and internal encoding when passed two Encoding arguments" do
+    @io.set_encoding(Encoding::UTF_8, Encoding::UTF_16BE)
+    @io.external_encoding.should == Encoding::UTF_8
+    @io.internal_encoding.should == Encoding::UTF_16BE
+  end
 
-    it "sets the external encoding when passed the name of an Encoding" do
-      @io.set_encoding("utf-8")
-      @io.external_encoding.should == Encoding::UTF_8
-      @io.internal_encoding.should be_nil
-    end
+  it "sets the external encoding when passed the name of an Encoding" do
+    @io.set_encoding("utf-8")
+    @io.external_encoding.should == Encoding::UTF_8
+    @io.internal_encoding.should be_nil
+  end
 
-    it "ignores the internal encoding if the same as external when passed Encoding objects" do
-      @io.set_encoding(Encoding::UTF_8, Encoding::UTF_8)
-      @io.external_encoding.should == Encoding::UTF_8
-      @io.internal_encoding.should be_nil
-    end
+  it "ignores the internal encoding if the same as external when passed Encoding objects" do
+    @io.set_encoding(Encoding::UTF_8, Encoding::UTF_8)
+    @io.external_encoding.should == Encoding::UTF_8
+    @io.internal_encoding.should be_nil
+  end
 
-    it "ignores the internal encoding if the same as external when passed encoding names separated by ':'" do
-      @io.set_encoding("utf-8:utf-8")
-      @io.external_encoding.should == Encoding::UTF_8
-      @io.internal_encoding.should be_nil
-    end
+  it "ignores the internal encoding if the same as external when passed encoding names separated by ':'" do
+    @io.set_encoding("utf-8:utf-8")
+    @io.external_encoding.should == Encoding::UTF_8
+    @io.internal_encoding.should be_nil
+  end
 
-    it "sets the external and internal encoding when passed the names of Encodings separated by ':'" do
-      @io.set_encoding("utf-8:utf-16be")
-      @io.external_encoding.should == Encoding::UTF_8
-      @io.internal_encoding.should == Encoding::UTF_16BE
-    end
+  it "sets the external and internal encoding when passed the names of Encodings separated by ':'" do
+    @io.set_encoding("utf-8:utf-16be")
+    @io.external_encoding.should == Encoding::UTF_8
+    @io.internal_encoding.should == Encoding::UTF_16BE
+  end
 
-    it "sets the external and internal encoding when passed two String arguments" do
-      @io.set_encoding("utf-8", "utf-16be")
-      @io.external_encoding.should == Encoding::UTF_8
-      @io.internal_encoding.should == Encoding::UTF_16BE
-    end
+  it "sets the external and internal encoding when passed two String arguments" do
+    @io.set_encoding("utf-8", "utf-16be")
+    @io.external_encoding.should == Encoding::UTF_8
+    @io.internal_encoding.should == Encoding::UTF_16BE
+  end
 
-    it "calls #to_str to convert an abject to a String" do
-      obj = mock("io_set_encoding")
-      obj.should_receive(:to_str).and_return("utf-8:utf-16be")
-      @io.set_encoding(obj)
-      @io.external_encoding.should == Encoding::UTF_8
-      @io.internal_encoding.should == Encoding::UTF_16BE
-    end
+  it "calls #to_str to convert an abject to a String" do
+    obj = mock("io_set_encoding")
+    obj.should_receive(:to_str).and_return("utf-8:utf-16be")
+    @io.set_encoding(obj)
+    @io.external_encoding.should == Encoding::UTF_8
+    @io.internal_encoding.should == Encoding::UTF_16BE
+  end
 
-    it "calls #to_str to convert the second argument to a String" do
-      obj = mock("io_set_encoding")
-      obj.should_receive(:to_str).at_least(1).times.and_return("utf-16be")
-      @io.set_encoding(Encoding::UTF_8, obj)
-      @io.external_encoding.should == Encoding::UTF_8
-      @io.internal_encoding.should == Encoding::UTF_16BE
-    end
+  it "calls #to_str to convert the second argument to a String" do
+    obj = mock("io_set_encoding")
+    obj.should_receive(:to_str).at_least(1).times.and_return("utf-16be")
+    @io.set_encoding(Encoding::UTF_8, obj)
+    @io.external_encoding.should == Encoding::UTF_8
+    @io.internal_encoding.should == Encoding::UTF_16BE
   end
 end