2.8 -> 3.0 in specs

28 files changed, 51 insertions, 53 deletions

diff --git a/spec/ruby/core/binding/eval_spec.rb b/spec/ruby/core/binding/eval_spec.rb
index 224bce4c33..b36bec799e 100644
--- a/spec/ruby/core/binding/eval_spec.rb
+++ b/spec/ruby/core/binding/eval_spec.rb
@@ -23,7 +23,7 @@ describe "Binding#eval" do
     bind2.local_variables.should == []
   end
 
-  ruby_version_is ""..."2.8" do
+  ruby_version_is ""..."3.0" do
     it "inherits __LINE__ from the enclosing scope" do
       obj = BindingSpecs::Demo.new(1)
       bind = obj.get_binding
@@ -50,7 +50,7 @@ describe "Binding#eval" do
     end
   end
 
-  ruby_version_is "2.8" do
+  ruby_version_is "3.0" do
     it "starts with line 1 if single argument is given" do
       obj = BindingSpecs::Demo.new(1)
       bind = obj.get_binding
@@ -89,7 +89,7 @@ describe "Binding#eval" do
     bind.eval("#foo\n__LINE__", "(test)", 88).should == 89
   end
 
-  ruby_version_is ""..."2.8" do
+  ruby_version_is ""..."3.0" do
     it "inherits __FILE__ from the enclosing scope" do
       obj = BindingSpecs::Demo.new(1)
       bind = obj.get_binding
@@ -97,7 +97,7 @@ describe "Binding#eval" do
     end
   end
 
-  ruby_version_is "2.8" do
+  ruby_version_is "3.0" do
     it "Uses (eval) as __FILE__ if single argument given" do
       obj = BindingSpecs::Demo.new(1)
       bind = obj.get_binding
diff --git a/spec/ruby/core/env/delete_spec.rb b/spec/ruby/core/env/delete_spec.rb
index 36a1f2624b..5e7891f74d 100644
--- a/spec/ruby/core/env/delete_spec.rb
+++ b/spec/ruby/core/env/delete_spec.rb
@@ -30,7 +30,7 @@ describe "ENV.delete" do
     ScratchPad.recorded.should == "foo"
   end
 
-  ruby_version_is "2.8" do
+  ruby_version_is "3.0" do
     it "returns the result of given block if the named environment variable does not exist" do
       ENV.delete("foo")
       ENV.delete("foo") { |name| "bar" }.should == "bar"
diff --git a/spec/ruby/core/exception/no_method_error_spec.rb b/spec/ruby/core/exception/no_method_error_spec.rb
index b7ee5434fd..570ffc47b1 100644
--- a/spec/ruby/core/exception/no_method_error_spec.rb
+++ b/spec/ruby/core/exception/no_method_error_spec.rb
@@ -104,7 +104,7 @@ describe "NoMethodError#message" do
     end
   end
 
-  ruby_version_is "2.8" do
+  ruby_version_is "3.0" do
     it "uses #name to display the receiver if it is a class or a module" do
       klass = Class.new { def self.name; "MyClass"; end }
       begin
diff --git a/spec/ruby/core/hash/shared/each.rb b/spec/ruby/core/hash/shared/each.rb
index 5e88a35445..e0c0a949ca 100644
--- a/spec/ruby/core/hash/shared/each.rb
+++ b/spec/ruby/core/hash/shared/each.rb
@@ -21,7 +21,7 @@ describe :hash_each, shared: true do
     ary.sort.should == ["a", "b", "c"]
   end
 
-  ruby_version_is ""..."2.8" do
+  ruby_version_is ""..."3.0" do
     it "yields 2 values and not an Array of 2 elements when given a callable of arity 2" do
       obj = Object.new
       def obj.foo(key, value)
@@ -38,7 +38,7 @@ describe :hash_each, shared: true do
     end
   end
 
-  ruby_version_is "2.8" do
+  ruby_version_is "3.0" do
     it "yields an Array of 2 elements when given a callable of arity 2" do
       obj = Object.new
       def obj.foo(key, value)
diff --git a/spec/ruby/core/hash/to_proc_spec.rb b/spec/ruby/core/hash/to_proc_spec.rb
index 73c96bdf08..8f5d21beb5 100644
--- a/spec/ruby/core/hash/to_proc_spec.rb
+++ b/spec/ruby/core/hash/to_proc_spec.rb
@@ -19,13 +19,13 @@ describe "Hash#to_proc" do
       @proc = @hash.to_proc
     end
 
-    ruby_version_is ""..."2.8" do
+    ruby_version_is ""..."3.0" do
       it "is not a lambda" do
         @proc.should_not.lambda?
       end
     end
 
-    ruby_version_is "2.8" do
+    ruby_version_is "3.0" do
       it "is a lambda" do
         @proc.should.lambda?
       end
diff --git a/spec/ruby/core/io/shared/new.rb b/spec/ruby/core/io/shared/new.rb
index 87f3001862..75c532053f 100644
--- a/spec/ruby/core/io/shared/new.rb
+++ b/spec/ruby/core/io/shared/new.rb
@@ -197,7 +197,7 @@ describe :io_new, shared: true do
     @io.internal_encoding.to_s.should == 'IBM866'
   end
 
-  ruby_version_is ''...'2.8' do
+  ruby_version_is ''...'3.0' do
     it "accepts nil options" do
       @io = suppress_keyword_warning do
         IO.send(@method, @fd, 'w', nil)
@@ -206,7 +206,7 @@ describe :io_new, shared: true do
     end
   end
 
-  ruby_version_is '2.8' do
+  ruby_version_is '3.0' do
     it "raises ArgumentError for nil options" do
       -> {
         IO.send(@method, @fd, 'w', nil)
@@ -382,7 +382,7 @@ describe :io_new_errors, shared: true do
     }.should raise_error(ArgumentError)
   end
 
-  ruby_version_is ''...'2.8' do
+  ruby_version_is ''...'3.0' do
     it "raises TypeError if passed a hash for mode and nil for options" do
       -> {
         suppress_keyword_warning do
@@ -392,7 +392,7 @@ describe :io_new_errors, shared: true do
     end
   end
 
-  ruby_version_is '2.8' do
+  ruby_version_is '3.0' do
     it "raises ArgumentError if passed a hash for mode and nil for options" do
       -> {
         @io = IO.send(@method, @fd, {mode: 'w'}, nil)
diff --git a/spec/ruby/core/io/ungetc_spec.rb b/spec/ruby/core/io/ungetc_spec.rb
index dc31c3743a..a05d80ee9c 100644
--- a/spec/ruby/core/io/ungetc_spec.rb
+++ b/spec/ruby/core/io/ungetc_spec.rb
@@ -103,7 +103,7 @@ describe "IO#ungetc" do
     -> { @io.sysread(1) }.should raise_error(IOError)
   end
 
-  ruby_version_is "0"..."2.8" do
+  ruby_version_is "0"..."3.0" do
     it "does not affect the stream and returns nil when passed nil" do
       @io.getc.should == ?V
       @io.ungetc(nil)
@@ -111,7 +111,7 @@ describe "IO#ungetc" do
     end
   end
 
-  ruby_version_is "2.8" do
+  ruby_version_is "3.0" do
     it "raises TypeError if passed nil" do
       @io.getc.should == ?V
       proc{@io.ungetc(nil)}.should raise_error(TypeError)
diff --git a/spec/ruby/core/kernel/__dir___spec.rb b/spec/ruby/core/kernel/__dir___spec.rb
index 0686b31e97..324792a408 100644
--- a/spec/ruby/core/kernel/__dir___spec.rb
+++ b/spec/ruby/core/kernel/__dir___spec.rb
@@ -19,7 +19,7 @@ describe "Kernel#__dir__" do
     end
   end
 
-  ruby_version_is ""..."2.8" do
+  ruby_version_is ""..."3.0" do
     context "when used in eval with top level binding" do
       it "returns the real name of the directory containing the currently-executing file" do
         eval("__dir__", binding).should == File.realpath(File.dirname(__FILE__))
@@ -27,7 +27,7 @@ describe "Kernel#__dir__" do
     end
   end
 
-  ruby_version_is "2.8" do
+  ruby_version_is "3.0" do
     context "when used in eval with top level binding" do
       it "returns nil" do
         eval("__dir__", binding).should == nil
diff --git a/spec/ruby/core/kernel/clone_spec.rb b/spec/ruby/core/kernel/clone_spec.rb
index 6aeb57f55b..c18af4a490 100644
--- a/spec/ruby/core/kernel/clone_spec.rb
+++ b/spec/ruby/core/kernel/clone_spec.rb
@@ -37,7 +37,7 @@ describe "Kernel#clone" do
     o3.should.frozen?
   end
 
-  ruby_version_is '2.8' do
+  ruby_version_is '3.0' do
     it 'takes an freeze: true option to frozen copy' do
       @obj.clone(freeze: true).should.frozen?
       @obj.freeze
diff --git a/spec/ruby/core/kernel/eval_spec.rb b/spec/ruby/core/kernel/eval_spec.rb
index 783009ac01..c53e51e430 100644
--- a/spec/ruby/core/kernel/eval_spec.rb
+++ b/spec/ruby/core/kernel/eval_spec.rb
@@ -159,7 +159,7 @@ describe "Kernel#eval" do
     end
   end
 
-  ruby_version_is ""..."2.8" do
+  ruby_version_is ""..."3.0" do
     it "uses the filename of the binding if none is provided" do
       eval("__FILE__").should == "(eval)"
       suppress_warning {eval("__FILE__", binding)}.should == __FILE__
@@ -170,7 +170,7 @@ describe "Kernel#eval" do
     end
   end
 
-  ruby_version_is "2.8" do
+  ruby_version_is "3.0" do
     it "uses (eval) filename if none is provided" do
       eval("__FILE__").should == "(eval)"
       eval("__FILE__", binding).should == "(eval)"
diff --git a/spec/ruby/core/kernel/iterator_spec.rb b/spec/ruby/core/kernel/iterator_spec.rb
index a2811dc569..3fe8317f26 100644
--- a/spec/ruby/core/kernel/iterator_spec.rb
+++ b/spec/ruby/core/kernel/iterator_spec.rb
@@ -1,7 +1,7 @@
 require_relative '../../spec_helper'
 require_relative 'fixtures/classes'
 
-ruby_version_is ""..."2.8" do
+ruby_version_is ""..."3.0" do
   describe "Kernel#iterator?" do
     it "is a private method" do
       Kernel.should have_private_instance_method(:iterator?)
diff --git a/spec/ruby/core/kernel/proc_spec.rb b/spec/ruby/core/kernel/proc_spec.rb
index 7b4493dcc4..dfe178420b 100644
--- a/spec/ruby/core/kernel/proc_spec.rb
+++ b/spec/ruby/core/kernel/proc_spec.rb
@@ -48,7 +48,7 @@ describe "Kernel#proc" do
     end
   end
 
-  ruby_version_is "2.7"..."2.8" do
+  ruby_version_is "2.7"..."3.0" do
     it "can be created when called with no block" do
       -> {
         some_method { "hello" }
@@ -56,7 +56,7 @@ describe "Kernel#proc" do
     end
   end
 
-  ruby_version_is "2.8" do
+  ruby_version_is "3.0" do
     it "raises an ArgumentError when passed no block" do
       -> {
         some_method { "hello" }
diff --git a/spec/ruby/core/kernel/shared/require.rb b/spec/ruby/core/kernel/shared/require.rb
index 28fdb5e451..0e7f8ba665 100644
--- a/spec/ruby/core/kernel/shared/require.rb
+++ b/spec/ruby/core/kernel/shared/require.rb
@@ -243,7 +243,7 @@ describe :kernel_require, shared: true do
       ScratchPad.recorded.should == [:loaded]
     end
 
-    ruby_bug "#16926", "2.7"..."2.8" do
+    ruby_bug "#16926", "2.7"..."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
diff --git a/spec/ruby/core/method/compose_spec.rb b/spec/ruby/core/method/compose_spec.rb
index 0e2a0eeea2..0743dd4f8d 100644
--- a/spec/ruby/core/method/compose_spec.rb
+++ b/spec/ruby/core/method/compose_spec.rb
@@ -39,8 +39,8 @@ ruby_version_is "2.6" do
         double = proc { |x| x + x }
 
         (pow_2 << double).is_a?(Proc).should == true
-        ruby_version_is(''...'2.8') { (pow_2 << double).should.lambda? }
-        ruby_version_is('2.8') { (pow_2 << double).should_not.lambda? }
+        ruby_version_is(''...'3.0') { (pow_2 << double).should.lambda? }
+        ruby_version_is('3.0') { (pow_2 << double).should_not.lambda? }
       end
 
       it "may accept multiple arguments" do
diff --git a/spec/ruby/core/method/shared/to_s.rb b/spec/ruby/core/method/shared/to_s.rb
index 7666322936..0c0edc2f8c 100644
--- a/spec/ruby/core/method/shared/to_s.rb
+++ b/spec/ruby/core/method/shared/to_s.rb
@@ -32,7 +32,7 @@ describe :method_to_s, shared: true do
     @string.should =~ /MethodSpecs::MySub/
   end
 
-  ruby_version_is '2.8' do
+  ruby_version_is '3.0' do
     it "returns a String containing the Module containing the method if object has a singleton class but method is not defined in the singleton class" do
       obj = MethodSpecs::MySub.new
       obj.singleton_class
diff --git a/spec/ruby/core/module/prepend_spec.rb b/spec/ruby/core/module/prepend_spec.rb
index 1905021cf7..a501b5e50c 100644
--- a/spec/ruby/core/module/prepend_spec.rb
+++ b/spec/ruby/core/module/prepend_spec.rb
@@ -128,7 +128,7 @@ describe "Module#prepend" do
     c.dup.new.should be_kind_of(m)
   end
 
-  ruby_version_is '0'...'2.8' do
+  ruby_version_is '0'...'3.0' do
     it "keeps the module in the chain when dupping an intermediate module" do
       m1 = Module.new { def calc(x) x end }
       m2 = Module.new { prepend(m1) }
@@ -143,7 +143,7 @@ describe "Module#prepend" do
     end
   end
 
-  ruby_version_is '2.8' do
+  ruby_version_is '3.0' do
     it "uses only new module when dupping the module" do
       m1 = Module.new { def calc(x) x end }
       m2 = Module.new { prepend(m1) }
diff --git a/spec/ruby/core/module/refine_spec.rb b/spec/ruby/core/module/refine_spec.rb
index ebb7111d82..cb50fcbce6 100644
--- a/spec/ruby/core/module/refine_spec.rb
+++ b/spec/ruby/core/module/refine_spec.rb
@@ -980,7 +980,7 @@ describe "Module#refine" do
       result.should == [:B, :A, :LAST, :C]
     end
 
-    ruby_version_is ""..."2.8" do
+    ruby_version_is ""..."3.0" do
       it "looks in the lexical scope refinements before other active refinements" do
         refined_class = ModuleSpecs.build_refined_class(for_super: true)
 
@@ -1016,7 +1016,7 @@ describe "Module#refine" do
       end
     end
 
-    ruby_version_is "2.8" do
+    ruby_version_is "3.0" do
       # https://bugs.ruby-lang.org/issues/17007
       it "does not look in the lexical scope refinements before other active refinements" do
         refined_class = ModuleSpecs.build_refined_class(for_super: true)
diff --git a/spec/ruby/core/mutex/owned_spec.rb b/spec/ruby/core/mutex/owned_spec.rb
index f881622965..1f843cd576 100644
--- a/spec/ruby/core/mutex/owned_spec.rb
+++ b/spec/ruby/core/mutex/owned_spec.rb
@@ -41,7 +41,7 @@ describe "Mutex#owned?" do
     end
   end
 
-  ruby_version_is "2.8" do
+  ruby_version_is "3.0" do
     it "is held per Fiber" do
       m = Mutex.new
       m.lock
diff --git a/spec/ruby/core/proc/compose_spec.rb b/spec/ruby/core/proc/compose_spec.rb
index efdbdeacf4..285e96192b 100644
--- a/spec/ruby/core/proc/compose_spec.rb
+++ b/spec/ruby/core/proc/compose_spec.rb
@@ -38,7 +38,7 @@ ruby_version_is "2.6" do
         (f << g).should_not.lambda?
       end
 
-      ruby_version_is(''...'2.8') do
+      ruby_version_is(''...'3.0') do
         it "is a Proc when other is lambda" do
           f = proc { |x| x * x }
           g = -> x { x + x }
@@ -56,7 +56,7 @@ ruby_version_is "2.6" do
         end
       end
 
-      ruby_version_is('2.8') do
+      ruby_version_is('3.0') do
         it "is a lambda when parameter is lambda" do
           f = -> x { x * x }
           g = proc { |x| x + x }
diff --git a/spec/ruby/core/proc/eql_spec.rb b/spec/ruby/core/proc/eql_spec.rb
index d95e890c29..5f38af72d9 100644
--- a/spec/ruby/core/proc/eql_spec.rb
+++ b/spec/ruby/core/proc/eql_spec.rb
@@ -2,11 +2,11 @@ require_relative '../../spec_helper'
 require_relative 'shared/equal'
 
 describe "Proc#eql?" do
-  ruby_version_is "0"..."2.8" do
+  ruby_version_is "0"..."3.0" do
     it_behaves_like :proc_equal_undefined, :eql?
   end
 
-  ruby_version_is "2.8" do
+  ruby_version_is "3.0" do
     it_behaves_like :proc_equal, :eql?
   end
 end
diff --git a/spec/ruby/core/proc/equal_value_spec.rb b/spec/ruby/core/proc/equal_value_spec.rb
index fb465992e9..4c336331d7 100644
--- a/spec/ruby/core/proc/equal_value_spec.rb
+++ b/spec/ruby/core/proc/equal_value_spec.rb
@@ -2,11 +2,11 @@ require_relative '../../spec_helper'
 require_relative 'shared/equal'
 
 describe "Proc#==" do
-  ruby_version_is "0"..."2.8" do
+  ruby_version_is "0"..."3.0" do
     it_behaves_like :proc_equal_undefined, :==
   end
 
-  ruby_version_is "2.8" do
+  ruby_version_is "3.0" do
     it_behaves_like :proc_equal, :==
   end
 end
diff --git a/spec/ruby/core/proc/new_spec.rb b/spec/ruby/core/proc/new_spec.rb
index 0a6247239f..6d5eb67a4b 100644
--- a/spec/ruby/core/proc/new_spec.rb
+++ b/spec/ruby/core/proc/new_spec.rb
@@ -203,7 +203,7 @@ describe "Proc.new without a block" do
     end
   end
 
-  ruby_version_is "2.7"..."2.8" do
+  ruby_version_is "2.7"..."3.0" do
     it "can be created if invoked from within a method with a block" do
       -> { ProcSpecs.new_proc_in_method { "hello" } }.should complain(/Capturing the given block using Proc.new is deprecated/)
     end
@@ -224,7 +224,7 @@ describe "Proc.new without a block" do
     end
   end
 
-  ruby_version_is "2.8" do
+  ruby_version_is "3.0" do
     it "raises an ArgumentError when passed no block" do
       def some_method
         Proc.new
diff --git a/spec/ruby/core/regexp/initialize_spec.rb b/spec/ruby/core/regexp/initialize_spec.rb
index 28255ad60f..772a233e82 100644
--- a/spec/ruby/core/regexp/initialize_spec.rb
+++ b/spec/ruby/core/regexp/initialize_spec.rb
@@ -5,13 +5,13 @@ describe "Regexp#initialize" do
     Regexp.should have_private_method(:initialize)
   end
 
-  ruby_version_is ""..."2.8" do
+  ruby_version_is ""..."3.0" do
     it "raises a SecurityError on a Regexp literal" do
       -> { //.send(:initialize, "") }.should raise_error(SecurityError)
     end
   end
 
-  ruby_version_is "2.8" do
+  ruby_version_is "3.0" do
     it "raises a FrozenError on a Regexp literal" do
       -> { //.send(:initialize, "") }.should raise_error(FrozenError)
     end
diff --git a/spec/ruby/core/symbol/to_proc_spec.rb b/spec/ruby/core/symbol/to_proc_spec.rb
index 32f996d63c..e9261e6cdf 100644
--- a/spec/ruby/core/symbol/to_proc_spec.rb
+++ b/spec/ruby/core/symbol/to_proc_spec.rb
@@ -12,7 +12,7 @@ describe "Symbol#to_proc" do
     :to_s.to_proc.call(obj).should == "Received #to_s"
   end
 
-  ruby_version_is ""..."2.8" do
+  ruby_version_is ""..."3.0" do
     it "returns a Proc with #lambda? false" do
       pr = :to_s.to_proc
       pr.should_not.lambda?
@@ -29,7 +29,7 @@ describe "Symbol#to_proc" do
     end
   end
 
-  ruby_version_is "2.8" do
+  ruby_version_is "3.0" do
     it "returns a Proc with #lambda? true" do
       pr = :to_s.to_proc
       pr.should.lambda?
diff --git a/spec/ruby/core/thread/exclusive_spec.rb b/spec/ruby/core/thread/exclusive_spec.rb
index 8c2bc0e82a..37c4b19d1a 100644
--- a/spec/ruby/core/thread/exclusive_spec.rb
+++ b/spec/ruby/core/thread/exclusive_spec.rb
@@ -1,6 +1,6 @@
 require_relative '../../spec_helper'
 
-ruby_version_is ''...'2.8' do
+ruby_version_is ''...'3.0' do
   describe "Thread.exclusive" do
     before :each do
       ScratchPad.clear
diff --git a/spec/ruby/core/time/new_spec.rb b/spec/ruby/core/time/new_spec.rb
index 1a2f93e2ef..a4bb5b362c 100644
--- a/spec/ruby/core/time/new_spec.rb
+++ b/spec/ruby/core/time/new_spec.rb
@@ -129,7 +129,7 @@ ruby_version_is "2.6" do
 
       time.zone.should == zone
       time.utc_offset.should == 5*3600+30*60
-      ruby_version_is "2.8" do
+      ruby_version_is "3.0" do
         time.wday.should == 6
         time.yday.should == 1
       end
diff --git a/spec/ruby/core/tracepoint/enable_spec.rb b/spec/ruby/core/tracepoint/enable_spec.rb
index 13c7b82b54..50fded90e4 100644
--- a/spec/ruby/core/tracepoint/enable_spec.rb
+++ b/spec/ruby/core/tracepoint/enable_spec.rb
@@ -124,13 +124,11 @@ describe 'TracePoint#enable' do
 
   describe "when nested" do
     before do
-      ruby_version_is ""..."2.8" do
-        # Old behavior for Ruby < 2.8
+      ruby_version_is ""..."3.0" do
         @path_prefix = '@'
       end
 
-      ruby_version_is "2.8" do
-        # New behavior for Ruby >= 2.8
+      ruby_version_is "3.0" do
         @path_prefix = ' '
       end
     end
diff --git a/spec/ruby/core/tracepoint/inspect_spec.rb b/spec/ruby/core/tracepoint/inspect_spec.rb
index 80de965337..34a152180e 100644
--- a/spec/ruby/core/tracepoint/inspect_spec.rb
+++ b/spec/ruby/core/tracepoint/inspect_spec.rb
@@ -3,12 +3,12 @@ require_relative 'fixtures/classes'
 
 describe 'TracePoint#inspect' do
   before do
-    ruby_version_is ""..."2.8" do
+    ruby_version_is ""..."3.0" do
       # Old behavior for Ruby < 2.8
       @path_prefix = '@'
     end
 
-    ruby_version_is "2.8" do
+    ruby_version_is "3.0" do
       # New behavior for Ruby >= 2.8
       @path_prefix = ' '
     end