Update to ruby/spec@30e1c35

8 files changed, 1 insertions, 175 deletions

diff --git a/spec/ruby/library/stringio/append_spec.rb b/spec/ruby/library/stringio/append_spec.rb
index 981229fc10..5383e3e795 100644
--- a/spec/ruby/library/stringio/append_spec.rb
+++ b/spec/ruby/library/stringio/append_spec.rb
@@ -29,13 +29,6 @@ describe "StringIO#<< when passed [Object]" do
     @io.string.should == "example\000\000\000\000\000\000\000\000just testing"
   end
 
-  ruby_version_is ""..."3.0" do
-    it "does not taint self when the passed argument is tainted" do
-      (@io << "test".taint)
-      @io.tainted?.should be_false
-    end
-  end
-
   it "updates self's position" do
     @io << "test"
     @io.pos.should eql(4)
diff --git a/spec/ruby/library/stringio/bytes_spec.rb b/spec/ruby/library/stringio/bytes_spec.rb
deleted file mode 100644
index 4ef7a490a5..0000000000
--- a/spec/ruby/library/stringio/bytes_spec.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-require_relative '../../spec_helper'
-require 'stringio'
-require_relative 'shared/each_byte'
-
-ruby_version_is ''...'3.0' do
-  describe "StringIO#bytes" do
-    before :each do
-      @verbose, $VERBOSE = $VERBOSE, nil
-    end
-
-    after :each do
-      $VERBOSE = @verbose
-    end
-
-    it_behaves_like :stringio_each_byte, :bytes
-  end
-
-  describe "StringIO#bytes when self is not readable" do
-    before :each do
-      @verbose, $VERBOSE = $VERBOSE, nil
-    end
-
-    after :each do
-      $VERBOSE = @verbose
-    end
-
-    it_behaves_like :stringio_each_byte_not_readable, :bytes
-  end
-end
diff --git a/spec/ruby/library/stringio/chars_spec.rb b/spec/ruby/library/stringio/chars_spec.rb
deleted file mode 100644
index 58cba77634..0000000000
--- a/spec/ruby/library/stringio/chars_spec.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-require_relative '../../spec_helper'
-require 'stringio'
-require_relative 'shared/each_char'
-
-ruby_version_is ''...'3.0' do
-  describe "StringIO#chars" do
-    before :each do
-      @verbose, $VERBOSE = $VERBOSE, nil
-    end
-
-    after :each do
-      $VERBOSE = @verbose
-    end
-
-    it_behaves_like :stringio_each_char, :chars
-  end
-
-  describe "StringIO#chars when self is not readable" do
-    before :each do
-      @verbose, $VERBOSE = $VERBOSE, nil
-    end
-
-    after :each do
-      $VERBOSE = @verbose
-    end
-
-    it_behaves_like :stringio_each_char_not_readable, :chars
-  end
-end
diff --git a/spec/ruby/library/stringio/codepoints_spec.rb b/spec/ruby/library/stringio/codepoints_spec.rb
deleted file mode 100644
index ceaadefc32..0000000000
--- a/spec/ruby/library/stringio/codepoints_spec.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-# -*- encoding: utf-8 -*-
-require_relative '../../spec_helper'
-require_relative 'fixtures/classes'
-require_relative 'shared/codepoints'
-
-ruby_version_is ''...'3.0' do
-  # See redmine #1667
-  describe "StringIO#codepoints" do
-    before :each do
-      @verbose, $VERBOSE = $VERBOSE, nil
-    end
-
-    after :each do
-      $VERBOSE = @verbose
-    end
-
-    it_behaves_like :stringio_codepoints, :codepoints
-  end
-end
diff --git a/spec/ruby/library/stringio/lines_spec.rb b/spec/ruby/library/stringio/lines_spec.rb
deleted file mode 100644
index 42d11772ae..0000000000
--- a/spec/ruby/library/stringio/lines_spec.rb
+++ /dev/null
@@ -1,53 +0,0 @@
-require_relative '../../spec_helper'
-require 'stringio'
-require_relative 'shared/each'
-
-ruby_version_is ''...'3.0' do
-  describe "StringIO#lines when passed a separator" do
-    before :each do
-      @verbose, $VERBOSE = $VERBOSE, nil
-    end
-
-    after :each do
-      $VERBOSE = @verbose
-    end
-
-    it_behaves_like :stringio_each_separator, :lines
-  end
-
-  describe "StringIO#lines when passed no arguments" do
-    before :each do
-      @verbose, $VERBOSE = $VERBOSE, nil
-    end
-
-    after :each do
-      $VERBOSE = @verbose
-    end
-
-    it_behaves_like :stringio_each_no_arguments, :lines
-  end
-
-  describe "StringIO#lines when self is not readable" do
-    before :each do
-      @verbose, $VERBOSE = $VERBOSE, nil
-    end
-
-    after :each do
-      $VERBOSE = @verbose
-    end
-
-    it_behaves_like :stringio_each_not_readable, :lines
-  end
-
-  describe "StringIO#lines when passed chomp" do
-    before :each do
-      @verbose, $VERBOSE = $VERBOSE, nil
-    end
-
-    after :each do
-      $VERBOSE = @verbose
-    end
-
-    it_behaves_like :stringio_each_chomp, :lines
-  end
-end
diff --git a/spec/ruby/library/stringio/reopen_spec.rb b/spec/ruby/library/stringio/reopen_spec.rb
index 4863a5332b..9851c5b706 100644
--- a/spec/ruby/library/stringio/reopen_spec.rb
+++ b/spec/ruby/library/stringio/reopen_spec.rb
@@ -23,17 +23,6 @@ describe "StringIO#reopen when passed [Object, Integer]" do
     @io.string.should == "reopened, another time"
   end
 
-  ruby_version_is ""..."3.0" do
-    # NOTE: WEIRD!
-    it "does not taint self when the passed Object was tainted" do
-      @io.reopen("reopened".taint, IO::RDONLY)
-      @io.tainted?.should be_false
-
-      @io.reopen("reopened".taint, IO::WRONLY)
-      @io.tainted?.should be_false
-    end
-  end
-
   it "tries to convert the passed Object to a String using #to_str" do
     obj = mock("to_str")
     obj.should_receive(:to_str).and_return("to_str")
@@ -92,17 +81,6 @@ describe "StringIO#reopen when passed [Object, Object]" do
     str.should == ""
   end
 
-  ruby_version_is ""..."3.0" do
-    # NOTE: WEIRD!
-    it "does not taint self when the passed Object was tainted" do
-      @io.reopen("reopened".taint, "r")
-      @io.tainted?.should be_false
-
-      @io.reopen("reopened".taint, "w")
-      @io.tainted?.should be_false
-    end
-  end
-
   it "tries to convert the passed Object to a String using #to_str" do
     obj = mock("to_str")
     obj.should_receive(:to_str).and_return("to_str")
@@ -164,14 +142,6 @@ describe "StringIO#reopen when passed [String]" do
     @io.string.should == "reopened"
   end
 
-  ruby_version_is ""..."3.0" do
-    # NOTE: WEIRD!
-    it "does not taint self when the passed Object was tainted" do
-      @io.reopen("reopened".taint)
-      @io.tainted?.should be_false
-    end
-  end
-
   it "resets self's position to 0" do
     @io.read(5)
     @io.reopen("reopened")
diff --git a/spec/ruby/library/stringio/shared/sysread.rb b/spec/ruby/library/stringio/shared/sysread.rb
index 3376bd9907..937bac705c 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 b91e6ecec1..aa67bb73c7 100644
--- a/spec/ruby/library/stringio/shared/write.rb
+++ b/spec/ruby/library/stringio/shared/write.rb
@@ -60,13 +60,6 @@ describe :stringio_write_string, shared: true do
     @io.string.size.should == n.times.map(&:to_s).join.size
   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
-
   it "handles writing non-ASCII UTF-8 after seek" do
     @io.binmode
     @io << "\x80"