1 files changed, 17 insertions, 20 deletions
diff --git a/spec/ruby/core/string/encoding_spec.rb b/spec/ruby/core/string/encoding_spec.rb
index 4d17a39f29..aa0e4765ed 100644
--- a/spec/ruby/core/string/encoding_spec.rb
+++ b/spec/ruby/core/string/encoding_spec.rb
@@ -4,20 +4,21 @@ require_relative 'fixtures/iso-8859-9-encoding'
 
 describe "String#encoding" do
   it "returns an Encoding object" do
-    String.new.encoding.should be_an_instance_of(Encoding)
+    String.new.encoding.should.instance_of?(Encoding)
   end
 
   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
 
@@ -69,13 +70,13 @@ describe "String#encoding for Strings with \\u escapes" do
 
   it "returns US-ASCII if self is US-ASCII only" do
     s = "\u{40}"
-    s.ascii_only?.should be_true
+    s.ascii_only?.should == true
     s.encoding.should == Encoding::US_ASCII
   end
 
   it "returns UTF-8 if self isn't US-ASCII only" do
     s = "\u{4076}\u{619}"
-    s.ascii_only?.should be_false
+    s.ascii_only?.should == false
     s.encoding.should == Encoding::UTF_8
   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
 
@@ -121,7 +122,7 @@ describe "String#encoding for Strings with \\x escapes" do
 
   it "returns US-ASCII if self is US-ASCII only" do
     s = "\x61"
-    s.ascii_only?.should be_true
+    s.ascii_only?.should == true
     s.encoding.should == Encoding::US_ASCII
   end
 
@@ -130,7 +131,7 @@ describe "String#encoding for Strings with \\x escapes" do
     str = " "
     str.encoding.should == Encoding::US_ASCII
     str += [0xDF].pack('C')
-    str.ascii_only?.should be_false
+    str.ascii_only?.should == false
     str.encoding.should == Encoding::BINARY
   end
 
@@ -139,7 +140,7 @@ describe "String#encoding for Strings with \\x escapes" do
   it "returns the source encoding when an escape creates a byte with the 8th bit set if the source encoding isn't US-ASCII" do
     fixture  = StringSpecs::ISO88599Encoding.new
     fixture.source_encoding.should == Encoding::ISO8859_9
-    fixture.x_escape.ascii_only?.should be_false
+    fixture.x_escape.ascii_only?.should == false
     fixture.x_escape.encoding.should == Encoding::ISO8859_9
   end
 
@@ -172,16 +173,12 @@ describe "String#encoding for Strings with \\x escapes" do
   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