From fd3dede7f4bad52d7ab383eeb9ee29f20b045cb7 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Sat, 23 Dec 2023 18:57:47 +0900 Subject: Fix for older set versions `Set::VERSION` was not defined in old set.rb bundled with ruby 3.2 or earlier. Also add comment for spec/mspec/tool/remove_old_guards.rb. --- spec/ruby/library/set/flatten_spec.rb | 3 ++- spec/ruby/library/set/proper_subset_spec.rb | 3 ++- spec/ruby/library/set/subset_spec.rb | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) (limited to 'spec/ruby') diff --git a/spec/ruby/library/set/flatten_spec.rb b/spec/ruby/library/set/flatten_spec.rb index 611063e055..51b58d6439 100644 --- a/spec/ruby/library/set/flatten_spec.rb +++ b/spec/ruby/library/set/flatten_spec.rb @@ -1,6 +1,7 @@ require_relative '../../spec_helper' require_relative 'fixtures/set_like' require 'set' +set_version = defined?(Set::VERSION) ? Set::VERSION : '1.0.0' describe "Set#flatten" do it "returns a copy of self with each included Set flattened" do @@ -45,7 +46,7 @@ describe "Set#flatten!" do -> { set.flatten! }.should raise_error(ArgumentError) end - version_is(Set::VERSION, ""..."1.1.0") do + version_is(set_version, ""..."1.1.0") do #ruby_version_is ""..."3.3" do context "when Set contains a Set-like object" do it "flattens self, including Set-like objects" do Set[SetSpecs::SetLike.new([1])].flatten!.should == Set[1] diff --git a/spec/ruby/library/set/proper_subset_spec.rb b/spec/ruby/library/set/proper_subset_spec.rb index 4c9567b198..6b51dedc9f 100644 --- a/spec/ruby/library/set/proper_subset_spec.rb +++ b/spec/ruby/library/set/proper_subset_spec.rb @@ -1,6 +1,7 @@ require_relative '../../spec_helper' require_relative 'fixtures/set_like' require 'set' +set_version = defined?(Set::VERSION) ? Set::VERSION : '1.0.0' describe "Set#proper_subset?" do before :each do @@ -33,7 +34,7 @@ describe "Set#proper_subset?" do -> { Set[].proper_subset?(Object.new) }.should raise_error(ArgumentError) end - version_is(Set::VERSION, ""..."1.1.0") do + version_is(set_version, ""..."1.1.0") do #ruby_version_is ""..."3.3" do context "when comparing to a Set-like object" do it "returns true if passed a Set-like object that self is a proper subset of" do Set[1, 2, 3].proper_subset?(SetSpecs::SetLike.new([1, 2, 3, 4])).should be_true diff --git a/spec/ruby/library/set/subset_spec.rb b/spec/ruby/library/set/subset_spec.rb index a000f500ba..85666d633f 100644 --- a/spec/ruby/library/set/subset_spec.rb +++ b/spec/ruby/library/set/subset_spec.rb @@ -1,6 +1,7 @@ require_relative '../../spec_helper' require_relative 'fixtures/set_like' require 'set' +set_version = defined?(Set::VERSION) ? Set::VERSION : '1.0.0' describe "Set#subset?" do before :each do @@ -33,7 +34,7 @@ describe "Set#subset?" do -> { Set[].subset?(Object.new) }.should raise_error(ArgumentError) end - version_is(Set::VERSION, ""..."1.1.0") do + version_is(set_version, ""..."1.1.0") do #ruby_version_is ""..."3.3" do context "when comparing to a Set-like object" do it "returns true if passed a Set-like object that self is a subset of" do Set[1, 2, 3].subset?(SetSpecs::SetLike.new([1, 2, 3, 4])).should be_true -- cgit v1.2.3