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/kernel
parent: 6ae81d49b52563a6720d666a6118ffa6e484f398 (diff)
15 files changed, 41 insertions, 230 deletions
diff --git a/spec/ruby/core/kernel/caller_locations_spec.rb b/spec/ruby/core/kernel/caller_locations_spec.rb
index 3ec8f0f432..5994b28fa3 100644
--- a/spec/ruby/core/kernel/caller_locations_spec.rb
+++ b/spec/ruby/core/kernel/caller_locations_spec.rb
@@ -34,12 +34,10 @@ describe 'Kernel#caller_locations' do
     locations2.map(&:to_s).should == locations1[2..-1].map(&:to_s)
   end
 
-  ruby_version_is "2.7" do
-    it "works with beginless ranges" do
-      locations1 = caller_locations(0)
-      locations2 = caller_locations(eval("(...5)"))
-      locations2.map(&:to_s)[eval("(2..)")].should == locations1[eval("(...5)")].map(&:to_s)[eval("(2..)")]
-    end
+  it "works with beginless ranges" do
+    locations1 = caller_locations(0)
+    locations2 = caller_locations((...5))
+    locations2.map(&:to_s)[eval("(2..)")].should == locations1[(...5)].map(&:to_s)[eval("(2..)")]
   end
 
   it "can be called with a range whose end is negative" do
diff --git a/spec/ruby/core/kernel/caller_spec.rb b/spec/ruby/core/kernel/caller_spec.rb
index dba65ddcb0..f1ff7044b8 100644
--- a/spec/ruby/core/kernel/caller_spec.rb
+++ b/spec/ruby/core/kernel/caller_spec.rb
@@ -50,12 +50,10 @@ describe 'Kernel#caller' do
     locations2.map(&:to_s).should == locations1[2..-1].map(&:to_s)
   end
 
-  ruby_version_is "2.7" do
-    it "works with beginless ranges" do
-      locations1 = KernelSpecs::CallerTest.locations(0)
-      locations2 = KernelSpecs::CallerTest.locations(eval("(..5)"))
-      locations2.map(&:to_s)[eval("(2..)")].should == locations1[eval("(..5)")].map(&:to_s)[eval("(2..)")]
-    end
+  it "works with beginless ranges" do
+    locations1 = KernelSpecs::CallerTest.locations(0)
+    locations2 = KernelSpecs::CallerTest.locations((..5))
+    locations2.map(&:to_s)[eval("(2..)")].should == locations1[(..5)].map(&:to_s)[eval("(2..)")]
   end
 
   guard -> { Kernel.instance_method(:tap).source_location } do
diff --git a/spec/ruby/core/kernel/clone_spec.rb b/spec/ruby/core/kernel/clone_spec.rb
index 38ae1984c0..a87c7544fe 100644
--- a/spec/ruby/core/kernel/clone_spec.rb
+++ b/spec/ruby/core/kernel/clone_spec.rb
@@ -206,11 +206,4 @@ describe "Kernel#clone" do
 
     cloned.bar.should == ['a']
   end
-
-  ruby_version_is ''...'2.7' do
-    it 'copies tainted?' do
-      o = ''.taint.clone
-      o.tainted?.should be_true
-    end
-  end
 end
diff --git a/spec/ruby/core/kernel/inspect_spec.rb b/spec/ruby/core/kernel/inspect_spec.rb
index e6fca8bf6f..1f9ce834ab 100644
--- a/spec/ruby/core/kernel/inspect_spec.rb
+++ b/spec/ruby/core/kernel/inspect_spec.rb
@@ -6,16 +6,6 @@ describe "Kernel#inspect" do
     Object.new.inspect.should be_an_instance_of(String)
   end
 
-  ruby_version_is ''...'2.7' do
-    it "returns a tainted string if self is tainted" do
-      Object.new.taint.inspect.tainted?.should be_true
-    end
-
-    it "returns an untrusted string if self is untrusted" do
-      Object.new.untrust.inspect.untrusted?.should be_true
-    end
-  end
-
   it "does not call #to_s if it is defined" do
     # We must use a bare Object here
     obj = Object.new
diff --git a/spec/ruby/core/kernel/method_spec.rb b/spec/ruby/core/kernel/method_spec.rb
index 25c6691e10..caf2ec948b 100644
--- a/spec/ruby/core/kernel/method_spec.rb
+++ b/spec/ruby/core/kernel/method_spec.rb
@@ -34,4 +34,28 @@ describe "Kernel#method" do
     m.should be_an_instance_of(Method)
     m.call(1, 2, 3).should == "Done handled_privately([1, 2, 3])"
   end
+
+  it "can call a #method_missing accepting zero or one arguments" do
+    cls = Class.new do
+      def respond_to_missing?(name, *)
+        name == :foo or super
+      end
+      def method_missing
+        :no_args
+      end
+    end
+    m = cls.new.method(:foo)
+    -> { m.call }.should raise_error(ArgumentError)
+
+    cls = Class.new do
+      def respond_to_missing?(name, *)
+        name == :bar or super
+      end
+      def method_missing(m)
+        m
+      end
+    end
+    m = cls.new.method(:bar)
+    m.call.should == :bar
+  end
 end
diff --git a/spec/ruby/core/kernel/proc_spec.rb b/spec/ruby/core/kernel/proc_spec.rb
index dfe178420b..231c1f0dfb 100644
--- a/spec/ruby/core/kernel/proc_spec.rb
+++ b/spec/ruby/core/kernel/proc_spec.rb
@@ -40,15 +40,7 @@ describe "Kernel#proc" do
     proc
   end
 
-  ruby_version_is ""..."2.7" do
-    it "uses the implicit block from an enclosing method" do
-      prc = some_method { "hello" }
-
-      prc.call.should == "hello"
-    end
-  end
-
-  ruby_version_is "2.7"..."3.0" do
+  ruby_version_is ""..."3.0" do
     it "can be created when called with no block" do
       -> {
         some_method { "hello" }
diff --git a/spec/ruby/core/kernel/shared/dup_clone.rb b/spec/ruby/core/kernel/shared/dup_clone.rb
index 84ad49cbde..4fac6006e1 100644
--- a/spec/ruby/core/kernel/shared/dup_clone.rb
+++ b/spec/ruby/core/kernel/shared/dup_clone.rb
@@ -52,18 +52,6 @@ describe :kernel_dup_clone, shared: true do
     o2.original.should equal(o)
   end
 
-  ruby_version_is ''...'2.7' do
-    it "preserves tainted state from the original" do
-      o = ObjectSpecDupInitCopy.new
-      o2 = o.send(@method)
-      o.taint
-      o3 = o.send(@method)
-
-      o2.should_not.tainted?
-      o3.should.tainted?
-    end
-  end
-
   it "does not preserve the object_id" do
     o1 = ObjectSpecDupInitCopy.new
     old_object_id = o1.object_id
@@ -71,18 +59,6 @@ describe :kernel_dup_clone, shared: true do
     o2.object_id.should_not == old_object_id
   end
 
-  ruby_version_is ''...'2.7' do
-    it "preserves untrusted state from the original" do
-      o = ObjectSpecDupInitCopy.new
-      o2 = o.send(@method)
-      o.untrust
-      o3 = o.send(@method)
-
-      o2.should_not.untrusted?
-      o3.should.untrusted?
-    end
-  end
-
   it "returns nil for NilClass" do
     nil.send(@method).should == nil
   end
diff --git a/spec/ruby/core/kernel/shared/require.rb b/spec/ruby/core/kernel/shared/require.rb
index 9a2c38be1a..cf01b9dc52 100644
--- a/spec/ruby/core/kernel/shared/require.rb
+++ b/spec/ruby/core/kernel/shared/require.rb
@@ -251,7 +251,7 @@ describe :kernel_require, shared: true do
       ScratchPad.recorded.should == [:loaded]
     end
 
-    ruby_bug "#16926", "2.7"..."3.0" do
+    ruby_bug "#16926", ""..."3.0" do
       it "does not load a feature twice when $LOAD_PATH has been modified" do
         $LOAD_PATH.replace [CODE_LOADING_DIR]
         @object.require("load_fixture").should be_true
@@ -547,9 +547,7 @@ describe :kernel_require, shared: true do
     end
 
     provided = %w[complex enumerator rational thread]
-    ruby_version_is "2.7" do
-      provided << 'ruby2_keywords'
-    end
+    provided << 'ruby2_keywords'
 
     it "#{provided.join(', ')} are already required" do
       features = ruby_exe("puts $LOADED_FEATURES", options: '--disable-gems')
diff --git a/spec/ruby/core/kernel/taint_spec.rb b/spec/ruby/core/kernel/taint_spec.rb
index 8ba9869af2..9a58bb5f04 100644
--- a/spec/ruby/core/kernel/taint_spec.rb
+++ b/spec/ruby/core/kernel/taint_spec.rb
@@ -2,50 +2,7 @@ require_relative '../../spec_helper'
 require_relative 'fixtures/classes'
 
 describe "Kernel#taint" do
-  ruby_version_is ''...'2.7' do
-    it "returns self" do
-      o = Object.new
-      o.taint.should equal(o)
-    end
-
-    it "sets the tainted bit" do
-      o = Object.new
-      o.taint
-      o.should.tainted?
-    end
-
-    it "raises FrozenError on an untainted, frozen object" do
-      o = Object.new.freeze
-      -> { o.taint }.should raise_error(FrozenError)
-    end
-
-    it "does not raise an error on a tainted, frozen object" do
-      o = Object.new.taint.freeze
-      o.taint.should equal(o)
-    end
-
-    it "has no effect on immediate values" do
-      [nil, true, false].each do |v|
-        v.taint
-        v.should_not.tainted?
-      end
-    end
-
-    it "no raises a RuntimeError on symbols" do
-      v = :sym
-      -> { v.taint }.should_not raise_error(RuntimeError)
-      v.should_not.tainted?
-    end
-
-    it "no raises error on integer values" do
-      [1].each do |v|
-        -> { v.taint }.should_not raise_error(RuntimeError)
-        v.should_not.tainted?
-      end
-    end
-  end
-
-  ruby_version_is "2.7"..."3.0" do
+  ruby_version_is ""..."3.0" do
     it "is a no-op" do
       o = Object.new
       o.taint
diff --git a/spec/ruby/core/kernel/tainted_spec.rb b/spec/ruby/core/kernel/tainted_spec.rb
index 022938bfc1..7511c730c9 100644
--- a/spec/ruby/core/kernel/tainted_spec.rb
+++ b/spec/ruby/core/kernel/tainted_spec.rb
@@ -2,17 +2,7 @@ require_relative '../../spec_helper'
 require_relative 'fixtures/classes'
 
 describe "Kernel#tainted?" do
-  ruby_version_is ''...'2.7' do
-    it "returns true if Object is tainted" do
-      o = mock('o')
-      p = mock('p')
-      p.taint
-      o.should_not.tainted?
-      p.should.tainted?
-    end
-  end
-
-  ruby_version_is "2.7"..."3.0" do
+  ruby_version_is ""..."3.0" do
     it "is a no-op" do
       o = mock('o')
       p = mock('p')
diff --git a/spec/ruby/core/kernel/to_s_spec.rb b/spec/ruby/core/kernel/to_s_spec.rb
index 64b40f46e5..ea4b00151e 100644
--- a/spec/ruby/core/kernel/to_s_spec.rb
+++ b/spec/ruby/core/kernel/to_s_spec.rb
@@ -5,14 +5,4 @@ describe "Kernel#to_s" do
   it "returns a String containing the name of self's class" do
     Object.new.to_s.should =~ /Object/
   end
-
-  ruby_version_is ''...'2.7' do
-    it "returns a tainted result if self is tainted" do
-      Object.new.taint.to_s.tainted?.should be_true
-    end
-
-    it "returns an untrusted result if self is untrusted" do
-      Object.new.untrust.to_s.untrusted?.should be_true
-    end
-  end
 end
diff --git a/spec/ruby/core/kernel/trust_spec.rb b/spec/ruby/core/kernel/trust_spec.rb
index 399983f74d..4665036da6 100644
--- a/spec/ruby/core/kernel/trust_spec.rb
+++ b/spec/ruby/core/kernel/trust_spec.rb
@@ -2,30 +2,7 @@ require_relative '../../spec_helper'
 require_relative 'fixtures/classes'
 
 describe "Kernel#trust" do
-  ruby_version_is ''...'2.7' do
-    it "returns self" do
-      o = Object.new
-      o.trust.should equal(o)
-    end
-
-    it "clears the untrusted bit" do
-      o = Object.new.untrust
-      o.trust
-      o.should_not.untrusted?
-    end
-
-    it "raises FrozenError on an untrusted, frozen object" do
-      o = Object.new.untrust.freeze
-      -> { o.trust }.should raise_error(FrozenError)
-    end
-
-    it "does not raise an error on a trusted, frozen object" do
-      o = Object.new.freeze
-      o.trust.should equal(o)
-    end
-  end
-
-  ruby_version_is "2.7"..."3.0" do
+  ruby_version_is ""..."3.0" do
     it "is a no-op" do
       o = Object.new.untrust
       o.should_not.untrusted?
diff --git a/spec/ruby/core/kernel/untaint_spec.rb b/spec/ruby/core/kernel/untaint_spec.rb
index 44d87da5d5..42fe8a4239 100644
--- a/spec/ruby/core/kernel/untaint_spec.rb
+++ b/spec/ruby/core/kernel/untaint_spec.rb
@@ -2,30 +2,7 @@ require_relative '../../spec_helper'
 require_relative 'fixtures/classes'
 
 describe "Kernel#untaint" do
-  ruby_version_is ''...'2.7' do
-    it "returns self" do
-      o = Object.new
-      o.untaint.should equal(o)
-    end
-
-    it "clears the tainted bit" do
-      o = Object.new.taint
-      o.untaint
-      o.should_not.tainted?
-    end
-
-    it "raises FrozenError on a tainted, frozen object" do
-      o = Object.new.taint.freeze
-      -> { o.untaint }.should raise_error(FrozenError)
-    end
-
-    it "does not raise an error on an untainted, frozen object" do
-      o = Object.new.freeze
-      o.untaint.should equal(o)
-    end
-  end
-
-  ruby_version_is "2.7"..."3.0" do
+  ruby_version_is ""..."3.0" do
     it "is a no-op" do
       o = Object.new.taint
       o.should_not.tainted?
diff --git a/spec/ruby/core/kernel/untrust_spec.rb b/spec/ruby/core/kernel/untrust_spec.rb
index aff0fec57b..ba0e073cf0 100644
--- a/spec/ruby/core/kernel/untrust_spec.rb
+++ b/spec/ruby/core/kernel/untrust_spec.rb
@@ -2,30 +2,7 @@ require_relative '../../spec_helper'
 require_relative 'fixtures/classes'
 
 describe "Kernel#untrust" do
-  ruby_version_is ''...'2.7' do
-    it "returns self" do
-      o = Object.new
-      o.untrust.should equal(o)
-    end
-
-    it "sets the untrusted bit" do
-      o = Object.new
-      o.untrust
-      o.should.untrusted?
-    end
-
-    it "raises FrozenError on a trusted, frozen object" do
-      o = Object.new.freeze
-      -> { o.untrust }.should raise_error(FrozenError)
-    end
-
-    it "does not raise an error on an untrusted, frozen object" do
-      o = Object.new.untrust.freeze
-      o.untrust.should equal(o)
-    end
-  end
-
-  ruby_version_is "2.7"..."3.0" do
+  ruby_version_is ""..."3.0" do
     it "is a no-op" do
       o = Object.new
       o.untrust
diff --git a/spec/ruby/core/kernel/untrusted_spec.rb b/spec/ruby/core/kernel/untrusted_spec.rb
index 5347c90093..517bd4711b 100644
--- a/spec/ruby/core/kernel/untrusted_spec.rb
+++ b/spec/ruby/core/kernel/untrusted_spec.rb
@@ -2,33 +2,7 @@ require_relative '../../spec_helper'
 require_relative 'fixtures/classes'
 
 describe "Kernel#untrusted?" do
-  ruby_version_is ''...'2.7' do
-    it "returns the untrusted status of an object" do
-      o = mock('o')
-      o.should_not.untrusted?
-      o.untrust
-      o.should.untrusted?
-    end
-
-    it "has no effect on immediate values" do
-      a = nil
-      b = true
-      c = false
-      a.untrust
-      b.untrust
-      c.untrust
-      a.should_not.untrusted?
-      b.should_not.untrusted?
-      c.should_not.untrusted?
-    end
-
-    it "has effect on immediate values" do
-      d = 1
-      -> { d.untrust }.should_not raise_error(RuntimeError)
-    end
-  end
-
-  ruby_version_is "2.7"..."3.0" do
+  ruby_version_is ""..."3.0" do
     it "is a no-op" do
       o = mock('o')
       o.should_not.untrusted?
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/kernel
parent	6ae81d49b52563a6720d666a6118ffa6e484f398 (diff)