1 files changed, 15 insertions, 18 deletions
diff --git a/spec/ruby/core/string/encoding_spec.rb b/spec/ruby/core/string/encoding_spec.rb
index 6182e8eb50..f6e8fd3470 100644
--- a/spec/ruby/core/string/encoding_spec.rb
+++ b/spec/ruby/core/string/encoding_spec.rb
@@ -10,14 +10,15 @@ describe "String#encoding" do
   it "is equal to the source encoding by default" do
     s = StringSpecs::ISO88599Encoding.new
     s.cedilla.encoding.should == s.source_encoding
+    s.cedilla.encode("utf-8").should == 350.chr(Encoding::UTF_8) # S-cedilla
   end
 
   it "returns the given encoding if #force_encoding has been called" do
-    "a".force_encoding(Encoding::SHIFT_JIS).encoding.should == Encoding::SHIFT_JIS
+    "a".dup.force_encoding(Encoding::SHIFT_JIS).encoding.should == Encoding::SHIFT_JIS
   end
 
   it "returns the given encoding if #encode!has been called" do
-    "a".encode!(Encoding::SHIFT_JIS).encoding.should == Encoding::SHIFT_JIS
+    "a".dup.encode!(Encoding::SHIFT_JIS).encoding.should == Encoding::SHIFT_JIS
   end
 end
 
@@ -107,13 +108,13 @@ describe "String#encoding for Strings with \\u escapes" do
   end
 
   it "returns the given encoding if #force_encoding has been called" do
-    "\u{20}".force_encoding(Encoding::SHIFT_JIS).encoding.should == Encoding::SHIFT_JIS
-    "\u{2020}".force_encoding(Encoding::SHIFT_JIS).encoding.should == Encoding::SHIFT_JIS
+    "\u{20}".dup.force_encoding(Encoding::SHIFT_JIS).encoding.should == Encoding::SHIFT_JIS
+    "\u{2020}".dup.force_encoding(Encoding::SHIFT_JIS).encoding.should == Encoding::SHIFT_JIS
   end
 
   it "returns the given encoding if #encode!has been called" do
-    "\u{20}".encode!(Encoding::SHIFT_JIS).encoding.should == Encoding::SHIFT_JIS
-    "\u{2020}".encode!(Encoding::SHIFT_JIS).encoding.should == Encoding::SHIFT_JIS
+    "\u{20}".dup.encode!(Encoding::SHIFT_JIS).encoding.should == Encoding::SHIFT_JIS
+    "\u{2020}".dup.encode!(Encoding::SHIFT_JIS).encoding.should == Encoding::SHIFT_JIS
   end
 end
 
@@ -125,13 +126,13 @@ describe "String#encoding for Strings with \\x escapes" do
     s.encoding.should == Encoding::US_ASCII
   end
 
-  it "returns ASCII-8BIT when an escape creates a byte with the 8th bit set if the source encoding is US-ASCII" do
+  it "returns BINARY when an escape creates a byte with the 8th bit set if the source encoding is US-ASCII" do
     __ENCODING__.should == Encoding::US_ASCII
     str = " "
     str.encoding.should == Encoding::US_ASCII
     str += [0xDF].pack('C')
     str.ascii_only?.should be_false
-    str.encoding.should == Encoding::ASCII_8BIT
+    str.encoding.should == Encoding::BINARY
   end
 
   # TODO: Deal with case when the byte in question isn't valid in the source
@@ -155,7 +156,7 @@ describe "String#encoding for Strings with \\x escapes" do
     default_external = Encoding.default_external
     Encoding.default_external = Encoding::SHIFT_JIS
     "\x50".encoding.should == Encoding::US_ASCII
-    [0xD4].pack('C').encoding.should == Encoding::ASCII_8BIT
+    [0xD4].pack('C').encoding.should == Encoding::BINARY
     Encoding.default_external = default_external
   end
 
@@ -166,22 +167,18 @@ describe "String#encoding for Strings with \\x escapes" do
     Encoding.default_external = Encoding::SHIFT_JIS
     x50 = "\x50"
     x50.encoding.should == Encoding::US_ASCII
-    [0xD4].pack('C').encoding.should == Encoding::ASCII_8BIT
+    [0xD4].pack('C').encoding.should == Encoding::BINARY
     Encoding.default_external = default_external
     Encoding.default_internal = default_internal
   end
 
   it "returns the given encoding if #force_encoding has been called" do
-    x50 = "\x50"
-    x50.force_encoding(Encoding::SHIFT_JIS).encoding.should == Encoding::SHIFT_JIS
-    xD4 = [212].pack('C')
-    xD4.force_encoding(Encoding::ISO_8859_9).encoding.should == Encoding::ISO_8859_9
+    "\x50".dup.force_encoding(Encoding::SHIFT_JIS).encoding.should == Encoding::SHIFT_JIS
+    [212].pack('C').force_encoding(Encoding::ISO_8859_9).encoding.should == Encoding::ISO_8859_9
   end
 
   it "returns the given encoding if #encode!has been called" do
-    x50 = "\x50"
-    x50.encode!(Encoding::SHIFT_JIS).encoding.should == Encoding::SHIFT_JIS
-    x00 = "x\00"
-    x00.encode!(Encoding::UTF_8).encoding.should == Encoding::UTF_8
+    "\x50".dup.encode!(Encoding::SHIFT_JIS).encoding.should == Encoding::SHIFT_JIS
+    "x\00".dup.encode!(Encoding::UTF_8).encoding.should == Encoding::UTF_8
   end
 end