Update to ruby/spec@3affe1e

author: Benoit Daloze <[email protected]> 2022-04-25 14:53:54 +0200
committer: Benoit Daloze <[email protected]> 2022-04-25 14:53:54 +0200
commit: 45cf4f218728a15eb36d14a6c9912086525f5e3f (patch)
tree: 2aa93fadcb904c226f722dde47827098b87a9846 /spec/ruby/core/string/shared
parent: 6ae81d49b52563a6720d666a6118ffa6e484f398 (diff)
7 files changed, 6 insertions, 201 deletions
diff --git a/spec/ruby/core/string/shared/chars.rb b/spec/ruby/core/string/shared/chars.rb
index 1f045e4530..e9fdf89fd6 100644
--- a/spec/ruby/core/string/shared/chars.rb
+++ b/spec/ruby/core/string/shared/chars.rb
@@ -63,18 +63,4 @@ describe :string_chars, shared: true do
       [0xA2].pack('C').force_encoding('SJIS')
     ]
   end
-
-  ruby_version_is ''...'2.7' do
-    it "taints resulting strings when self is tainted" do
-      str = "hello"
-
-      str.send(@method) do |x|
-        x.should_not.tainted?
-      end
-
-      str.dup.taint.send(@method) do |x|
-        x.should.tainted?
-      end
-    end
-  end
 end
diff --git a/spec/ruby/core/string/shared/concat.rb b/spec/ruby/core/string/shared/concat.rb
index d6ffad7d4d..54ac1035d3 100644
--- a/spec/ruby/core/string/shared/concat.rb
+++ b/spec/ruby/core/string/shared/concat.rb
@@ -39,18 +39,6 @@ describe :string_concat, shared: true do
     str.should be_an_instance_of(StringSpecs::MyString)
   end
 
-  ruby_version_is ''...'2.7' do
-    it "taints self if other is tainted" do
-      "x".send(@method, "".taint).should.tainted?
-      "x".send(@method, "y".taint).should.tainted?
-    end
-
-    it "untrusts self if other is untrusted" do
-      "x".send(@method, "".untrust).should.untrusted?
-      "x".send(@method, "y".untrust).should.untrusted?
-    end
-  end
-
   describe "with Integer" do
     it "concatenates the argument interpreted as a codepoint" do
       b = "".send(@method, 33)
diff --git a/spec/ruby/core/string/shared/each_line.rb b/spec/ruby/core/string/shared/each_line.rb
index f9c910596a..bfedf8f35a 100644
--- a/spec/ruby/core/string/shared/each_line.rb
+++ b/spec/ruby/core/string/shared/each_line.rb
@@ -40,14 +40,6 @@ describe :string_each_line, shared: true do
     b.should == ["foo\n", "🤡🤡🤡🤡🤡🤡🤡\n", "bar\n", "baz\n"]
   end
 
-  ruby_version_is ''...'2.7' do
-    it "taints substrings that are passed to the block if self is tainted" do
-      "one\ntwo\r\nthree".taint.send(@method) { |s| s.should.tainted? }
-
-      "x.y.".send(@method, ".".taint) { |s| s.should_not.tainted? }
-    end
-  end
-
   it "passes self as a whole to the block if the separator is nil" do
     a = []
     "one\ntwo\r\nthree".send(@method, nil) { |s| a << s }
diff --git a/spec/ruby/core/string/shared/replace.rb b/spec/ruby/core/string/shared/replace.rb
index 8dfac49f02..a5108d9e7c 100644
--- a/spec/ruby/core/string/shared/replace.rb
+++ b/spec/ruby/core/string/shared/replace.rb
@@ -10,36 +10,6 @@ describe :string_replace, shared: true do
     a.should == "another string"
   end
 
-  ruby_version_is ''...'2.7' do
-    it "taints self if other is tainted" do
-      a = ""
-      b = "".taint
-      a.send(@method, b)
-      a.should.tainted?
-    end
-
-    it "does not untaint self if other is untainted" do
-      a = "".taint
-      b = ""
-      a.send(@method, b)
-      a.should.tainted?
-    end
-
-    it "untrusts self if other is untrusted" do
-      a = ""
-      b = "".untrust
-      a.send(@method, b)
-      a.should.untrusted?
-    end
-
-    it "does not trust self if other is trusted" do
-      a = "".untrust
-      b = ""
-      a.send(@method, b)
-      a.should.untrusted?
-    end
-  end
-
   it "replaces the encoding of self with that of other" do
     a = "".encode("UTF-16LE")
     b = "".encode("UTF-8")
diff --git a/spec/ruby/core/string/shared/slice.rb b/spec/ruby/core/string/shared/slice.rb
index 1db8fd6730..228af5f824 100644
--- a/spec/ruby/core/string/shared/slice.rb
+++ b/spec/ruby/core/string/shared/slice.rb
@@ -80,17 +80,6 @@ describe :string_slice_index_length, shared: true do
     "hello there".send(@method, -3,2).should == "er"
   end
 
-  ruby_version_is ''...'2.7' do
-    it "always taints resulting strings when self is tainted" do
-      str = "hello world"
-      str.taint
-
-      str.send(@method, 0,0).should.tainted?
-      str.send(@method, 0,1).should.tainted?
-      str.send(@method, 2,1).should.tainted?
-    end
-  end
-
   it "returns a string with the same encoding" do
     s = "hello there"
     s.send(@method, 1, 9).encoding.should == s.encoding
@@ -249,20 +238,6 @@ describe :string_slice_range, shared: true do
     "x".send(@method, 1...-1).should == ""
   end
 
-  ruby_version_is ''...'2.7' do
-    it "always taints resulting strings when self is tainted" do
-      str = "hello world"
-      str.taint
-
-      str.send(@method, 0..0).should.tainted?
-      str.send(@method, 0...0).should.tainted?
-      str.send(@method, 0..1).should.tainted?
-      str.send(@method, 0...1).should.tainted?
-      str.send(@method, 2..3).should.tainted?
-      str.send(@method, 2..0).should.tainted?
-    end
-  end
-
   ruby_version_is ''...'3.0' do
     it "returns subclass instances" do
       s = StringSpecs::MyString.new("hello")
@@ -334,14 +309,12 @@ describe :string_slice_range, shared: true do
     "hello there".send(@method, eval("(-4...)")).should == "here"
   end
 
-  ruby_version_is "2.7" do
-    it "works with beginless ranges" do
-      "hello there".send(@method, eval("(..5)")).should == "hello "
-      "hello there".send(@method, eval("(...5)")).should == "hello"
-      "hello there".send(@method, eval("(..-4)")).should == "hello th"
-      "hello there".send(@method, eval("(...-4)")).should == "hello t"
-      "hello there".send(@method, eval("(...nil)")).should == "hello there"
-    end
+  it "works with beginless ranges" do
+    "hello there".send(@method, (..5)).should == "hello "
+    "hello there".send(@method, (...5)).should == "hello"
+    "hello there".send(@method, (..-4)).should == "hello th"
+    "hello there".send(@method, (...-4)).should == "hello t"
+    "hello there".send(@method, (...nil)).should == "hello there"
   end
 end
 
@@ -356,26 +329,6 @@ describe :string_slice_regexp, shared: true do
   end
 
   not_supported_on :opal do
-    ruby_version_is ''...'2.7' do
-      it "always taints resulting strings when self or regexp is tainted" do
-        strs = ["hello world"]
-        strs += strs.map { |s| s.dup.taint }
-
-        strs.each do |str|
-          str.send(@method, //).tainted?.should == str.tainted?
-          str.send(@method, /hello/).tainted?.should == str.tainted?
-
-          tainted_re = /./
-          tainted_re.taint
-
-          str.send(@method, tainted_re).should.tainted?
-        end
-      end
-
-      it "returns an untrusted string if the regexp is untrusted" do
-        "hello".send(@method, /./.untrust).untrusted?.should be_true
-      end
-    end
   end
 
   ruby_version_is ''...'3.0' do
@@ -418,36 +371,6 @@ describe :string_slice_regexp_index, shared: true do
     "har".send(@method, /(.)(.)(.)/, -3).should == "h"
   end
 
-  ruby_version_is ''...'2.7' do
-    it "always taints resulting strings when self or regexp is tainted" do
-      strs = ["hello world"]
-      strs += strs.map { |s| s.dup.taint }
-
-      strs.each do |str|
-        str.send(@method, //, 0).tainted?.should == str.tainted?
-        str.send(@method, /hello/, 0).tainted?.should == str.tainted?
-
-        str.send(@method, /(.)(.)(.)/, 0).tainted?.should == str.tainted?
-        str.send(@method, /(.)(.)(.)/, 1).tainted?.should == str.tainted?
-        str.send(@method, /(.)(.)(.)/, -1).tainted?.should == str.tainted?
-        str.send(@method, /(.)(.)(.)/, -2).tainted?.should == str.tainted?
-
-        tainted_re = /(.)(.)(.)/
-        tainted_re.taint
-
-        str.send(@method, tainted_re, 0).should.tainted?
-        str.send(@method, tainted_re, 1).should.tainted?
-        str.send(@method, tainted_re, -1).should.tainted?
-      end
-    end
-
-    not_supported_on :opal do
-      it "returns an untrusted string if the regexp is untrusted" do
-        "hello".send(@method, /(.)/.untrust, 1).untrusted?.should be_true
-      end
-    end
-  end
-
   it "returns nil if there is no match" do
     "hello there".send(@method, /(what?)/, 1).should == nil
   end
@@ -510,21 +433,6 @@ describe :string_slice_string, shared: true do
     "hello there".send(@method, s).should == s
   end
 
-  ruby_version_is ''...'2.7' do
-    it "taints resulting strings when other is tainted" do
-      strs = ["", "hello world", "hello"]
-      strs += strs.map { |s| s.dup.taint }
-
-      strs.each do |str|
-        strs.each do |other|
-          r = str.send(@method, other)
-
-          r.tainted?.should == !r.nil? & other.tainted?
-        end
-      end
-    end
-  end
-
   it "doesn't set $~" do
     $~ = nil
 
@@ -584,30 +492,6 @@ describe :string_slice_regexp_group, shared: true do
       "hello there".send(@method, /(?<g>h(?<g>.))/, 'g').should == "e"
     end
 
-    ruby_version_is ''...'2.7' do
-      it "always taints resulting strings when self or regexp is tainted" do
-        strs = ["hello world"]
-        strs += strs.map { |s| s.dup.taint }
-
-        strs.each do |str|
-          str.send(@method, /(?<hi>hello)/, 'hi').tainted?.should == str.tainted?
-
-          str.send(@method, /(?<g>(.)(.)(.))/, 'g').tainted?.should == str.tainted?
-          str.send(@method, /(?<h>.)(.)(.)/, 'h').tainted?.should == str.tainted?
-          str.send(@method, /(.)(?<a>.)(.)/, 'a').tainted?.should == str.tainted?
-          str.send(@method, /(.)(.)(?<r>.)/, 'r').tainted?.should == str.tainted?
-          str.send(@method, /(?<h>.)(?<a>.)(?<r>.)/, 'r').tainted?.should == str.tainted?
-
-          tainted_re = /(?<a>.)(?<b>.)(?<c>.)/
-          tainted_re.taint
-
-          str.send(@method, tainted_re, 'a').tainted?.should be_true
-          str.send(@method, tainted_re, 'b').tainted?.should be_true
-          str.send(@method, tainted_re, 'c').tainted?.should be_true
-        end
-      end
-    end
-
     it "returns nil if there is no match" do
       "hello there".send(@method, /(?<whut>what?)/, 'whut').should be_nil
     end
diff --git a/spec/ruby/core/string/shared/succ.rb b/spec/ruby/core/string/shared/succ.rb
index 25602103b6..66edf6dc82 100644
--- a/spec/ruby/core/string/shared/succ.rb
+++ b/spec/ruby/core/string/shared/succ.rb
@@ -74,14 +74,6 @@ describe :string_succ, shared: true do
       StringSpecs::MyString.new("z").send(@method).should be_an_instance_of(String)
     end
   end
-
-  ruby_version_is ''...'2.7' do
-    it "taints the result if self is tainted" do
-      ["", "a", "z", "Z", "9", "\xFF", "\xFF\xFF"].each do |s|
-        s.taint.send(@method).should.tainted?
-      end
-    end
-  end
 end
 
 describe :string_succ_bang, shared: true do
diff --git a/spec/ruby/core/string/shared/to_s.rb b/spec/ruby/core/string/shared/to_s.rb
index b8c9b8ab44..4b87a6cbe1 100644
--- a/spec/ruby/core/string/shared/to_s.rb
+++ b/spec/ruby/core/string/shared/to_s.rb
@@ -10,11 +10,4 @@ describe :string_to_s, shared: true do
     s.should == "a string"
     s.should be_an_instance_of(String)
   end
-
-  ruby_version_is ''...'2.7' do
-    it "taints the result when self is tainted" do
-      "x".taint.send(@method).should.tainted?
-      StringSpecs::MyString.new("x").taint.send(@method).should.tainted?
-    end
-  end
 end
author	Benoit Daloze <[email protected]>	2022-04-25 14:53:54 +0200
committer	Benoit Daloze <[email protected]>	2022-04-25 14:53:54 +0200
commit	45cf4f218728a15eb36d14a6c9912086525f5e3f (patch)
tree	2aa93fadcb904c226f722dde47827098b87a9846 /spec/ruby/core/string/shared
parent	6ae81d49b52563a6720d666a6118ffa6e484f398 (diff)