From 9ea1055eabcb0e498f387953a28747dea9bf2308 Mon Sep 17 00:00:00 2001 From: Benoit Daloze Date: Fri, 4 Dec 2020 16:32:14 +0100 Subject: 2.8 -> 3.0 in specs --- spec/ruby/core/argf/bytes_spec.rb | 2 +- spec/ruby/core/argf/chars_spec.rb | 2 +- spec/ruby/core/argf/codepoints_spec.rb | 2 +- spec/ruby/core/argf/lines_spec.rb | 2 +- spec/ruby/core/env/index_spec.rb | 2 +- spec/ruby/core/io/bytes_spec.rb | 2 +- spec/ruby/core/io/chars_spec.rb | 2 +- spec/ruby/core/io/codepoints_spec.rb | 2 +- spec/ruby/core/io/lines_spec.rb | 2 +- spec/ruby/core/objectspace/define_finalizer_spec.rb | 2 +- spec/ruby/core/range/minmax_spec.rb | 2 +- spec/ruby/core/tracepoint/inspect_spec.rb | 2 -- spec/ruby/library/stringio/bytes_spec.rb | 2 +- spec/ruby/library/stringio/chars_spec.rb | 2 +- spec/ruby/library/stringio/codepoints_spec.rb | 2 +- spec/ruby/library/stringio/lines_spec.rb | 2 +- 16 files changed, 15 insertions(+), 17 deletions(-) (limited to 'spec') diff --git a/spec/ruby/core/argf/bytes_spec.rb b/spec/ruby/core/argf/bytes_spec.rb index 58a7082fd2..3e11a4f5c4 100644 --- a/spec/ruby/core/argf/bytes_spec.rb +++ b/spec/ruby/core/argf/bytes_spec.rb @@ -1,7 +1,7 @@ require_relative '../../spec_helper' require_relative 'shared/each_byte' -ruby_version_is ''...'2.8' do +ruby_version_is ''...'3.0' do describe "ARGF.bytes" do it_behaves_like :argf_each_byte, :bytes end diff --git a/spec/ruby/core/argf/chars_spec.rb b/spec/ruby/core/argf/chars_spec.rb index b5105effdf..a864ce6d52 100644 --- a/spec/ruby/core/argf/chars_spec.rb +++ b/spec/ruby/core/argf/chars_spec.rb @@ -1,7 +1,7 @@ require_relative '../../spec_helper' require_relative 'shared/each_char' -ruby_version_is ''...'2.8' do +ruby_version_is ''...'3.0' do describe "ARGF.chars" do it_behaves_like :argf_each_char, :chars end diff --git a/spec/ruby/core/argf/codepoints_spec.rb b/spec/ruby/core/argf/codepoints_spec.rb index d7b9d08aaa..d3007c4c5b 100644 --- a/spec/ruby/core/argf/codepoints_spec.rb +++ b/spec/ruby/core/argf/codepoints_spec.rb @@ -1,7 +1,7 @@ require_relative '../../spec_helper' require_relative 'shared/each_codepoint' -ruby_version_is ''...'2.8' do +ruby_version_is ''...'3.0' do describe "ARGF.codepoints" do it_behaves_like :argf_each_codepoint, :codepoints end diff --git a/spec/ruby/core/argf/lines_spec.rb b/spec/ruby/core/argf/lines_spec.rb index 620db4312f..0bf5bb0d73 100644 --- a/spec/ruby/core/argf/lines_spec.rb +++ b/spec/ruby/core/argf/lines_spec.rb @@ -1,7 +1,7 @@ require_relative '../../spec_helper' require_relative 'shared/each_line' -ruby_version_is ''...'2.8' do +ruby_version_is ''...'3.0' do describe "ARGF.lines" do it_behaves_like :argf_each_line, :lines end diff --git a/spec/ruby/core/env/index_spec.rb b/spec/ruby/core/env/index_spec.rb index dfa40b6139..301a66ab4e 100644 --- a/spec/ruby/core/env/index_spec.rb +++ b/spec/ruby/core/env/index_spec.rb @@ -1,7 +1,7 @@ require_relative '../../spec_helper' require_relative 'shared/key' -ruby_version_is ''...'2.8' do +ruby_version_is ''...'3.0' do describe "ENV.index" do it_behaves_like :env_key, :index diff --git a/spec/ruby/core/io/bytes_spec.rb b/spec/ruby/core/io/bytes_spec.rb index f0e993e8f0..27a44a7c6c 100644 --- a/spec/ruby/core/io/bytes_spec.rb +++ b/spec/ruby/core/io/bytes_spec.rb @@ -2,7 +2,7 @@ require_relative '../../spec_helper' require_relative 'fixtures/classes' -ruby_version_is ''...'2.8' do +ruby_version_is ''...'3.0' do describe "IO#bytes" do before :each do @io = IOSpecs.io_fixture "lines.txt" diff --git a/spec/ruby/core/io/chars_spec.rb b/spec/ruby/core/io/chars_spec.rb index 2efbdd7333..812ddbf34f 100644 --- a/spec/ruby/core/io/chars_spec.rb +++ b/spec/ruby/core/io/chars_spec.rb @@ -3,7 +3,7 @@ require_relative '../../spec_helper' require_relative 'fixtures/classes' require_relative 'shared/chars' -ruby_version_is ''...'2.8' do +ruby_version_is ''...'3.0' do describe "IO#chars" do it_behaves_like :io_chars, :chars end diff --git a/spec/ruby/core/io/codepoints_spec.rb b/spec/ruby/core/io/codepoints_spec.rb index 1138989427..6b275af8d1 100644 --- a/spec/ruby/core/io/codepoints_spec.rb +++ b/spec/ruby/core/io/codepoints_spec.rb @@ -2,7 +2,7 @@ require_relative '../../spec_helper' require_relative 'fixtures/classes' require_relative 'shared/codepoints' -ruby_version_is ''...'2.8' do +ruby_version_is ''...'3.0' do # See redmine #1667 describe "IO#codepoints" do diff --git a/spec/ruby/core/io/lines_spec.rb b/spec/ruby/core/io/lines_spec.rb index dcf5825259..947c068f42 100644 --- a/spec/ruby/core/io/lines_spec.rb +++ b/spec/ruby/core/io/lines_spec.rb @@ -2,7 +2,7 @@ require_relative '../../spec_helper' require_relative 'fixtures/classes' -ruby_version_is ''...'2.8' do +ruby_version_is ''...'3.0' do describe "IO#lines" do before :each do @io = IOSpecs.io_fixture "lines.txt" diff --git a/spec/ruby/core/objectspace/define_finalizer_spec.rb b/spec/ruby/core/objectspace/define_finalizer_spec.rb index 83cbb39985..ed021b7131 100644 --- a/spec/ruby/core/objectspace/define_finalizer_spec.rb +++ b/spec/ruby/core/objectspace/define_finalizer_spec.rb @@ -60,7 +60,7 @@ describe "ObjectSpace.define_finalizer" do ruby_exe(code, :args => "2>&1").should include("finalizer run\n") end - ruby_version_is "2.8" do + ruby_version_is "3.0" do it "warns if the finalizer has the object as the receiver" do code = <<-RUBY class CapturesSelf diff --git a/spec/ruby/core/range/minmax_spec.rb b/spec/ruby/core/range/minmax_spec.rb index c3973af13f..505842e979 100644 --- a/spec/ruby/core/range/minmax_spec.rb +++ b/spec/ruby/core/range/minmax_spec.rb @@ -122,7 +122,7 @@ describe 'Range#minmax' do end end - ruby_bug "#17014", "2.7.0"..."2.8" do + ruby_bug "#17014", "2.7.0"..."3.0" do it 'should return nil pair if beginning and end are equal without iterating the range' do @x.should_not_receive(:succ) diff --git a/spec/ruby/core/tracepoint/inspect_spec.rb b/spec/ruby/core/tracepoint/inspect_spec.rb index 34a152180e..06bed9c99a 100644 --- a/spec/ruby/core/tracepoint/inspect_spec.rb +++ b/spec/ruby/core/tracepoint/inspect_spec.rb @@ -4,12 +4,10 @@ require_relative 'fixtures/classes' describe 'TracePoint#inspect' do before do ruby_version_is ""..."3.0" do - # Old behavior for Ruby < 2.8 @path_prefix = '@' end ruby_version_is "3.0" do - # New behavior for Ruby >= 2.8 @path_prefix = ' ' end end diff --git a/spec/ruby/library/stringio/bytes_spec.rb b/spec/ruby/library/stringio/bytes_spec.rb index bf0d27615e..1c0607db6e 100644 --- a/spec/ruby/library/stringio/bytes_spec.rb +++ b/spec/ruby/library/stringio/bytes_spec.rb @@ -2,7 +2,7 @@ require_relative '../../spec_helper' require 'stringio' require_relative 'shared/each_byte' -ruby_version_is ''...'2.8' do +ruby_version_is ''...'3.0' do describe "StringIO#bytes" do it_behaves_like :stringio_each_byte, :bytes end diff --git a/spec/ruby/library/stringio/chars_spec.rb b/spec/ruby/library/stringio/chars_spec.rb index e3879c2cff..3383dcfc57 100644 --- a/spec/ruby/library/stringio/chars_spec.rb +++ b/spec/ruby/library/stringio/chars_spec.rb @@ -2,7 +2,7 @@ require_relative '../../spec_helper' require 'stringio' require_relative 'shared/each_char' -ruby_version_is ''...'2.8' do +ruby_version_is ''...'3.0' do describe "StringIO#chars" do it_behaves_like :stringio_each_char, :chars end diff --git a/spec/ruby/library/stringio/codepoints_spec.rb b/spec/ruby/library/stringio/codepoints_spec.rb index 6ca395c964..0dfaac2a29 100644 --- a/spec/ruby/library/stringio/codepoints_spec.rb +++ b/spec/ruby/library/stringio/codepoints_spec.rb @@ -3,7 +3,7 @@ require_relative '../../spec_helper' require_relative 'fixtures/classes' require_relative 'shared/codepoints' -ruby_version_is ''...'2.8' do +ruby_version_is ''...'3.0' do # See redmine #1667 describe "StringIO#codepoints" do diff --git a/spec/ruby/library/stringio/lines_spec.rb b/spec/ruby/library/stringio/lines_spec.rb index 0a2ab0d817..4a2aeac37e 100644 --- a/spec/ruby/library/stringio/lines_spec.rb +++ b/spec/ruby/library/stringio/lines_spec.rb @@ -2,7 +2,7 @@ require_relative '../../spec_helper' require 'stringio' require_relative 'shared/each' -ruby_version_is ''...'2.8' do +ruby_version_is ''...'3.0' do describe "StringIO#lines when passed a separator" do it_behaves_like :stringio_each_separator, :lines end -- cgit v1.2.3