From e5dd44657b4612d0470f4c3a58104ea04df0113d Mon Sep 17 00:00:00 2001 From: naruse Date: Mon, 26 Feb 2018 08:43:44 +0000 Subject: merge revision(s) 62094,62584: [Backport #14407] Merge ruby/spec@fd56cd4 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_5@62586 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- spec/ruby/language/defined_spec.rb | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'spec') diff --git a/spec/ruby/language/defined_spec.rb b/spec/ruby/language/defined_spec.rb index eae0b03573..9fe460a9de 100644 --- a/spec/ruby/language/defined_spec.rb +++ b/spec/ruby/language/defined_spec.rb @@ -766,8 +766,16 @@ describe "The defined? keyword for a scoped constant" do defined?(DefinedSpecs::String).should be_nil end - it "returns nil when a constant is defined on top-level but not on the class" do - defined?(DefinedSpecs::Basic::String).should be_nil + ruby_version_is ""..."2.5" do + it "returns 'constant' when a constant is defined on top-level but not on the class" do + defined?(DefinedSpecs::Basic::String).should == 'constant' + end + end + + ruby_version_is "2.5" do + it "returns nil when a constant is defined on top-level but not on the class" do + defined?(DefinedSpecs::Basic::String).should be_nil + end end it "returns 'constant' if the scoped-scoped constant is defined" do -- cgit v1.2.3