diff options
author | Benoit Daloze <[email protected]> | 2020-09-15 21:54:31 +0200 |
---|---|---|
committer | Benoit Daloze <[email protected]> | 2020-09-15 21:56:00 +0200 |
commit | 1af0319fc88688bc5dd5e49eecdb8b534ead9991 (patch) | |
tree | 352b35490e64bc961dc005d679392106d6be90b9 | |
parent | 9b535f3ff7c2f48e34dd44564df7adc723b81276 (diff) |
2.8 -> 3.0 in specs
147 files changed, 199 insertions, 201 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 diff --git a/spec/ruby/language/block_spec.rb b/spec/ruby/language/block_spec.rb index 8a02f61925..45a8ec5f9a 100644 --- a/spec/ruby/language/block_spec.rb +++ b/spec/ruby/language/block_spec.rb @@ -44,7 +44,7 @@ describe "A block yielded a single" do m([1, 2]) { |a, **k| [a, k] }.should == [1, {}] end - ruby_version_is ''..."2.8" do + ruby_version_is ''..."3.0" do it "assigns elements to mixed argument types" do suppress_keyword_warning do result = m([1, 2, 3, {x: 9}]) { |a, b=5, *c, d, e: 2, **k| [a, b, c, d, e, k] } @@ -70,7 +70,7 @@ describe "A block yielded a single" do end end - ruby_version_is "2.8" do + ruby_version_is "3.0" do it "assigns elements to mixed argument types" do result = m([1, 2, 3, {x: 9}]) { |a, b=5, *c, d, e: 2, **k| [a, b, c, d, e, k] } result.should == [1, 2, [3], {x: 9}, 2, {}] @@ -102,7 +102,7 @@ describe "A block yielded a single" do end end - ruby_version_is "2.7"...'2.8' do + ruby_version_is "2.7"...'3.0' do it "calls #to_hash on the argument but ignores result when optional argument and keyword argument accepted" do obj = mock("coerce block keyword arguments") obj.should_receive(:to_hash).and_return({"a" => 1, "b" => 2}) @@ -112,7 +112,7 @@ describe "A block yielded a single" do end end - ruby_version_is "2.8" do + ruby_version_is "3.0" do it "does not call #to_hash on the argument when optional argument and keyword argument accepted and does not autosplat" do obj = mock("coerce block keyword arguments") obj.should_not_receive(:to_hash) @@ -123,7 +123,7 @@ describe "A block yielded a single" do end describe "when non-symbol keys are in a keyword arguments Hash" do - ruby_version_is ""..."2.8" do + ruby_version_is ""..."3.0" do it "separates non-symbol keys and symbol keys" do suppress_keyword_warning do result = m(["a" => 10, b: 2]) { |a=nil, **b| [a, b] } @@ -131,7 +131,7 @@ describe "A block yielded a single" do end end end - ruby_version_is "2.8" do + ruby_version_is "3.0" do it "does not separate non-symbol keys and symbol keys and does not autosplat" do suppress_keyword_warning do result = m(["a" => 10, b: 2]) { |a=nil, **b| [a, b] } @@ -141,21 +141,21 @@ describe "A block yielded a single" do end end - ruby_version_is ""..."2.8" do + ruby_version_is ""..."3.0" do it "does not treat hashes with string keys as keyword arguments" do result = m(["a" => 10]) { |a = nil, **b| [a, b] } result.should == [{"a" => 10}, {}] end end - ruby_version_is "2.8" do + ruby_version_is "3.0" do it "does not treat hashes with string keys as keyword arguments and does not autosplat" do result = m(["a" => 10]) { |a = nil, **b| [a, b] } result.should == [[{"a" => 10}], {}] end end - ruby_version_is ''...'2.8' do + ruby_version_is ''...'3.0' do it "calls #to_hash on the last element if keyword arguments are present" do suppress_keyword_warning do obj = mock("destructure block keyword arguments") @@ -202,7 +202,7 @@ describe "A block yielded a single" do end end - ruby_version_is '2.8' do + ruby_version_is '3.0' do it "does not call #to_hash on the last element if keyword arguments are present" do obj = mock("destructure block keyword arguments") obj.should_not_receive(:to_hash) diff --git a/spec/ruby/language/class_spec.rb b/spec/ruby/language/class_spec.rb index 2b9a4afef7..4ff6e65181 100644 --- a/spec/ruby/language/class_spec.rb +++ b/spec/ruby/language/class_spec.rb @@ -285,7 +285,7 @@ describe "A class definition extending an object (sclass)" do }.should raise_error(TypeError) end - ruby_version_is ""..."2.8" do + ruby_version_is ""..."3.0" do it "allows accessing the block of the original scope" do suppress_warning do ClassSpecs.sclass_with_block { 123 }.should == 123 @@ -293,7 +293,7 @@ describe "A class definition extending an object (sclass)" do end end - ruby_version_is "2.8" do + ruby_version_is "3.0" do it "does not allow accessing the block of the original scope" do -> { ClassSpecs.sclass_with_block { 123 } diff --git a/spec/ruby/language/constants_spec.rb b/spec/ruby/language/constants_spec.rb index 47897234b9..4d46cf2f84 100644 --- a/spec/ruby/language/constants_spec.rb +++ b/spec/ruby/language/constants_spec.rb @@ -154,7 +154,7 @@ describe "Literal (A::X) constant resolution" do -> { ConstantSpecs::ParentA::CS_CONSTX }.should raise_error(NameError) end - ruby_version_is "2.8" do + ruby_version_is "3.0" do it "uses the module or class #name to craft the error message" do mod = Module.new do def self.name diff --git a/spec/ruby/language/lambda_spec.rb b/spec/ruby/language/lambda_spec.rb index 3f2cb0310c..1c9acba39c 100644 --- a/spec/ruby/language/lambda_spec.rb +++ b/spec/ruby/language/lambda_spec.rb @@ -179,7 +179,7 @@ describe "A lambda literal -> () { }" do result.should == [1, 2, 3, [4, 5], 6, [7, 8], 9, 10, 11, 12] end - ruby_version_is ''...'2.8' do + ruby_version_is ''...'3.0' do evaluate <<-ruby do @a = -> (*, **k) { k } ruby @@ -195,7 +195,7 @@ describe "A lambda literal -> () { }" do end end - ruby_version_is '2.8' do + ruby_version_is '3.0' do evaluate <<-ruby do @a = -> (*, **k) { k } ruby @@ -546,7 +546,7 @@ describe "A lambda expression 'lambda { ... }'" do result.should == [1, 2, 3, [4, 5], 6, [7, 8], 9, 10, 11, 12] end - ruby_version_is ''...'2.8' do + ruby_version_is ''...'3.0' do evaluate <<-ruby do @a = lambda { |*, **k| k } ruby @@ -562,7 +562,7 @@ describe "A lambda expression 'lambda { ... }'" do end end - ruby_version_is '2.8' do + ruby_version_is '3.0' do evaluate <<-ruby do @a = lambda { |*, **k| k } ruby diff --git a/spec/ruby/language/method_spec.rb b/spec/ruby/language/method_spec.rb index e31f3032b0..dd4ea51572 100644 --- a/spec/ruby/language/method_spec.rb +++ b/spec/ruby/language/method_spec.rb @@ -733,7 +733,7 @@ describe "A method" do end end - ruby_version_is ""..."2.8" do + ruby_version_is ""..."3.0" do evaluate <<-ruby do def m(a, b: 1) [a, b] end ruby @@ -768,7 +768,7 @@ describe "A method" do end end - ruby_version_is "2.8" do + ruby_version_is "3.0" do evaluate <<-ruby do def m(a, b: 1) [a, b] end ruby @@ -905,7 +905,7 @@ describe "A method" do result.should == [[1, 2, 3], 4, [5, 6], 7, [], 8] end - ruby_version_is ""..."2.8" do + ruby_version_is ""..."3.0" do evaluate <<-ruby do def m(a=1, b:) [a, b] end ruby @@ -930,7 +930,7 @@ describe "A method" do end end - ruby_version_is "2.8" do + ruby_version_is "3.0" do evaluate <<-ruby do def m(a=1, b:) [a, b] end ruby @@ -1167,7 +1167,7 @@ describe "A method" do end end - ruby_version_is "2.7"...'2.8' do + ruby_version_is "2.7"...'3.0' do evaluate <<-ruby do def m(*, a:) a end ruby @@ -1626,7 +1626,7 @@ describe "A method" do result.should == [1, 1, [], 2, 3, 2, 4, { h: 5, i: 6 }, l] end - ruby_version_is ''...'2.8' do + ruby_version_is ''...'3.0' do evaluate <<-ruby do def m(a, b = nil, c = nil, d, e: nil, **f) [a, b, c, d, e, f] @@ -1646,7 +1646,7 @@ describe "A method" do end end - ruby_version_is '2.8' do + ruby_version_is '3.0' do evaluate <<-ruby do def m(a, b = nil, c = nil, d, e: nil, **f) [a, b, c, d, e, f] @@ -1665,7 +1665,7 @@ describe "A method" do end end - ruby_version_is ''...'2.8' do + ruby_version_is ''...'3.0' do context "assigns keyword arguments from a passed Hash without modifying it" do evaluate <<-ruby do def m(a: nil); a; end @@ -1682,7 +1682,7 @@ describe "A method" do end end - ruby_version_is '2.8' do + ruby_version_is '3.0' do context "raises ArgumentError if passing hash as keyword arguments" do evaluate <<-ruby do def m(a: nil); a; end @@ -1787,7 +1787,7 @@ describe "An array-dereference method ([])" do end end -ruby_version_is '2.8' do +ruby_version_is '3.0' do describe "An endless method definition" do evaluate <<-ruby do def m(a) = a diff --git a/spec/ruby/language/numbered_parameters_spec.rb b/spec/ruby/language/numbered_parameters_spec.rb index 9dd79f44b8..b05c373a68 100644 --- a/spec/ruby/language/numbered_parameters_spec.rb +++ b/spec/ruby/language/numbered_parameters_spec.rb @@ -32,7 +32,7 @@ ruby_version_is "2.7" do }.should raise_error(SyntaxError, /numbered parameter is already used in.+ outer block here/m) end - ruby_version_is '2.7'...'2.8' do + ruby_version_is '2.7'...'3.0' do it "can be overwritten with local variable" do suppress_warning do eval <<~CODE @@ -49,7 +49,7 @@ ruby_version_is "2.7" do end end - ruby_version_is '2.8' do + ruby_version_is '3.0' do it "cannot be overwritten with local variable" do -> { eval <<~CODE diff --git a/spec/ruby/language/regexp_spec.rb b/spec/ruby/language/regexp_spec.rb index 059428ec69..def9bba5f7 100644 --- a/spec/ruby/language/regexp_spec.rb +++ b/spec/ruby/language/regexp_spec.rb @@ -18,7 +18,7 @@ describe "Literal Regexps" do /Hello/.should be_kind_of(Regexp) end - ruby_version_is "2.8" do + ruby_version_is "3.0" do it "is frozen" do /Hello/.should.frozen? end diff --git a/spec/ruby/language/send_spec.rb b/spec/ruby/language/send_spec.rb index 17381166dc..e57e2c65dc 100644 --- a/spec/ruby/language/send_spec.rb +++ b/spec/ruby/language/send_spec.rb @@ -421,7 +421,7 @@ describe "Invoking a method" do specs.rest_len(0,*a,4,*5,6,7,*c,-1).should == 11 end - ruby_version_is ""..."2.8" do + ruby_version_is ""..."3.0" do it "expands the Array elements from the splat after executing the arguments and block if no other arguments follow the splat" do def self.m(*args, &block) [args, block] @@ -437,7 +437,7 @@ describe "Invoking a method" do end end - ruby_version_is "2.8" do + ruby_version_is "3.0" do it "expands the Array elements from the splat before applying block argument operations" do def self.m(*args, &block) [args, block] diff --git a/spec/ruby/library/bigdecimal/to_s_spec.rb b/spec/ruby/library/bigdecimal/to_s_spec.rb index f2851976e2..4f1054d38e 100644 --- a/spec/ruby/library/bigdecimal/to_s_spec.rb +++ b/spec/ruby/library/bigdecimal/to_s_spec.rb @@ -83,7 +83,7 @@ describe "BigDecimal#to_s" do end end - ruby_version_is "2.8" do + ruby_version_is "3.0" do it "returns a String in US-ASCII encoding when Encoding.default_internal is nil" do Encoding.default_internal = nil BigDecimal('1.23').to_s.encoding.should equal(Encoding::US_ASCII) diff --git a/spec/ruby/library/net/http/http/get_spec.rb b/spec/ruby/library/net/http/http/get_spec.rb index 7676af3c79..0948006fca 100644 --- a/spec/ruby/library/net/http/http/get_spec.rb +++ b/spec/ruby/library/net/http/http/get_spec.rb @@ -79,7 +79,7 @@ describe "Net::HTTP.get" do end end - ruby_version_is "2.8" do # https://bugs.ruby-lang.org/issues/13882#note-6 + ruby_version_is "3.0" do # https://bugs.ruby-lang.org/issues/13882#note-6 it "lets the kill Thread exception goes through and does not replace it with Zlib::BufError" do socket, client_thread = start_threads begin diff --git a/spec/ruby/library/rexml/attribute/clone_spec.rb b/spec/ruby/library/rexml/attribute/clone_spec.rb index 44c8ddebcc..5c86468d45 100644 --- a/spec/ruby/library/rexml/attribute/clone_spec.rb +++ b/spec/ruby/library/rexml/attribute/clone_spec.rb @@ -1,6 +1,6 @@ require_relative '../../../spec_helper' -ruby_version_is ''...'2.8' do +ruby_version_is ''...'3.0' do require 'rexml/document' describe "REXML::Attribute#clone" do diff --git a/spec/ruby/library/rexml/attribute/element_spec.rb b/spec/ruby/library/rexml/attribute/element_spec.rb index 4fc4d9ed58..0e4ce46a4f 100644 --- a/spec/ruby/library/rexml/attribute/element_spec.rb +++ b/spec/ruby/library/rexml/attribute/element_spec.rb @@ -1,6 +1,6 @@ require_relative '../../../spec_helper' -ruby_version_is ''...'2.8' do +ruby_version_is ''...'3.0' do require 'rexml/document' describe "REXML::Attribute#element" do diff --git a/spec/ruby/library/rexml/attribute/equal_value_spec.rb b/spec/ruby/library/rexml/attribute/equal_value_spec.rb index a51e1cc390..1498bae624 100644 --- a/spec/ruby/library/rexml/attribute/equal_value_spec.rb +++ b/spec/ruby/library/rexml/attribute/equal_value_spec.rb @@ -1,6 +1,6 @@ require_relative '../../../spec_helper' -ruby_version_is ''...'2.8' do +ruby_version_is ''...'3.0' do require 'rexml/document' describe "REXML::Attribute#==" do diff --git a/spec/ruby/library/rexml/attribute/hash_spec.rb b/spec/ruby/library/rexml/attribute/hash_spec.rb index 544cb39515..7e0cbcc1ea 100644 --- a/spec/ruby/library/rexml/attribute/hash_spec.rb +++ b/spec/ruby/library/rexml/attribute/hash_spec.rb @@ -1,6 +1,6 @@ require_relative '../../../spec_helper' -ruby_version_is ''...'2.8' do +ruby_version_is ''...'3.0' do require 'rexml/document' describe "REXML::Attribute#hash" do diff --git a/spec/ruby/library/rexml/attribute/initialize_spec.rb b/spec/ruby/library/rexml/attribute/initialize_spec.rb index 84c17d8b7c..35b87b0733 100644 --- a/spec/ruby/library/rexml/attribute/initialize_spec.rb +++ b/spec/ruby/library/rexml/attribute/initialize_spec.rb @@ -1,6 +1,6 @@ require_relative '../../../spec_helper' -ruby_version_is ''...'2.8' do +ruby_version_is ''...'3.0' do require 'rexml/document' describe "REXML::Attribute#initialize" do diff --git a/spec/ruby/library/rexml/attribute/inspect_spec.rb b/spec/ruby/library/rexml/attribute/inspect_spec.rb index ffacf78de8..ee5236b98e 100644 --- a/spec/ruby/library/rexml/attribute/inspect_spec.rb +++ b/spec/ruby/library/rexml/attribute/inspect_spec.rb @@ -1,6 +1,6 @@ require_relative '../../../spec_helper' -ruby_version_is ''...'2.8' do +ruby_version_is ''...'3.0' do require 'rexml/document' describe "REXML::Attribute#inspect" do diff --git a/spec/ruby/library/rexml/attribute/namespace_spec.rb b/spec/ruby/library/rexml/attribute/namespace_spec.rb index 9b0ff1e9c2..645b3cd1b1 100644 --- a/spec/ruby/library/rexml/attribute/namespace_spec.rb +++ b/spec/ruby/library/rexml/attribute/namespace_spec.rb @@ -1,6 +1,6 @@ require_relative '../../../spec_helper' -ruby_version_is ''...'2.8' do +ruby_version_is ''...'3.0' do require 'rexml/document' describe "REXML::Attribute#namespace" do diff --git a/spec/ruby/library/rexml/attribute/node_type_spec.rb b/spec/ruby/library/rexml/attribute/node_type_spec.rb index f2ba0af839..da055ae8f0 100644 --- a/spec/ruby/library/rexml/attribute/node_type_spec.rb +++ b/spec/ruby/library/rexml/attribute/node_type_spec.rb @@ -1,6 +1,6 @@ require_relative '../../../spec_helper' -ruby_version_is ''...'2.8' do +ruby_version_is ''...'3.0' do require 'rexml/document' describe "REXML::Attribute#node_type" do diff --git a/spec/ruby/library/rexml/attribute/prefix_spec.rb b/spec/ruby/library/rexml/attribute/prefix_spec.rb index 0eee50de33..87bff4822b 100644 --- a/spec/ruby/library/rexml/attribute/prefix_spec.rb +++ b/spec/ruby/library/rexml/attribute/prefix_spec.rb @@ -1,6 +1,6 @@ require_relative '../../../spec_helper' -ruby_version_is ''...'2.8' do +ruby_version_is ''...'3.0' do require 'rexml/document' describe "REXML::Attribute#prefix" do diff --git a/spec/ruby/library/rexml/attribute/remove_spec.rb b/spec/ruby/library/rexml/attribute/remove_spec.rb index c7a9904eb8..5f928b1286 100644 --- a/spec/ruby/library/rexml/attribute/remove_spec.rb +++ b/spec/ruby/library/rexml/attribute/remove_spec.rb @@ -1,6 +1,6 @@ require_relative '../../../spec_helper' -ruby_version_is ''...'2.8' do +ruby_version_is ''...'3.0' do require 'rexml/document' describe "REXML::Attribute#remove" do diff --git a/spec/ruby/library/rexml/attribute/to_s_spec.rb b/spec/ruby/library/rexml/attribute/to_s_spec.rb index 00e7e96648..e362cee8f1 100644 --- a/spec/ruby/library/rexml/attribute/to_s_spec.rb +++ b/spec/ruby/library/rexml/attribute/to_s_spec.rb @@ -1,6 +1,6 @@ require_relative '../../../spec_helper' -ruby_version_is ''...'2.8' do +ruby_version_is ''...'3.0' do require 'rexml/document' describe "REXML::Attribute#to_s" do diff --git a/spec/ruby/library/rexml/attribute/to_string_spec.rb b/spec/ruby/library/rexml/attribute/to_string_spec.rb index f26c5b85f0..a9d249f5bb 100644 --- a/spec/ruby/library/rexml/attribute/to_string_spec.rb +++ b/spec/ruby/library/rexml/attribute/to_string_spec.rb @@ -1,6 +1,6 @@ require_relative '../../../spec_helper' -ruby_version_is ''...'2.8' do +ruby_version_is ''...'3.0' do require 'rexml/document' describe "REXML::Attribute#to_string" do diff --git a/spec/ruby/library/rexml/attribute/value_spec.rb b/spec/ruby/library/rexml/attribute/value_spec.rb index cf6d1deef4..77071f6f70 100644 --- a/spec/ruby/library/rexml/attribute/value_spec.rb +++ b/spec/ruby/library/rexml/attribute/value_spec.rb @@ -1,6 +1,6 @@ require_relative '../../../spec_helper' -ruby_version_is ''...'2.8' do +ruby_version_is ''...'3.0' do require 'rexml/document' describe "REXML::Attribute#value" do diff --git a/spec/ruby/library/rexml/attribute/write_spec.rb b/spec/ruby/library/rexml/attribute/write_spec.rb index f69689e724..0012b3cc77 100644 --- a/spec/ruby/library/rexml/attribute/write_spec.rb +++ b/spec/ruby/library/rexml/attribute/write_spec.rb @@ -1,6 +1,6 @@ require_relative '../../../spec_helper' -ruby_version_is ''...'2.8' do +ruby_version_is ''...'3.0' do require 'rexml/document' describe "REXML::Attribute#write" do diff --git a/spec/ruby/library/rexml/attribute/xpath_spec.rb b/spec/ruby/library/rexml/attribute/xpath_spec.rb index 945e76280f..0a09046b01 100644 --- a/spec/ruby/library/rexml/attribute/xpath_spec.rb +++ b/spec/ruby/library/rexml/attribute/xpath_spec.rb @@ -1,6 +1,6 @@ require_relative '../../../spec_helper' -ruby_version_is ''...'2.8' do +ruby_version_is ''...'3.0' do require 'rexml/document' describe "REXML::Attribute#xpath" do diff --git a/spec/ruby/library/rexml/attributes/add_spec.rb b/spec/ruby/library/rexml/attributes/add_spec.rb index fd23bd458c..e24e9fabbc 100644 --- a/spec/ruby/library/rexml/attributes/add_spec.rb +++ b/spec/ruby/library/rexml/attributes/add_spec.rb @@ -1,6 +1,6 @@ require_relative '../../../spec_helper' -ruby_version_is ''...'2.8' do +ruby_version_is ''...'3.0' do require_relative 'shared/add' require 'rexml/document' diff --git a/spec/ruby/library/rexml/attributes/append_spec.rb b/spec/ruby/library/rexml/attributes/append_spec.rb index 99585979f2..f96a727f47 100644 --- a/spec/ruby/library/rexml/attributes/append_spec.rb +++ b/spec/ruby/library/rexml/attributes/append_spec.rb @@ -1,6 +1,6 @@ require_relative '../../../spec_helper' -ruby_version_is ''...'2.8' do +ruby_version_is ''...'3.0' do require_relative 'shared/add' require 'rexml/document' diff --git a/spec/ruby/library/rexml/attributes/delete_all_spec.rb b/spec/ruby/library/rexml/attributes/delete_all_spec.rb index f5e6a897c5..707baa235b 100644 --- a/spec/ruby/library/rexml/attributes/delete_all_spec.rb +++ b/spec/ruby/library/rexml/attributes/delete_all_spec.rb @@ -1,6 +1,6 @@ require_relative '../../../spec_helper' -ruby_version_is ''...'2.8' do +ruby_version_is ''...'3.0' do require 'rexml/document' describe "REXML::Attributes#delete_all" do diff --git a/spec/ruby/library/rexml/attributes/delete_spec.rb b/spec/ruby/library/rexml/attributes/delete_spec.rb index 59641e55db..723fa70751 100644 --- a/spec/ruby/library/rexml/attributes/delete_spec.rb +++ b/spec/ruby/library/rexml/attributes/delete_spec.rb @@ -1,6 +1,6 @@ require_relative '../../../spec_helper' -ruby_version_is ''...'2.8' do +ruby_version_is ''...'3.0' do require 'rexml/document' describe "REXML::Attributes#delete" do diff --git a/spec/ruby/library/rexml/attributes/each_attribute_spec.rb b/spec/ruby/library/rexml/attributes/each_attribute_spec.rb index 1e6b5c1c1f..692cf4f943 100644 --- a/spec/ruby/library/rexml/attributes/each_attribute_spec.rb +++ b/spec/ruby/library/rexml/attributes/each_attribute_spec.rb @@ -1,6 +1,6 @@ require_relative '../../../spec_helper' -ruby_version_is ''...'2.8' do +ruby_version_is ''...'3.0' do require 'rexml/document' describe "REXML::Attributes#each_attribute" do diff --git a/spec/ruby/library/rexml/attributes/each_spec.rb b/spec/ruby/library/rexml/attributes/each_spec.rb index 4865114cf1..49add3b77b 100644 --- a/spec/ruby/library/rexml/attributes/each_spec.rb +++ b/spec/ruby/library/rexml/attributes/each_spec.rb @@ -1,6 +1,6 @@ require_relative '../../../spec_helper' -ruby_version_is ''...'2.8' do +ruby_version_is ''...'3.0' do require 'rexml/document' describe "REXML::Attributes#each" do diff --git a/spec/ruby/library/rexml/attributes/element_reference_spec.rb b/spec/ruby/library/rexml/attributes/element_reference_spec.rb index 86e0c57fc9..0d089eaab2 100644 --- a/spec/ruby/library/rexml/attributes/element_reference_spec.rb +++ b/spec/ruby/library/rexml/attributes/element_reference_spec.rb @@ -1,6 +1,6 @@ require_relative '../../../spec_helper' -ruby_version_is ''...'2.8' do +ruby_version_is ''...'3.0' do require 'rexml/document' describe "REXML::Attributes#[]" do diff --git a/spec/ruby/library/rexml/attributes/element_set_spec.rb b/spec/ruby/library/rexml/attributes/element_set_spec.rb index 90096be82c..834ad682a6 100644 --- a/spec/ruby/library/rexml/attributes/element_set_spec.rb +++ b/spec/ruby/library/rexml/attributes/element_set_spec.rb @@ -1,6 +1,6 @@ require_relative '../../../spec_helper' -ruby_version_is ''...'2.8' do +ruby_version_is ''...'3.0' do require 'rexml/document' describe "REXML::Attributes#[]=" do diff --git a/spec/ruby/library/rexml/attributes/get_attribute_ns_spec.rb b/spec/ruby/library/rexml/attributes/get_attribute_ns_spec.rb index 56ed733d37..1109ff519c 100644 --- a/spec/ruby/library/rexml/attributes/get_attribute_ns_spec.rb +++ b/spec/ruby/library/rexml/attributes/get_attribute_ns_spec.rb @@ -1,6 +1,6 @@ require_relative '../../../spec_helper' -ruby_version_is ''...'2.8' do +ruby_version_is ''...'3.0' do require 'rexml/document' describe "REXML::Attributes#get_attribute_ns" do diff --git a/spec/ruby/library/rexml/attributes/get_attribute_spec.rb b/spec/ruby/library/rexml/attributes/get_attribute_spec.rb index cf08446eaf..cc94191729 100644 --- a/spec/ruby/library/rexml/attributes/get_attribute_spec.rb +++ b/spec/ruby/library/rexml/attributes/get_attribute_spec.rb @@ -1,6 +1,6 @@ require_relative '../../../spec_helper' -ruby_version_is ''...'2.8' do +ruby_version_is ''...'3.0' do require 'rexml/document' describe "REXML::Attributes#get_attribute" do diff --git a/spec/ruby/library/rexml/attributes/initialize_spec.rb b/spec/ruby/library/rexml/attributes/initialize_spec.rb index f7c9652171..42ec742e60 100644 --- a/spec/ruby/library/rexml/attributes/initialize_spec.rb +++ b/spec/ruby/library/rexml/attributes/initialize_spec.rb @@ -1,6 +1,6 @@ require_relative '../../../spec_helper' -ruby_version_is ''...'2.8' do +ruby_version_is ''...'3.0' do require 'rexml/document' describe "REXML::Attributes#initialize" do diff --git a/spec/ruby/library/rexml/attributes/length_spec.rb b/spec/ruby/library/rexml/attributes/length_spec.rb index 60a348ef7b..81733b4a96 100644 --- a/spec/ruby/library/rexml/attributes/length_spec.rb +++ b/spec/ruby/library/rexml/attributes/length_spec.rb @@ -1,6 +1,6 @@ require_relative '../../../spec_helper' -ruby_version_is ''...'2.8' do +ruby_version_is ''...'3.0' do require_relative 'shared/length' require 'rexml/document' diff --git a/spec/ruby/library/rexml/attributes/namespaces_spec.rb b/spec/ruby/library/rexml/attributes/namespaces_spec.rb index 80c40ccc90..b88346854f 100644 --- a/spec/ruby/library/rexml/attributes/namespaces_spec.rb +++ b/spec/ruby/library/rexml/attributes/namespaces_spec.rb @@ -1,6 +1,6 @@ require_relative '../../../spec_helper' -ruby_version_is ''...'2.8' do +ruby_version_is ''...'3.0' do require 'rexml/document' describe "REXML::Attributes#namespaces" do diff --git a/spec/ruby/library/rexml/attributes/prefixes_spec.rb b/spec/ruby/library/rexml/attributes/prefixes_spec.rb index 2c1e3f8705..574b7ffbaf 100644 --- a/spec/ruby/library/rexml/attributes/prefixes_spec.rb +++ b/spec/ruby/library/rexml/attributes/prefixes_spec.rb @@ -1,6 +1,6 @@ require_relative '../../../spec_helper' -ruby_version_is ''...'2.8' do +ruby_version_is ''...'3.0' do require 'rexml/document' describe "REXML::Attributes#prefixes" do diff --git a/spec/ruby/library/rexml/attributes/size_spec.rb b/spec/ruby/library/rexml/attributes/size_spec.rb index e7fad6bd11..13ef08f644 100644 --- a/spec/ruby/library/rexml/attributes/size_spec.rb +++ b/spec/ruby/library/rexml/attributes/size_spec.rb @@ -1,6 +1,6 @@ require_relative '../../../spec_helper' -ruby_version_is ''...'2.8' do +ruby_version_is ''...'3.0' do require_relative 'shared/length' require 'rexml/document' diff --git a/spec/ruby/library/rexml/attributes/to_a_spec.rb b/spec/ruby/library/rexml/attributes/to_a_spec.rb index cc98e4f0d9..902cd86a29 100644 --- a/spec/ruby/library/rexml/attributes/to_a_spec.rb +++ b/spec/ruby/library/rexml/attributes/to_a_spec.rb @@ -1,6 +1,6 @@ require_relative '../../../spec_helper' -ruby_version_is ''...'2.8' do +ruby_version_is ''...'3.0' do require 'rexml/document' describe "REXML::Attributes#to_a" do diff --git a/spec/ruby/library/rexml/cdata/clone_spec.rb b/spec/ruby/library/rexml/cdata/clone_spec.rb index e8e322f9a5..abe1a0b062 100644 --- a/spec/ruby/library/rexml/cdata/clone_spec.rb +++ b/spec/ruby/library/rexml/cdata/clone_spec.rb @@ -1,6 +1,6 @@ require_relative '../../../spec_helper' -ruby_version_is ''...'2.8' do +ruby_version_is ''...'3.0' do require 'rexml/document' describe "REXML::CData#clone" do diff --git a/spec/ruby/library/rexml/cdata/initialize_spec.rb b/spec/ruby/library/rexml/cdata/initialize_spec.rb index 2ef1cab2b3..1393d97f4a 100644 --- a/spec/ruby/library/rexml/cdata/initialize_spec.rb +++ b/spec/ruby/library/rexml/cdata/initialize_spec.rb @@ -1,6 +1,6 @@ require_relative '../../../spec_helper' -ruby_version_is ''...'2.8' do +ruby_version_is ''...'3.0' do require 'rexml/document' describe "REXML::CData#initialize" do diff --git a/spec/ruby/library/rexml/cdata/to_s_spec.rb b/spec/ruby/library/rexml/cdata/to_s_spec.rb index e42d7491b8..a5c061f116 100644 --- a/spec/ruby/library/rexml/cdata/to_s_spec.rb +++ b/spec/ruby/library/rexml/cdata/to_s_spec.rb @@ -1,6 +1,6 @@ require_relative '../../../spec_helper' -ruby_version_is ''...'2.8' do +ruby_version_is ''...'3.0' do require_relative 'shared/to_s' require 'rexml/document' diff --git a/spec/ruby/library/rexml/cdata/value_spec.rb b/spec/ruby/library/rexml/cdata/value_spec.rb index 1c25cb205e..9f36226976 100644 --- a/spec/ruby/library/rexml/cdata/value_spec.rb +++ b/spec/ruby/library/rexml/cdata/value_spec.rb @@ -1,6 +1,6 @@ require_relative '../../../spec_helper' -ruby_version_is ''...'2.8' do +ruby_version_is ''...'3.0' do require_relative 'shared/to_s' require 'rexml/document' diff --git a/spec/ruby/library/rexml/document/add_element_spec.rb b/spec/ruby/library/rexml/document/add_element_spec.rb index cc0617c061..29dec0b24e 100644 --- a/spec/ruby/library/rexml/document/add_element_spec.rb +++ b/spec/ruby/library/rexml/document/add_element_spec.rb @@ -1,6 +1,6 @@ require_relative '../../../spec_helper' -ruby_version_is ''...'2.8' do +ruby_version_is ''...'3.0' do require 'rexml/document' describe "REXML::Document#add_element" do diff --git a/spec/ruby/library/rexml/document/add_spec.rb b/spec/ruby/library/rexml/document/add_spec.rb index 10056ed1e7..8666d3dbf9 100644 --- a/spec/ruby/library/rexml/document/add_spec.rb +++ b/spec/ruby/library/rexml/document/add_spec.rb @@ -1,6 +1,6 @@ require_relative '../../../spec_helper' -ruby_version_is ''...'2.8' do +ruby_version_is ''...'3.0' do require 'rexml/document' # This spec defines Document#add and Document#<< diff --git a/spec/ruby/library/rexml/document/clone_spec.rb b/spec/ruby/library/rexml/document/clone_spec.rb index 2106c72888..137fe8a073 100644 --- a/spec/ruby/library/rexml/document/clone_spec.rb +++ b/spec/ruby/library/rexml/document/clone_spec.rb @@ -1,6 +1,6 @@ require_relative '../../../spec_helper' -ruby_version_is ''...'2.8' do +ruby_version_is ''...'3.0' do require 'rexml/document' # According to the MRI documentation (http://www.ruby-doc.org/stdlib/libdoc/rexml/rdoc/index.html), diff --git a/spec/ruby/library/rexml/document/doctype_spec.rb b/spec/ruby/library/rexml/document/doctype_spec.rb index 4d14460ef4..e1b7ba4916 100644 --- a/spec/ruby/library/rexml/document/doctype_spec.rb +++ b/spec/ruby/library/rexml/document/doctype_spec.rb @@ -1,6 +1,6 @@ require_relative '../../../spec_helper' -ruby_version_is ''...'2.8' do +ruby_version_is ''...'3.0' do require 'rexml/document' describe "REXML::Document#doctype" do diff --git a/spec/ruby/library/rexml/document/encoding_spec.rb b/spec/ruby/library/rexml/document/encoding_spec.rb index aa140b0f6f..2cc947f06a 100644 --- a/spec/ruby/library/rexml/document/encoding_spec.rb +++ b/spec/ruby/library/rexml/document/encoding_spec.rb @@ -1,6 +1,6 @@ require_relative '../../../spec_helper' -ruby_version_is ''...'2.8' do +ruby_version_is ''...'3.0' do require 'rexml/document' describe "REXML::Document#encoding" do diff --git a/spec/ruby/library/rexml/document/expanded_name_spec.rb b/spec/ruby/library/rexml/document/expanded_name_spec.rb index 4f53914326..9d1025b5e0 100644 --- a/spec/ruby/library/rexml/document/expanded_name_spec.rb +++ b/spec/ruby/library/rexml/document/expanded_name_spec.rb @@ -1,6 +1,6 @@ require_relative '../../../spec_helper' -ruby_version_is ''...'2.8' do +ruby_version_is ''...'3.0' do require 'rexml/document' describe :document_expanded_name, shared: true do diff --git a/spec/ruby/library/rexml/document/new_spec.rb b/spec/ruby/library/rexml/document/new_spec.rb index 52b20341f4..4e24b6f5a1 100644 --- a/spec/ruby/library/rexml/document/new_spec.rb +++ b/spec/ruby/library/rexml/document/new_spec.rb @@ -1,6 +1,6 @@ require_relative '../../../spec_helper' -ruby_version_is ''...'2.8' do +ruby_version_is ''...'3.0' do require 'rexml/document' describe "REXML::Document#new" do diff --git a/spec/ruby/library/rexml/document/node_type_spec.rb b/spec/ruby/library/rexml/document/node_type_spec.rb index 13aa6a6eb5..b6d7e7a7da 100644 --- a/spec/ruby/library/rexml/document/node_type_spec.rb +++ b/spec/ruby/library/rexml/document/node_type_spec.rb @@ -1,6 +1,6 @@ require_relative '../../../spec_helper' -ruby_version_is ''...'2.8' do +ruby_version_is ''...'3.0' do require 'rexml/document' describe "REXML::Document#node_type" do diff --git a/spec/ruby/library/rexml/document/root_spec.rb b/spec/ruby/library/rexml/document/root_spec.rb index e01b0fa67c..1a584a720b 100644 --- a/spec/ruby/library/rexml/document/root_spec.rb +++ b/spec/ruby/library/rexml/document/root_spec.rb @@ -1,6 +1,6 @@ require_relative '../../../spec_helper' -ruby_version_is ''...'2.8' do +ruby_version_is ''...'3.0' do require 'rexml/document' describe "REXML::Document#root" do diff --git a/spec/ruby/library/rexml/document/stand_alone_spec.rb b/spec/ruby/library/rexml/document/stand_alone_spec.rb index 667b2c0184..e1c721e782 100644 --- a/spec/ruby/library/rexml/document/stand_alone_spec.rb +++ b/spec/ruby/library/rexml/document/stand_alone_spec.rb @@ -1,6 +1,6 @@ require_relative '../../../spec_helper' -ruby_version_is ''...'2.8' do +ruby_version_is ''...'3.0' do require 'rexml/document' describe "REXML::Document#stand_alone?" do diff --git a/spec/ruby/library/rexml/document/version_spec.rb b/spec/ruby/library/rexml/document/version_spec.rb index 8e0f66cb07..4f6b40551b 100644 --- a/spec/ruby/library/rexml/document/version_spec.rb +++ b/spec/ruby/library/rexml/document/version_spec.rb @@ -1,6 +1,6 @@ require_relative '../../../spec_helper' -ruby_version_is ''...'2.8' do +ruby_version_is ''...'3.0' do require 'rexml/document' describe "REXML::Document#version" do diff --git a/spec/ruby/library/rexml/document/write_spec.rb b/spec/ruby/library/rexml/document/write_spec.rb index 774c12982c..00c22141b3 100644 --- a/spec/ruby/library/rexml/document/write_spec.rb +++ b/spec/ruby/library/rexml/document/write_spec.rb @@ -1,6 +1,6 @@ require_relative '../../../spec_helper' -ruby_version_is ''...'2.8' do +ruby_version_is ''...'3.0' do require 'rexml/document' require 'rexml/formatters/transitive' diff --git a/spec/ruby/library/rexml/document/xml_decl_spec.rb b/spec/ruby/library/rexml/document/xml_decl_spec.rb index 6862c7bb6b..8ac47510b0 100644 --- a/spec/ruby/library/rexml/document/xml_decl_spec.rb +++ b/spec/ruby/library/rexml/document/xml_decl_spec.rb @@ -1,6 +1,6 @@ require_relative '../../../spec_helper' -ruby_version_is ''...'2.8' do +ruby_version_is ''...'3.0' do require 'rexml/document' describe "REXML::Document#xml_decl" do diff --git a/spec/ruby/library/rexml/element/add_attribute_spec.rb b/spec/ruby/library/rexml/element/add_attribute_spec.rb index b688f1db65..64f2ec84a3 100644 --- a/spec/ruby/library/rexml/element/add_attribute_spec.rb +++ b/spec/ruby/library/rexml/element/add_attribute_spec.rb @@ -1,6 +1,6 @@ require_relative '../../../spec_helper' -ruby_version_is ''...'2.8' do +ruby_version_is ''...'3.0' do require 'rexml/document' describe "REXML::Element#add_attribute" do diff --git a/spec/ruby/library/rexml/element/add_attributes_spec.rb b/spec/ruby/library/rexml/element/add_attributes_spec.rb index 8e7e991f11..f331803dd8 100644 --- a/spec/ruby/library/rexml/element/add_attributes_spec.rb +++ b/spec/ruby/library/rexml/element/add_attributes_spec.rb @@ -1,6 +1,6 @@ require_relative '../../../spec_helper' -ruby_version_is ''...'2.8' do +ruby_version_is ''...'3.0' do require 'rexml/document' describe "REXML::Element#add_attributes" do diff --git a/spec/ruby/library/rexml/element/add_element_spec.rb b/spec/ruby/library/rexml/element/add_element_spec.rb index 90fb36f8e3..8ba023f2c7 100644 --- a/spec/ruby/library/rexml/element/add_element_spec.rb +++ b/spec/ruby/library/rexml/element/add_element_spec.rb @@ -1,6 +1,6 @@ require_relative '../../../spec_helper' -ruby_version_is ''...'2.8' do +ruby_version_is ''...'3.0' do require 'rexml/document' describe "REXML::Element#add_element" do diff --git a/spec/ruby/library/rexml/element/add_namespace_spec.rb b/spec/ruby/library/rexml/element/add_namespace_spec.rb index 5e601dcf28..44b074bac7 100644 --- a/spec/ruby/library/rexml/element/add_namespace_spec.rb +++ b/spec/ruby/library/rexml/element/add_namespace_spec.rb @@ -1,6 +1,6 @@ require_relative '../../../spec_helper' -ruby_version_is ''...'2.8' do +ruby_version_is ''...'3.0' do require 'rexml/document' describe "REXML::Element#add_namespace" do diff --git a/spec/ruby/library/rexml/element/add_text_spec.rb b/spec/ruby/library/rexml/element/add_text_spec.rb index 200d748e61..3a0531ad42 100644 --- a/spec/ruby/library/rexml/element/add_text_spec.rb +++ b/spec/ruby/library/rexml/element/add_text_spec.rb @@ -1,6 +1,6 @@ require_relative '../../../spec_helper' -ruby_version_is ''...'2.8' do +ruby_version_is ''...'3.0' do require 'rexml/document' describe "REXML::Element#add_text" do diff --git a/spec/ruby/library/rexml/element/attribute_spec.rb b/spec/ruby/library/rexml/element/attribute_spec.rb index 7b2c26658a..b223d3440c 100644 --- a/spec/ruby/library/rexml/element/attribute_spec.rb +++ b/spec/ruby/library/rexml/element/attribute_spec.rb @@ -1,6 +1,6 @@ require_relative '../../../spec_helper' -ruby_version_is ''...'2.8' do +ruby_version_is ''...'3.0' do require 'rexml/document' describe "REXML::Element#attribute" do diff --git a/spec/ruby/library/rexml/element/attributes_spec.rb b/spec/ruby/library/rexml/element/attributes_spec.rb index 79a3368a9e..92bcecc40a 100644 --- a/spec/ruby/library/rexml/element/attributes_spec.rb +++ b/spec/ruby/library/rexml/element/attributes_spec.rb @@ -1,6 +1,6 @@ require_relative '../../../spec_helper' -ruby_version_is ''...'2.8' do +ruby_version_is ''...'3.0' do require 'rexml/document' describe "REXML::Element#attributes" do diff --git a/spec/ruby/library/rexml/element/cdatas_spec.rb b/spec/ruby/library/rexml/element/cdatas_spec.rb index ecbca94f62..988b2cb422 100644 --- a/spec/ruby/library/rexml/element/cdatas_spec.rb +++ b/spec/ruby/library/rexml/element/cdatas_spec.rb @@ -1,6 +1,6 @@ require_relative '../../../spec_helper' -ruby_version_is ''...'2.8' do +ruby_version_is ''...'3.0' do require 'rexml/document' describe "REXML::Element#cdatas" do diff --git a/spec/ruby/library/rexml/element/clone_spec.rb b/spec/ruby/library/rexml/element/clone_spec.rb index 06948585a4..490e43181f 100644 --- a/spec/ruby/library/rexml/element/clone_spec.rb +++ b/spec/ruby/library/rexml/element/clone_spec.rb @@ -1,6 +1,6 @@ require_relative '../../../spec_helper' -ruby_version_is ''...'2.8' do +ruby_version_is ''...'3.0' do require 'rexml/document' describe "REXML::Element#clone" do diff --git a/spec/ruby/library/rexml/element/comments_spec.rb b/spec/ruby/library/rexml/element/comments_spec.rb index 26043366d3..84ab9a7469 100644 --- a/spec/ruby/library/rexml/element/comments_spec.rb +++ b/spec/ruby/library/rexml/element/comments_spec.rb @@ -1,6 +1,6 @@ require_relative '../../../spec_helper' -ruby_version_is ''...'2.8' do +ruby_version_is ''...'3.0' do require 'rexml/document' describe "REXML::Element#comments" do diff --git a/spec/ruby/library/rexml/element/delete_attribute_spec.rb b/spec/ruby/library/rexml/element/delete_attribute_spec.rb index dab20468c4..e2ba81eb0d 100644 --- a/spec/ruby/library/rexml/element/delete_attribute_spec.rb +++ b/spec/ruby/library/rexml/element/delete_attribute_spec.rb @@ -1,6 +1,6 @@ require_relative '../../../spec_helper' -ruby_version_is ''...'2.8' do +ruby_version_is ''...'3.0' do require 'rexml/document' describe "REXML::Element#delete_attribute" do diff --git a/spec/ruby/library/rexml/element/delete_element_spec.rb b/spec/ruby/library/rexml/element/delete_element_spec.rb index f2c50eb95e..c0b486a6f7 100644 --- a/spec/ruby/library/rexml/element/delete_element_spec.rb +++ b/spec/ruby/library/rexml/element/delete_element_spec.rb @@ -1,6 +1,6 @@ require_relative '../../../spec_helper' -ruby_version_is ''...'2.8' do +ruby_version_is ''...'3.0' do require 'rexml/document' describe "REXML::Element#delete_element" do diff --git a/spec/ruby/library/rexml/element/delete_namespace_spec.rb b/spec/ruby/library/rexml/element/delete_namespace_spec.rb index 4b37c2c41c..a7763d51e8 100644 --- a/spec/ruby/library/rexml/element/delete_namespace_spec.rb +++ b/spec/ruby/library/rexml/element/delete_namespace_spec.rb @@ -1,6 +1,6 @@ require_relative '../../../spec_helper' -ruby_version_is ''...'2.8' do +ruby_version_is ''...'3.0' do require 'rexml/document' describe "REXML::Element#delete_namespace" do diff --git a/spec/ruby/library/rexml/element/document_spec.rb b/spec/ruby/library/rexml/element/document_spec.rb index c9f74c4056..754f27d8a0 100644 --- a/spec/ruby/library/rexml/element/document_spec.rb +++ b/spec/ruby/library/rexml/element/document_spec.rb @@ -1,6 +1,6 @@ require_relative '../../../spec_helper' -ruby_version_is ''...'2.8' do +ruby_version_is ''...'3.0' do require 'rexml/document' describe "REXML::Element#document" do diff --git a/spec/ruby/library/rexml/element/each_element_with_attribute_spec.rb b/spec/ruby/library/rexml/element/each_element_with_attribute_spec.rb index 5d6f4b371a..f2d779e577 100644 --- a/spec/ruby/library/rexml/element/each_element_with_attribute_spec.rb +++ b/spec/ruby/library/rexml/element/each_element_with_attribute_spec.rb @@ -1,6 +1,6 @@ require_relative '../../../spec_helper' -ruby_version_is ''...'2.8' do +ruby_version_is ''...'3.0' do require 'rexml/document' describe "REXML::Element#each_element_with_attributes" do diff --git a/spec/ruby/library/rexml/element/each_element_with_text_spec.rb b/spec/ruby/library/rexml/element/each_element_with_text_spec.rb index 65f5ea5f11..8f9d062c99 100644 --- a/spec/ruby/library/rexml/element/each_element_with_text_spec.rb +++ b/spec/ruby/library/rexml/element/each_element_with_text_spec.rb @@ -1,6 +1,6 @@ require_relative '../../../spec_helper' -ruby_version_is ''...'2.8' do +ruby_version_is ''...'3.0' do require 'rexml/document' describe "REXML::Element#each_element_with_text" do diff --git a/spec/ruby/library/rexml/element/element_reference_spec.rb b/spec/ruby/library/rexml/element/element_reference_spec.rb index 0deaf990eb..9e5d371ce4 100644 --- a/spec/ruby/library/rexml/element/element_reference_spec.rb +++ b/spec/ruby/library/rexml/element/element_reference_spec.rb @@ -1,6 +1,6 @@ require_relative '../../../spec_helper' -ruby_version_is ''...'2.8' do +ruby_version_is ''...'3.0' do require 'rexml/document' describe "REXML::Element#[]" do diff --git a/spec/ruby/library/rexml/element/get_text_spec.rb b/spec/ruby/library/rexml/element/get_text_spec.rb index cfdc758acd..0fa8d7cb3f 100644 --- a/spec/ruby/library/rexml/element/get_text_spec.rb +++ b/spec/ruby/library/rexml/element/get_text_spec.rb @@ -1,6 +1,6 @@ require_relative '../../../spec_helper' -ruby_version_is ''...'2.8' do +ruby_version_is ''...'3.0' do require 'rexml/document' describe "REXML::Element#get_text" do diff --git a/spec/ruby/library/rexml/element/has_attributes_spec.rb b/spec/ruby/library/rexml/element/has_attributes_spec.rb index 83d71396c4..af3ce8ce1b 100644 --- a/spec/ruby/library/rexml/element/has_attributes_spec.rb +++ b/spec/ruby/library/rexml/element/has_attributes_spec.rb @@ -1,6 +1,6 @@ require_relative '../../../spec_helper' -ruby_version_is ''...'2.8' do +ruby_version_is ''...'3.0' do require 'rexml/document' describe "REXML::Element#has_attributes?" do diff --git a/spec/ruby/library/rexml/element/has_elements_spec.rb b/spec/ruby/library/rexml/element/has_elements_spec.rb index 815a987ca0..04c7fe01a5 100644 --- a/spec/ruby/library/rexml/element/has_elements_spec.rb +++ b/spec/ruby/library/rexml/element/has_elements_spec.rb @@ -1,6 +1,6 @@ require_relative '../../../spec_helper' -ruby_version_is ''...'2.8' do +ruby_version_is ''...'3.0' do require 'rexml/document' describe "REXML::Element#has_elements?" do diff --git a/spec/ruby/library/rexml/element/has_text_spec.rb b/spec/ruby/library/rexml/element/has_text_spec.rb index f2c5bc4ffa..de19fe0763 100644 --- a/spec/ruby/library/rexml/element/has_text_spec.rb +++ b/spec/ruby/library/rexml/element/has_text_spec.rb @@ -1,6 +1,6 @@ require_relative '../../../spec_helper' -ruby_version_is ''...'2.8' do +ruby_version_is ''...'3.0' do require 'rexml/document' describe "REXML::Element#has_text?" do diff --git a/spec/ruby/library/rexml/element/inspect_spec.rb b/spec/ruby/library/rexml/element/inspect_spec.rb index 5eb8ef2265..ec16c136ee 100644 --- a/spec/ruby/library/rexml/element/inspect_spec.rb +++ b/spec/ruby/library/rexml/element/inspect_spec.rb @@ -1,6 +1,6 @@ require_relative '../../../spec_helper' -ruby_version_is ''...'2.8' do +ruby_version_is ''...'3.0' do require 'rexml/document' describe "REXML::Element#inspect" do diff --git a/spec/ruby/library/rexml/element/instructions_spec.rb b/spec/ruby/library/rexml/element/instructions_spec.rb index bd9dfcef50..11f1396df0 100644 --- a/spec/ruby/library/rexml/element/instructions_spec.rb +++ b/spec/ruby/library/rexml/element/instructions_spec.rb @@ -1,6 +1,6 @@ require_relative '../../../spec_helper' -ruby_version_is ''...'2.8' do +ruby_version_is ''...'3.0' do require 'rexml/document' describe "REXML::Element#instructions" do diff --git a/spec/ruby/library/rexml/element/namespace_spec.rb b/spec/ruby/library/rexml/element/namespace_spec.rb index a359887826..28966289c5 100644 --- a/spec/ruby/library/rexml/element/namespace_spec.rb +++ b/spec/ruby/library/rexml/element/namespace_spec.rb @@ -1,6 +1,6 @@ require_relative '../../../spec_helper' -ruby_version_is ''...'2.8' do +ruby_version_is ''...'3.0' do require 'rexml/document' describe "REXML::Element#namespace" do diff --git a/spec/ruby/library/rexml/element/namespaces_spec.rb b/spec/ruby/library/rexml/element/namespaces_spec.rb index 7bf8ec6421..4544540173 100644 --- a/spec/ruby/library/rexml/element/namespaces_spec.rb +++ b/spec/ruby/library/rexml/element/namespaces_spec.rb @@ -1,6 +1,6 @@ require_relative '../../../spec_helper' -ruby_version_is ''...'2.8' do +ruby_version_is ''...'3.0' do require 'rexml/document' describe "REXML::Element#namespaces" do diff --git a/spec/ruby/library/rexml/element/new_spec.rb b/spec/ruby/library/rexml/element/new_spec.rb index 35a8438495..c6ab289476 100644 --- a/spec/ruby/library/rexml/element/new_spec.rb +++ b/spec/ruby/library/rexml/element/new_spec.rb @@ -1,6 +1,6 @@ require_relative '../../../spec_helper' -ruby_version_is ''...'2.8' do +ruby_version_is ''...'3.0' do require 'rexml/document' describe "REXML::Element#new" do diff --git a/spec/ruby/library/rexml/element/next_element_spec.rb b/spec/ruby/library/rexml/element/next_element_spec.rb index 2c7875a248..46d8f74760 100644 --- a/spec/ruby/library/rexml/element/next_element_spec.rb +++ b/spec/ruby/library/rexml/element/next_element_spec.rb @@ -1,6 +1,6 @@ require_relative '../../../spec_helper' -ruby_version_is ''...'2.8' do +ruby_version_is ''...'3.0' do require 'rexml/document' describe "REXML::Element#next_element" do diff --git a/spec/ruby/library/rexml/element/node_type_spec.rb b/spec/ruby/library/rexml/element/node_type_spec.rb index d641dd89d3..a39c2deca5 100644 --- a/spec/ruby/library/rexml/element/node_type_spec.rb +++ b/spec/ruby/library/rexml/element/node_type_spec.rb @@ -1,6 +1,6 @@ require_relative '../../../spec_helper' -ruby_version_is ''...'2.8' do +ruby_version_is ''...'3.0' do require 'rexml/document' describe "REXML::Element#node_type" do diff --git a/spec/ruby/library/rexml/element/prefixes_spec.rb b/spec/ruby/library/rexml/element/prefixes_spec.rb index 77557e165a..ea4caab4bc 100644 --- a/spec/ruby/library/rexml/element/prefixes_spec.rb +++ b/spec/ruby/library/rexml/element/prefixes_spec.rb @@ -1,6 +1,6 @@ require_relative '../../../spec_helper' -ruby_version_is ''...'2.8' do +ruby_version_is ''...'3.0' do require 'rexml/document' describe "REXML::Element#prefixes" do diff --git a/spec/ruby/library/rexml/element/previous_element_spec.rb b/spec/ruby/library/rexml/element/previous_element_spec.rb index aa19c187be..a43b1ddd10 100644 --- a/spec/ruby/library/rexml/element/previous_element_spec.rb +++ b/spec/ruby/library/rexml/element/previous_element_spec.rb @@ -1,6 +1,6 @@ require_relative '../../../spec_helper' -ruby_version_is ''...'2.8' do +ruby_version_is ''...'3.0' do require 'rexml/document' describe "REXML::Element#previous_element" do diff --git a/spec/ruby/library/rexml/element/raw_spec.rb b/spec/ruby/library/rexml/element/raw_spec.rb index 2a913e1ac7..200a99d194 100644 --- a/spec/ruby/library/rexml/element/raw_spec.rb +++ b/spec/ruby/library/rexml/element/raw_spec.rb @@ -1,6 +1,6 @@ require_relative '../../../spec_helper' -ruby_version_is ''...'2.8' do +ruby_version_is ''...'3.0' do require 'rexml/document' describe "REXML::Element#raw" do diff --git a/spec/ruby/library/rexml/element/root_spec.rb b/spec/ruby/library/rexml/element/root_spec.rb index 4e88446ac2..52aa4571b9 100644 --- a/spec/ruby/library/rexml/element/root_spec.rb +++ b/spec/ruby/library/rexml/element/root_spec.rb @@ -1,6 +1,6 @@ require_relative '../../../spec_helper' -ruby_version_is ''...'2.8' do +ruby_version_is ''...'3.0' do require 'rexml/document' describe "REXML::Element#root" do diff --git a/spec/ruby/library/rexml/element/text_spec.rb b/spec/ruby/library/rexml/element/text_spec.rb index b7d493589e..3234bba153 100644 --- a/spec/ruby/library/rexml/element/text_spec.rb +++ b/spec/ruby/library/rexml/element/text_spec.rb @@ -1,6 +1,6 @@ require_relative '../../../spec_helper' -ruby_version_is ''...'2.8' do +ruby_version_is ''...'3.0' do require 'rexml/document' describe "REXML::Element#text" do diff --git a/spec/ruby/library/rexml/element/texts_spec.rb b/spec/ruby/library/rexml/element/texts_spec.rb index 7f610ba31b..2d374d5e66 100644 --- a/spec/ruby/library/rexml/element/texts_spec.rb +++ b/spec/ruby/library/rexml/element/texts_spec.rb @@ -1,6 +1,6 @@ require_relative '../../../spec_helper' -ruby_version_is ''...'2.8' do +ruby_version_is ''...'3.0' do require 'rexml/document' describe "REXML::Element#texts" do diff --git a/spec/ruby/library/rexml/element/whitespace_spec.rb b/spec/ruby/library/rexml/element/whitespace_spec.rb index 8cd2e5b5e8..f455067922 100644 --- a/spec/ruby/library/rexml/element/whitespace_spec.rb +++ b/spec/ruby/library/rexml/element/whitespace_spec.rb @@ -1,6 +1,6 @@ require_relative '../../../spec_helper' -ruby_version_is ''...'2.8' do +ruby_version_is ''...'3.0' do require 'rexml/document' describe "REXML::Element#whitespace" do diff --git a/spec/ruby/library/rexml/node/each_recursive_spec.rb b/spec/ruby/library/rexml/node/each_recursive_spec.rb index 4a669a399d..da347b1389 100644 --- a/spec/ruby/library/rexml/node/each_recursive_spec.rb +++ b/spec/ruby/library/rexml/node/each_recursive_spec.rb @@ -1,6 +1,6 @@ require_relative '../../../spec_helper' -ruby_version_is ''...'2.8' do +ruby_version_is ''...'3.0' do require 'rexml/document' describe "REXML::Node#each_recursive" do diff --git a/spec/ruby/library/rexml/node/find_first_recursive_spec.rb b/spec/ruby/library/rexml/node/find_first_recursive_spec.rb index ab7900a3ac..2a4f1097ae 100644 --- a/spec/ruby/library/rexml/node/find_first_recursive_spec.rb +++ b/spec/ruby/library/rexml/node/find_first_recursive_spec.rb @@ -1,6 +1,6 @@ require_relative '../../../spec_helper' -ruby_version_is ''...'2.8' do +ruby_version_is ''...'3.0' do require 'rexml/document' describe "REXML::Node#find_first_recursive" do diff --git a/spec/ruby/library/rexml/node/index_in_parent_spec.rb b/spec/ruby/library/rexml/node/index_in_parent_spec.rb index 1c75c8cd54..55909f86d6 100644 --- a/spec/ruby/library/rexml/node/index_in_parent_spec.rb +++ b/spec/ruby/library/rexml/node/index_in_parent_spec.rb @@ -1,6 +1,6 @@ require_relative '../../../spec_helper' -ruby_version_is ''...'2.8' do +ruby_version_is ''...'3.0' do require 'rexml/document' describe "REXML::Node#index_in_parent" do diff --git a/spec/ruby/library/rexml/node/next_sibling_node_spec.rb b/spec/ruby/library/rexml/node/next_sibling_node_spec.rb index 0aac3fee0f..7aae861d75 100644 --- a/spec/ruby/library/rexml/node/next_sibling_node_spec.rb +++ b/spec/ruby/library/rexml/node/next_sibling_node_spec.rb @@ -1,6 +1,6 @@ require_relative '../../../spec_helper' -ruby_version_is ''...'2.8' do +ruby_version_is ''...'3.0' do require 'rexml/document' describe "REXML::Node#next_sibling_node" do diff --git a/spec/ruby/library/rexml/node/parent_spec.rb b/spec/ruby/library/rexml/node/parent_spec.rb index 0a31abaf0f..07425e8f36 100644 --- a/spec/ruby/library/rexml/node/parent_spec.rb +++ b/spec/ruby/library/rexml/node/parent_spec.rb @@ -1,6 +1,6 @@ require_relative '../../../spec_helper' -ruby_version_is ''...'2.8' do +ruby_version_is ''...'3.0' do require 'rexml/document' describe "REXML::Node#parent?" do diff --git a/spec/ruby/library/rexml/node/previous_sibling_node_spec.rb b/spec/ruby/library/rexml/node/previous_sibling_node_spec.rb index ca07e1e1f9..11263968a7 100644 --- a/spec/ruby/library/rexml/node/previous_sibling_node_spec.rb +++ b/spec/ruby/library/rexml/node/previous_sibling_node_spec.rb @@ -1,6 +1,6 @@ require_relative '../../../spec_helper' -ruby_version_is ''...'2.8' do +ruby_version_is ''...'3.0' do require 'rexml/document' describe "REXML::Node#previous_sibling_node" do diff --git a/spec/ruby/library/rexml/text/append_spec.rb b/spec/ruby/library/rexml/text/append_spec.rb index be5636e84d..5e7a5bae7c 100644 --- a/spec/ruby/library/rexml/text/append_spec.rb +++ b/spec/ruby/library/rexml/text/append_spec.rb @@ -1,6 +1,6 @@ require_relative '../../../spec_helper' -ruby_version_is ''...'2.8' do +ruby_version_is ''...'3.0' do require 'rexml/document' describe "REXML::Text#<<" do diff --git a/spec/ruby/library/rexml/text/clone_spec.rb b/spec/ruby/library/rexml/text/clone_spec.rb index 28feef40e9..7801782ff5 100644 --- a/spec/ruby/library/rexml/text/clone_spec.rb +++ b/spec/ruby/library/rexml/text/clone_spec.rb @@ -1,6 +1,6 @@ require_relative '../../../spec_helper' -ruby_version_is ''...'2.8' do +ruby_version_is ''...'3.0' do require 'rexml/document' describe "REXML::Text#clone" do diff --git a/spec/ruby/library/rexml/text/comparison_spec.rb b/spec/ruby/library/rexml/text/comparison_spec.rb index ebd95683c6..119dd050a6 100644 --- a/spec/ruby/library/rexml/text/comparison_spec.rb +++ b/spec/ruby/library/rexml/text/comparison_spec.rb @@ -1,6 +1,6 @@ require_relative '../../../spec_helper' -ruby_version_is ''...'2.8' do +ruby_version_is ''...'3.0' do require 'rexml/document' describe "REXML::Text#<=>" do diff --git a/spec/ruby/library/rexml/text/empty_spec.rb b/spec/ruby/library/rexml/text/empty_spec.rb index 18f31580ad..4c9c899bcb 100644 --- a/spec/ruby/library/rexml/text/empty_spec.rb +++ b/spec/ruby/library/rexml/text/empty_spec.rb @@ -1,6 +1,6 @@ require_relative '../../../spec_helper' -ruby_version_is ''...'2.8' do +ruby_version_is ''...'3.0' do require 'rexml/document' describe "REXML::Text#empty?" do diff --git a/spec/ruby/library/rexml/text/indent_text_spec.rb b/spec/ruby/library/rexml/text/indent_text_spec.rb index 16cba7faf6..73065c37da 100644 --- a/spec/ruby/library/rexml/text/indent_text_spec.rb +++ b/spec/ruby/library/rexml/text/indent_text_spec.rb @@ -1,6 +1,6 @@ require_relative '../../../spec_helper' -ruby_version_is ''...'2.8' do +ruby_version_is ''...'3.0' do require 'rexml/document' describe "REXML::Text#indent_text" do diff --git a/spec/ruby/library/rexml/text/inspect_spec.rb b/spec/ruby/library/rexml/text/inspect_spec.rb index 87203b246c..af389890ee 100644 --- a/spec/ruby/library/rexml/text/inspect_spec.rb +++ b/spec/ruby/library/rexml/text/inspect_spec.rb @@ -1,6 +1,6 @@ require_relative '../../../spec_helper' -ruby_version_is ''...'2.8' do +ruby_version_is ''...'3.0' do require 'rexml/document' describe "REXML::Text#inspect" do diff --git a/spec/ruby/library/rexml/text/new_spec.rb b/spec/ruby/library/rexml/text/new_spec.rb index 7a39f11fa6..8b33da9294 100644 --- a/spec/ruby/library/rexml/text/new_spec.rb +++ b/spec/ruby/library/rexml/text/new_spec.rb @@ -1,6 +1,6 @@ require_relative '../../../spec_helper' -ruby_version_is ''...'2.8' do +ruby_version_is ''...'3.0' do require 'rexml/document' describe "REXML::Text.new" do diff --git a/spec/ruby/library/rexml/text/node_type_spec.rb b/spec/ruby/library/rexml/text/node_type_spec.rb index 17fefb87f1..f44a1ede3e 100644 --- a/spec/ruby/library/rexml/text/node_type_spec.rb +++ b/spec/ruby/library/rexml/text/node_type_spec.rb @@ -1,6 +1,6 @@ require_relative '../../../spec_helper' -ruby_version_is ''...'2.8' do +ruby_version_is ''...'3.0' do require 'rexml/document' describe "REXML::Text#node_type" do diff --git a/spec/ruby/library/rexml/text/normalize_spec.rb b/spec/ruby/library/rexml/text/normalize_spec.rb index 10ce92615a..cde11ec3c9 100644 --- a/spec/ruby/library/rexml/text/normalize_spec.rb +++ b/spec/ruby/library/rexml/text/normalize_spec.rb @@ -1,6 +1,6 @@ require_relative '../../../spec_helper' -ruby_version_is ''...'2.8' do +ruby_version_is ''...'3.0' do require 'rexml/document' describe "REXML::Text.normalize" do diff --git a/spec/ruby/library/rexml/text/read_with_substitution_spec.rb b/spec/ruby/library/rexml/text/read_with_substitution_spec.rb index 4bf54c1b31..7ff26f4d53 100644 --- a/spec/ruby/library/rexml/text/read_with_substitution_spec.rb +++ b/spec/ruby/library/rexml/text/read_with_substitution_spec.rb @@ -1,6 +1,6 @@ require_relative '../../../spec_helper' -ruby_version_is ''...'2.8' do +ruby_version_is ''...'3.0' do require 'rexml/document' describe "REXML::Text.read_with_substitution" do diff --git a/spec/ruby/library/rexml/text/to_s_spec.rb b/spec/ruby/library/rexml/text/to_s_spec.rb index f7e0e0b284..e67632c9a1 100644 --- a/spec/ruby/library/rexml/text/to_s_spec.rb +++ b/spec/ruby/library/rexml/text/to_s_spec.rb @@ -1,6 +1,6 @@ require_relative '../../../spec_helper' -ruby_version_is ''...'2.8' do +ruby_version_is ''...'3.0' do require 'rexml/document' describe "REXML::Text#to_s" do diff --git a/spec/ruby/library/rexml/text/unnormalize_spec.rb b/spec/ruby/library/rexml/text/unnormalize_spec.rb index 0f173710fa..7b507194d0 100644 --- a/spec/ruby/library/rexml/text/unnormalize_spec.rb +++ b/spec/ruby/library/rexml/text/unnormalize_spec.rb @@ -1,6 +1,6 @@ require_relative '../../../spec_helper' -ruby_version_is ''...'2.8' do +ruby_version_is ''...'3.0' do require 'rexml/document' describe "REXML::Text.unnormalize" do diff --git a/spec/ruby/library/rexml/text/value_spec.rb b/spec/ruby/library/rexml/text/value_spec.rb index f566412128..53d40c765f 100644 --- a/spec/ruby/library/rexml/text/value_spec.rb +++ b/spec/ruby/library/rexml/text/value_spec.rb @@ -1,6 +1,6 @@ require_relative '../../../spec_helper' -ruby_version_is ''...'2.8' do +ruby_version_is ''...'3.0' do require 'rexml/document' describe "REXML::Text#value" do diff --git a/spec/ruby/library/rexml/text/wrap_spec.rb b/spec/ruby/library/rexml/text/wrap_spec.rb index 415775dd47..331a8439e2 100644 --- a/spec/ruby/library/rexml/text/wrap_spec.rb +++ b/spec/ruby/library/rexml/text/wrap_spec.rb @@ -1,6 +1,6 @@ require_relative '../../../spec_helper' -ruby_version_is ''...'2.8' do +ruby_version_is ''...'3.0' do require 'rexml/document' describe "REXML::Text#wrap" do diff --git a/spec/ruby/library/rexml/text/write_with_substitution_spec.rb b/spec/ruby/library/rexml/text/write_with_substitution_spec.rb index 1737b443d7..840f141e3d 100644 --- a/spec/ruby/library/rexml/text/write_with_substitution_spec.rb +++ b/spec/ruby/library/rexml/text/write_with_substitution_spec.rb @@ -1,6 +1,6 @@ require_relative '../../../spec_helper' -ruby_version_is ''...'2.8' do +ruby_version_is ''...'3.0' do require 'rexml/document' describe "REXML::Text#write_with_substitution" do diff --git a/spec/ruby/library/stringio/append_spec.rb b/spec/ruby/library/stringio/append_spec.rb index b35d17ed31..d0cf5550cd 100644 --- a/spec/ruby/library/stringio/append_spec.rb +++ b/spec/ruby/library/stringio/append_spec.rb @@ -36,7 +36,7 @@ describe "StringIO#<< when passed [Object]" do end end - ruby_version_is ""..."2.8" do + 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 diff --git a/spec/ruby/library/stringio/reopen_spec.rb b/spec/ruby/library/stringio/reopen_spec.rb index 9943978377..6752cf9970 100644 --- a/spec/ruby/library/stringio/reopen_spec.rb +++ b/spec/ruby/library/stringio/reopen_spec.rb @@ -23,7 +23,7 @@ describe "StringIO#reopen when passed [Object, Integer]" do @io.string.should == "reopened, another time" end - ruby_version_is ""..."2.8" do + 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) @@ -92,7 +92,7 @@ describe "StringIO#reopen when passed [Object, Object]" do str.should == "" end - ruby_version_is ""..."2.8" do + 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") @@ -164,7 +164,7 @@ describe "StringIO#reopen when passed [String]" do @io.string.should == "reopened" end - ruby_version_is ""..."2.8" do + ruby_version_is ""..."3.0" do # NOTE: WEIRD! it "does not taint self when the passed Object was tainted" do @io.reopen("reopened".taint) diff --git a/spec/ruby/library/stringio/shared/write.rb b/spec/ruby/library/stringio/shared/write.rb index dc5e1442ec..080729217b 100644 --- a/spec/ruby/library/stringio/shared/write.rb +++ b/spec/ruby/library/stringio/shared/write.rb @@ -52,7 +52,7 @@ describe :stringio_write_string, shared: true do end end - ruby_version_is ""..."2.8" do + 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 diff --git a/spec/ruby/optional/capi/util_spec.rb b/spec/ruby/optional/capi/util_spec.rb index 099222b2d0..0251c7c62b 100644 --- a/spec/ruby/optional/capi/util_spec.rb +++ b/spec/ruby/optional/capi/util_spec.rb @@ -115,7 +115,7 @@ describe "C-API Util function" do ScratchPad.recorded.should == [1, nil] end - ruby_version_is ''...'2.8' do + ruby_version_is ''...'3.0' do it "assigns required and Hash arguments with nil Hash" do suppress_warning do @o.rb_scan_args([1, nil], "1:", 2, @acc).should == 1 @@ -124,7 +124,7 @@ describe "C-API Util function" do end end - ruby_version_is '2.8' do + ruby_version_is '3.0' do it "rejects the use of nil as a hash" do -> { @o.rb_scan_args([1, nil], "1:", 2, @acc).should == 1 @@ -144,7 +144,7 @@ describe "C-API Util function" do ScratchPad.recorded.should == [1, 2, [3, 4], 5, h, @prc] end - ruby_version_is ''...'2.8' do + ruby_version_is ''...'3.0' do # r43934 it "rejects non-keyword arguments" do h = {1 => 2, 3 => 4} @@ -175,7 +175,7 @@ describe "C-API Util function" do end end - ruby_version_is '2.8' do + ruby_version_is '3.0' do it "does not reject non-symbol keys in keyword arguments" do h = {1 => 2, 3 => 4} @o.rb_scan_args([h], "#{@keyword_prefix}0:", 1, @acc).should == 0 diff --git a/spec/ruby/security/cve_2014_8080_spec.rb b/spec/ruby/security/cve_2014_8080_spec.rb index d881032ef7..a3f4483994 100644 --- a/spec/ruby/security/cve_2014_8080_spec.rb +++ b/spec/ruby/security/cve_2014_8080_spec.rb @@ -1,7 +1,7 @@ require_relative '../spec_helper' -ruby_version_is ''...'2.8' do +ruby_version_is ''...'3.0' do require 'rexml/document' describe "REXML::Document.new" do |