1 files changed, 58 insertions, 54 deletions
diff --git a/spec/ruby/core/string/shared/chars.rb b/spec/ruby/core/string/shared/chars.rb
index 2f7280a95f..826d403589 100644
--- a/spec/ruby/core/string/shared/chars.rb
+++ b/spec/ruby/core/string/shared/chars.rb
@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
-require File.expand_path('../../../../spec_helper', __FILE__)
-require File.expand_path('../../fixtures/classes', __FILE__)
+require_relative '../../../spec_helper'
+require_relative '../fixtures/classes'
 
 describe :string_chars, shared: true do
   it "passes each char in self to the given block" do
@@ -11,72 +11,76 @@ describe :string_chars, shared: true do
 
   it "returns self" do
     s = StringSpecs::MyString.new "hello"
-    s.send(@method){}.should equal(s)
+    s.send(@method){}.should.equal?(s)
   end
 
-
   it "is unicode aware" do
     "\303\207\342\210\202\303\251\306\222g".send(@method).to_a.should ==
       ["\303\207", "\342\210\202", "\303\251", "\306\222", "g"]
   end
 
-  with_feature :encoding do
-    it "returns characters in the same encoding as self" do
-      "&%".force_encoding('Shift_JIS').send(@method).to_a.all? {|c| c.encoding.name.should == 'Shift_JIS'}
-      "&%".encode('ASCII-8BIT').send(@method).to_a.all? {|c| c.encoding.name.should == 'ASCII-8BIT'}
-    end
+  it "returns characters in the same encoding as self" do
+    "&%".dup.force_encoding('Shift_JIS').send(@method).to_a.all? {|c| c.encoding.name.should == 'Shift_JIS'}
+    "&%".encode('BINARY').send(@method).to_a.all? {|c| c.encoding.should == Encoding::BINARY }
+  end
 
-    it "works with multibyte characters" do
-      s = "\u{8987}".force_encoding("UTF-8")
-      s.bytesize.should == 3
-      s.send(@method).to_a.should == [s]
-    end
+  it "works with multibyte characters" do
+    s = "\u{8987}".dup.force_encoding("UTF-8")
+    s.bytesize.should == 3
+    s.send(@method).to_a.should == [s]
+  end
 
-    it "works if the String's contents is invalid for its encoding" do
-      xA4 = [0xA4].pack('C')
-      xA4.force_encoding('UTF-8')
-      xA4.valid_encoding?.should be_false
-      xA4.send(@method).to_a.should == [xA4.force_encoding("UTF-8")]
-    end
+  it "works if the String's contents is invalid for its encoding" do
+    xA4 = [0xA4].pack('C')
+    xA4.force_encoding('UTF-8')
+    xA4.valid_encoding?.should == false
+    xA4.send(@method).to_a.should == [xA4.force_encoding("UTF-8")]
+  end
 
-    it "returns a different character if the String is transcoded" do
-      s = "\u{20AC}".force_encoding('UTF-8')
-      s.encode('UTF-8').send(@method).to_a.should == ["\u{20AC}".force_encoding('UTF-8')]
-      s.encode('iso-8859-15').send(@method).to_a.should == [
-        [0xA4].pack('C').force_encoding('iso-8859-15')]
-      s.encode('iso-8859-15').encode('UTF-8').send(@method).to_a.should == [
-        "\u{20AC}".force_encoding('UTF-8')]
-    end
+  it "returns a different character if the String is transcoded" do
+    s = "\u{20AC}".dup.force_encoding('UTF-8')
+    s.encode('UTF-8').send(@method).to_a.should == ["\u{20AC}".dup.force_encoding('UTF-8')]
+    s.encode('iso-8859-15').send(@method).to_a.should == [[0xA4].pack('C').force_encoding('iso-8859-15')]
+    s.encode('iso-8859-15').encode('UTF-8').send(@method).to_a.should == ["\u{20AC}".dup.force_encoding('UTF-8')]
+  end
 
-    it "uses the String's encoding to determine what characters it contains" do
-      s = "\u{24B62}"
+  it "uses the String's encoding to determine what characters it contains" do
+    s = +"\u{24B62}"
 
-      s.force_encoding('UTF-8').send(@method).to_a.should == [
-        s.force_encoding('UTF-8')
-      ]
-      s.force_encoding('BINARY').send(@method).to_a.should == [
-        [0xF0].pack('C').force_encoding('BINARY'),
-        [0xA4].pack('C').force_encoding('BINARY'),
-        [0xAD].pack('C').force_encoding('BINARY'),
-        [0xA2].pack('C').force_encoding('BINARY')
-      ]
-      s.force_encoding('SJIS').send(@method).to_a.should == [
-        [0xF0,0xA4].pack('CC').force_encoding('SJIS'),
-        [0xAD].pack('C').force_encoding('SJIS'),
-        [0xA2].pack('C').force_encoding('SJIS')
-      ]
-    end
+    s.force_encoding('UTF-8').send(@method).to_a.should == [
+      s.force_encoding('UTF-8')
+    ]
+    s.force_encoding('BINARY').send(@method).to_a.should == [
+      [0xF0].pack('C').force_encoding('BINARY'),
+      [0xA4].pack('C').force_encoding('BINARY'),
+      [0xAD].pack('C').force_encoding('BINARY'),
+      [0xA2].pack('C').force_encoding('BINARY')
+    ]
+    s.force_encoding('SJIS').send(@method).to_a.should == [
+      [0xF0,0xA4].pack('CC').force_encoding('SJIS'),
+      [0xAD].pack('C').force_encoding('SJIS'),
+      [0xA2].pack('C').force_encoding('SJIS')
+    ]
+  end
 
-    it "taints resulting strings when self is tainted" do
-      str = "hello"
+  it "returns individual chars for dummy encodings" do
+    "ab".dup.force_encoding(Encoding::UTF_7).send(@method).to_a.should == [
+      "\x61".dup.force_encoding(Encoding::UTF_7),
+      "\x62".dup.force_encoding(Encoding::UTF_7)
+    ]
 
-      str.send(@method) do |x|
-        x.tainted?.should == false
-      end
+    "abcd".dup.force_encoding(Encoding::UTF_16).send(@method).to_a.should == [
+      "\x61".dup.force_encoding(Encoding::UTF_16),
+      "\x62".dup.force_encoding(Encoding::UTF_16),
+      "\x63".dup.force_encoding(Encoding::UTF_16),
+      "\x64".dup.force_encoding(Encoding::UTF_16)
+    ]
 
-      str.dup.taint.send(@method) do |x|
-        x.tainted?.should == true
-      end
-    end
+    "abcd".dup.force_encoding(Encoding::UTF_32).send(@method).to_a.should == [
+      "\x61".dup.force_encoding(Encoding::UTF_32),
+      "\x62".dup.force_encoding(Encoding::UTF_32),
+      "\x63".dup.force_encoding(Encoding::UTF_32),
+      "\x64".dup.force_encoding(Encoding::UTF_32)
+    ]
   end
 end