4 files changed, 18 insertions, 116 deletions
diff --git a/spec/ruby/library/stringio/shared/each.rb b/spec/ruby/library/stringio/shared/each.rb
index acd8d22c14..14b0a013b3 100644
--- a/spec/ruby/library/stringio/shared/each.rb
+++ b/spec/ruby/library/stringio/shared/each.rb
@@ -36,22 +36,11 @@ describe :stringio_each_separator, shared: true do
     seen.should == ["2 1 2 1 2"]
   end
 
-  version_is StringIO::VERSION, ""..."3.0.4" do #ruby_version_is ""..."3.2" do
-    it "yields each paragraph with two separation characters when passed an empty String as separator" do
-      seen = []
-      io = StringIO.new("para1\n\npara2\n\n\npara3")
-      io.send(@method, "") {|s| seen << s}
-      seen.should == ["para1\n\n", "para2\n\n", "para3"]
-    end
-  end
-
-  version_is StringIO::VERSION, "3.0.4" do #ruby_version_is "3.2" do
-    it "yields each paragraph with all separation characters when passed an empty String as separator" do
-      seen = []
-      io = StringIO.new("para1\n\npara2\n\n\npara3")
-      io.send(@method, "") {|s| seen << s}
-      seen.should == ["para1\n\n", "para2\n\n\n", "para3"]
-    end
+  it "yields each paragraph when passed an empty String as separator" do
+    seen = []
+    io = StringIO.new("para1\n\npara2\n\n\npara3")
+    io.send(@method, "") {|s| seen << s}
+    seen.should == ["para1\n\n", "para2\n\n", "para3"]
   end
 end
 
@@ -123,41 +112,4 @@ describe :stringio_each_chomp, shared: true do
     io.send(@method, chomp: true) {|s| seen << s }
     seen.should == ["a b \rc d e", "1 2 3 4 5", "the end"]
   end
-
-  it "returns each line with removed newline characters when called without block" do
-    seen = []
-    io = StringIO.new("a b \rc d e\n1 2 3 4 5\r\nthe end")
-    enum = io.send(@method, chomp: true)
-    enum.each {|s| seen << s }
-    seen.should == ["a b \rc d e", "1 2 3 4 5", "the end"]
-  end
-end
-
-describe :stringio_each_separator_and_chomp, shared: true do
-  it "yields each line with removed separator to the passed block" do
-    seen = []
-    io = StringIO.new("a b \nc d e|1 2 3 4 5\n|the end")
-    io.send(@method, "|", chomp: true) {|s| seen << s }
-    seen.should == ["a b \nc d e", "1 2 3 4 5\n", "the end"]
-  end
-
-  it "returns each line with removed separator when called without block" do
-    seen = []
-    io = StringIO.new("a b \nc d e|1 2 3 4 5\n|the end")
-    enum = io.send(@method, "|", chomp: true)
-    enum.each {|s| seen << s }
-    seen.should == ["a b \nc d e", "1 2 3 4 5\n", "the end"]
-  end
-end
-
-describe :stringio_each_limit, shared: true do
-  before :each do
-    @io = StringIO.new("a b c d e\n1 2 3 4 5")
-  end
-
-  it "returns the data read until the limit is met" do
-    seen = []
-    @io.send(@method, 4) { |s| seen << s }
-    seen.should == ["a b ", "c d ", "e\n", "1 2 ", "3 4 ", "5"]
-  end
 end
diff --git a/spec/ruby/library/stringio/shared/read.rb b/spec/ruby/library/stringio/shared/read.rb
index 252a85d89d..c60677bba7 100644
--- a/spec/ruby/library/stringio/shared/read.rb
+++ b/spec/ruby/library/stringio/shared/read.rb
@@ -89,12 +89,6 @@ describe :stringio_read_no_arguments, shared: true do
     @io.send(@method)
     @io.pos.should eql(7)
   end
-
-  it "correctly update the current position in bytes when multi-byte characters are used" do
-    @io.print("example\u03A3") # Overwrite the original string with 8 characters containing 9 bytes.
-    @io.send(@method)
-    @io.pos.should eql(9)
-  end
 end
 
 describe :stringio_read_nil, shared: true do
diff --git a/spec/ruby/library/stringio/shared/sysread.rb b/spec/ruby/library/stringio/shared/sysread.rb
index 937bac705c..3376bd9907 100644
--- a/spec/ruby/library/stringio/shared/sysread.rb
+++ b/spec/ruby/library/stringio/shared/sysread.rb
@@ -1,4 +1,4 @@
-describe :stringio_sysread_length, shared: true do
+describe :stringio_sysread_length, :shared => true do
   before :each do
     @io = StringIO.new("example")
   end
diff --git a/spec/ruby/library/stringio/shared/write.rb b/spec/ruby/library/stringio/shared/write.rb
index aa67bb73c7..080729217b 100644
--- a/spec/ruby/library/stringio/shared/write.rb
+++ b/spec/ruby/library/stringio/shared/write.rb
@@ -45,62 +45,18 @@ describe :stringio_write_string, shared: true do
     @io.pos.should eql(4)
   end
 
-  it "handles concurrent writes correctly" do
-    @io = StringIO.new
-    n = 8
-    go = false
-    threads = n.times.map { |i|
-      Thread.new {
-        Thread.pass until go
-        @io.write i.to_s
-      }
-    }
-    go = true
-    threads.each(&:join)
-    @io.string.size.should == n.times.map(&:to_s).join.size
-  end
-
-  it "handles writing non-ASCII UTF-8 after seek" do
-    @io.binmode
-    @io << "\x80"
-    @io.pos = 0
-    @io << "\x81"
-    @io.string.should == "\x812345".b
-  end
-
-  it "handles writing with position < buffer size" do
-    @io.pos = 2
-    @io.write "abc"
-    @io.string.should == "12abc"
-
-    @io.pos = 2
-    @io.write "de"
-    @io.string.should == "12dec"
-
-    @io.pos = 2
-    @io.write "fghi"
-    @io.string.should == "12fghi"
-  end
-
-  it "transcodes the given string when the external encoding is set and neither is BINARY" do
-    utf8_str = "hello"
-    io = StringIO.new.set_encoding(Encoding::UTF_16BE)
-    io.external_encoding.should == Encoding::UTF_16BE
-
-    io.send(@method, utf8_str)
-
-    expected = [0, 104, 0, 101, 0, 108, 0, 108, 0, 111] # UTF-16BE bytes for "hello"
-    io.string.bytes.should == expected
-  end
-
-  it "does not transcode the given string when the external encoding is set and the string encoding is BINARY" do
-    str = "été".b
-    io = StringIO.new.set_encoding(Encoding::UTF_16BE)
-    io.external_encoding.should == Encoding::UTF_16BE
-
-    io.send(@method, str)
-
-    io.string.bytes.should == str.bytes
+  ruby_version_is ""..."2.7" do
+    it "taints self's String when the passed argument is tainted" do
+      @io.send(@method, "test".taint)
+      @io.string.tainted?.should be_true
+    end
+  end
+
+  ruby_version_is ""..."3.0" do
+    it "does not taint self when the passed argument is tainted" do
+      @io.send(@method, "test".taint)
+      @io.tainted?.should be_false
+    end
   end
 end