1 files changed, 52 insertions, 54 deletions
diff --git a/spec/ruby/core/string/force_encoding_spec.rb b/spec/ruby/core/string/force_encoding_spec.rb
index 06e04b8d95..83641a37b4 100644
--- a/spec/ruby/core/string/force_encoding_spec.rb
+++ b/spec/ruby/core/string/force_encoding_spec.rb
@@ -1,73 +1,71 @@
 require_relative '../../spec_helper'
 
-with_feature :encoding do
-  describe "String#force_encoding" do
-    it "accepts a String as the name of an Encoding" do
-      "abc".force_encoding('shift_jis').encoding.should == Encoding::Shift_JIS
-    end
-
-    describe "with a special encoding name" do
-      before :each do
-        @original_encoding = Encoding.default_internal
-      end
+describe "String#force_encoding" do
+  it "accepts a String as the name of an Encoding" do
+    "abc".force_encoding('shift_jis').encoding.should == Encoding::Shift_JIS
+  end
 
-      after :each do
-        Encoding.default_internal = @original_encoding
-      end
+  describe "with a special encoding name" do
+    before :each do
+      @original_encoding = Encoding.default_internal
+    end
 
-      it "accepts valid special encoding names" do
-        Encoding.default_internal = "US-ASCII"
-        "abc".force_encoding("internal").encoding.should == Encoding::US_ASCII
-      end
+    after :each do
+      Encoding.default_internal = @original_encoding
+    end
 
-      it "defaults to ASCII-8BIT if special encoding name is not set" do
-        Encoding.default_internal = nil
-        "abc".force_encoding("internal").encoding.should == Encoding::ASCII_8BIT
-      end
+    it "accepts valid special encoding names" do
+      Encoding.default_internal = "US-ASCII"
+      "abc".force_encoding("internal").encoding.should == Encoding::US_ASCII
     end
 
-    it "accepts an Encoding instance" do
-      "abc".force_encoding(Encoding::SHIFT_JIS).encoding.should == Encoding::Shift_JIS
+    it "defaults to ASCII-8BIT if special encoding name is not set" do
+      Encoding.default_internal = nil
+      "abc".force_encoding("internal").encoding.should == Encoding::ASCII_8BIT
     end
+  end
 
-    it "calls #to_str to convert an object to an encoding name" do
-      obj = mock("force_encoding")
-      obj.should_receive(:to_str).and_return("utf-8")
+  it "accepts an Encoding instance" do
+    "abc".force_encoding(Encoding::SHIFT_JIS).encoding.should == Encoding::Shift_JIS
+  end
 
-      "abc".force_encoding(obj).encoding.should == Encoding::UTF_8
-    end
+  it "calls #to_str to convert an object to an encoding name" do
+    obj = mock("force_encoding")
+    obj.should_receive(:to_str).and_return("utf-8")
 
-    it "raises a TypeError if #to_str does not return a String" do
-      obj = mock("force_encoding")
-      obj.should_receive(:to_str).and_return(1)
+    "abc".force_encoding(obj).encoding.should == Encoding::UTF_8
+  end
 
-      lambda { "abc".force_encoding(obj) }.should raise_error(TypeError)
-    end
+  it "raises a TypeError if #to_str does not return a String" do
+    obj = mock("force_encoding")
+    obj.should_receive(:to_str).and_return(1)
 
-    it "raises a TypeError if passed nil" do
-      lambda { "abc".force_encoding(nil) }.should raise_error(TypeError)
-    end
+    lambda { "abc".force_encoding(obj) }.should raise_error(TypeError)
+  end
 
-    it "returns self" do
-      str = "abc"
-      str.force_encoding('utf-8').should equal(str)
-    end
+  it "raises a TypeError if passed nil" do
+    lambda { "abc".force_encoding(nil) }.should raise_error(TypeError)
+  end
 
-    it "sets the encoding even if the String contents are invalid in that encoding" do
-      str = "\u{9765}"
-      str.force_encoding('euc-jp')
-      str.encoding.should == Encoding::EUC_JP
-      str.valid_encoding?.should be_false
-    end
+  it "returns self" do
+    str = "abc"
+    str.force_encoding('utf-8').should equal(str)
+  end
 
-    it "does not transcode self" do
-      str = "\u{8612}"
-      str.dup.force_encoding('utf-16le').should_not == str.encode('utf-16le')
-    end
+  it "sets the encoding even if the String contents are invalid in that encoding" do
+    str = "\u{9765}"
+    str.force_encoding('euc-jp')
+    str.encoding.should == Encoding::EUC_JP
+    str.valid_encoding?.should be_false
+  end
 
-    it "raises a #{frozen_error_class} if self is frozen" do
-      str = "abcd".freeze
-      lambda { str.force_encoding(str.encoding) }.should raise_error(frozen_error_class)
-    end
+  it "does not transcode self" do
+    str = "\u{8612}"
+    str.dup.force_encoding('utf-16le').should_not == str.encode('utf-16le')
+  end
+
+  it "raises a #{frozen_error_class} if self is frozen" do
+    str = "abcd".freeze
+    lambda { str.force_encoding(str.encoding) }.should raise_error(frozen_error_class)
   end
 end