1 files changed, 59 insertions, 61 deletions
diff --git a/spec/ruby/core/encoding/default_internal_spec.rb b/spec/ruby/core/encoding/default_internal_spec.rb
index 5ff475454b..38aef9dce9 100644
--- a/spec/ruby/core/encoding/default_internal_spec.rb
+++ b/spec/ruby/core/encoding/default_internal_spec.rb
@@ -1,76 +1,74 @@
 require_relative '../../spec_helper'
 
-with_feature :encoding do
-  describe "Encoding.default_internal" do
-    before :each do
-      @original_encoding = Encoding.default_internal
-    end
-
-    after :each do
-      Encoding.default_internal = @original_encoding
-    end
-
-    it "is nil by default" do
-      Encoding.default_internal.should be_nil
-    end
-
-    it "returns an Encoding object if a default internal encoding is set" do
-      Encoding.default_internal = Encoding::ASCII
-      Encoding.default_internal.should be_an_instance_of(Encoding)
-    end
-
-    it "returns nil if no default internal encoding is set" do
-      Encoding.default_internal = nil
-      Encoding.default_internal.should be_nil
-    end
-
-    it "returns the default internal encoding" do
-      Encoding.default_internal = Encoding::ASCII_8BIT
-      Encoding.default_internal.should == Encoding::ASCII_8BIT
-    end
+describe "Encoding.default_internal" do
+  before :each do
+    @original_encoding = Encoding.default_internal
   end
 
-  describe "Encoding.default_internal=" do
-    before :each do
-      @original_encoding = Encoding.default_internal
-    end
+  after :each do
+    Encoding.default_internal = @original_encoding
+  end
+
+  it "is nil by default" do
+    Encoding.default_internal.should == nil
+  end
+
+  it "returns an Encoding object if a default internal encoding is set" do
+    Encoding.default_internal = Encoding::ASCII
+    Encoding.default_internal.should.instance_of?(Encoding)
+  end
+
+  it "returns nil if no default internal encoding is set" do
+    Encoding.default_internal = nil
+    Encoding.default_internal.should == nil
+  end
+
+  it "returns the default internal encoding" do
+    Encoding.default_internal = Encoding::BINARY
+    Encoding.default_internal.should == Encoding::BINARY
+  end
+end
 
-    after :each do
-      Encoding.default_internal = @original_encoding
-    end
+describe "Encoding.default_internal=" do
+  before :each do
+    @original_encoding = Encoding.default_internal
+  end
 
-    it "sets the default internal encoding" do
-      Encoding.default_internal = Encoding::SHIFT_JIS
-      Encoding.default_internal.should == Encoding::SHIFT_JIS
-    end
+  after :each do
+    Encoding.default_internal = @original_encoding
+  end
 
-    it "can accept a name of an encoding as a String" do
-      Encoding.default_internal = 'Shift_JIS'
-      Encoding.default_internal.should == Encoding::SHIFT_JIS
-    end
+  it "sets the default internal encoding" do
+    Encoding.default_internal = Encoding::SHIFT_JIS
+    Encoding.default_internal.should == Encoding::SHIFT_JIS
+  end
 
-    it "calls #to_str to convert an object to a String" do
-      obj = mock('string')
-      obj.should_receive(:to_str).at_least(1).times.and_return('ascii')
+  it "can accept a name of an encoding as a String" do
+    Encoding.default_internal = 'Shift_JIS'
+    Encoding.default_internal.should == Encoding::SHIFT_JIS
+  end
 
-      Encoding.default_internal = obj
-      Encoding.default_internal.should == Encoding::ASCII
-    end
+  it "calls #to_str to convert an object to a String" do
+    obj = mock('string')
+    obj.should_receive(:to_str).at_least(1).times.and_return('ascii')
 
-    it "raises a TypeError if #to_str does not return a String" do
-      obj = mock('string')
-      obj.should_receive(:to_str).at_least(1).times.and_return(1)
+    Encoding.default_internal = obj
+    Encoding.default_internal.should == Encoding::ASCII
+  end
+
+  it "raises a TypeError if #to_str does not return a String" do
+    obj = mock('string')
+    obj.should_receive(:to_str).at_least(1).times.and_return(1)
 
-      lambda { Encoding.default_internal = obj }.should raise_error(TypeError)
-    end
+    -> { Encoding.default_internal = obj }.should.raise(TypeError)
+  end
 
-    it "raises a TypeError when passed an object not providing #to_str" do
-      lambda { Encoding.default_internal = mock("encoding") }.should raise_error(TypeError)
-    end
+  it "raises a TypeError when passed an object not providing #to_str" do
+    -> { Encoding.default_internal = mock("encoding") }.should.raise(TypeError)
+  end
 
-    it "accepts an argument of nil to unset the default internal encoding" do
-      Encoding.default_internal = nil
-      Encoding.default_internal.should be_nil
-    end
+  it "accepts an argument of nil to unset the default internal encoding" do
+    Encoding.default_internal = nil
+    Encoding.default_internal.should == nil
   end
 end