diff options
author | nagachika <nagachika@ruby-lang.org> | 2020-09-29 22:43:25 +0900 |
---|---|---|
committer | nagachika <nagachika@ruby-lang.org> | 2020-09-29 22:43:25 +0900 |
commit | df3f52a6331f1a47af9933b77311a8650727d8d1 (patch) | |
tree | dd16cd215d11caf4907614d0bc6a9b2b08d96930 /spec/ruby | |
parent | 665589cbdf7bf652067113dd1c0bc49012b990e0 (diff) |
merge revision(s) 996af2ce086249e904b2ce95ab2fcd1de7d757be: [Backport #16345] [Backport #17000]
Disable deprecation warning by the default [Feature #16345]
And `-w` option turns it on.
Diffstat (limited to 'spec/ruby')
-rw-r--r-- | spec/ruby/core/data/constants_spec.rb | 7 | ||||
-rw-r--r-- | spec/ruby/core/env/index_spec.rb | 14 | ||||
-rw-r--r-- | spec/ruby/core/integer/constants_spec.rb | 32 | ||||
-rw-r--r-- | spec/ruby/core/kernel/match_spec.rb | 2 | ||||
-rw-r--r-- | spec/ruby/core/kernel/proc_spec.rb | 8 | ||||
-rw-r--r-- | spec/ruby/core/module/deprecate_constant_spec.rb | 10 | ||||
-rw-r--r-- | spec/ruby/core/proc/new_spec.rb | 8 | ||||
-rw-r--r-- | spec/ruby/language/predefined_spec.rb | 8 | ||||
-rw-r--r-- | spec/ruby/library/net/http/HTTPServerException_spec.rb | 2 |
9 files changed, 68 insertions, 23 deletions
diff --git a/spec/ruby/core/data/constants_spec.rb b/spec/ruby/core/data/constants_spec.rb index 1b4c0d2df3..000da8fd09 100644 --- a/spec/ruby/core/data/constants_spec.rb +++ b/spec/ruby/core/data/constants_spec.rb @@ -8,6 +8,13 @@ describe "Data" do end ruby_version_is "2.5" do + before :each do + @deprecated = Warning[:deprecated] + Warning[:deprecated] = true + end + after :each do + Warning[:deprecated] = @deprecated + end it "is deprecated" do -> { Data }.should complain(/constant ::Data is deprecated/) end diff --git a/spec/ruby/core/env/index_spec.rb b/spec/ruby/core/env/index_spec.rb index 43875f5a50..2457b65cc6 100644 --- a/spec/ruby/core/env/index_spec.rb +++ b/spec/ruby/core/env/index_spec.rb @@ -1,12 +1,14 @@ require_relative '../../spec_helper' require_relative 'shared/key' -describe "ENV.index" do - it_behaves_like :env_key, :index +ruby_version_is ""..."2.7" do + describe "ENV.index" do + it_behaves_like :env_key, :index - it "warns about deprecation" do - -> do - ENV.index("foo") - end.should complain(/warning: ENV.index is deprecated; use ENV.key/) + it "warns about deprecation" do + -> do + ENV.index("foo") + end.should complain(/warning: ENV.index is deprecated; use ENV.key/) + end end end diff --git a/spec/ruby/core/integer/constants_spec.rb b/spec/ruby/core/integer/constants_spec.rb index 3b8b01e330..cdb7537392 100644 --- a/spec/ruby/core/integer/constants_spec.rb +++ b/spec/ruby/core/integer/constants_spec.rb @@ -1,25 +1,27 @@ require_relative '../../spec_helper' -describe "Fixnum" do - it "is unified into Integer" do - suppress_warning do - Fixnum.should equal(Integer) +ruby_version_is ""..."2.7" do + describe "Fixnum" do + it "is unified into Integer" do + suppress_warning do + Fixnum.should equal(Integer) + end end - end - it "is deprecated" do - -> { Fixnum }.should complain(/constant ::Fixnum is deprecated/) + it "is deprecated" do + -> { Fixnum }.should complain(/constant ::Fixnum is deprecated/) + end end -end -describe "Bignum" do - it "is unified into Integer" do - suppress_warning do - Bignum.should equal(Integer) + describe "Bignum" do + it "is unified into Integer" do + suppress_warning do + Bignum.should equal(Integer) + end end - end - it "is deprecated" do - -> { Bignum }.should complain(/constant ::Bignum is deprecated/) + it "is deprecated" do + -> { Bignum }.should complain(/constant ::Bignum is deprecated/) + end end end diff --git a/spec/ruby/core/kernel/match_spec.rb b/spec/ruby/core/kernel/match_spec.rb index 6dc1eb7de8..687cd68da4 100644 --- a/spec/ruby/core/kernel/match_spec.rb +++ b/spec/ruby/core/kernel/match_spec.rb @@ -14,7 +14,7 @@ describe "Kernel#=~" do end end - ruby_version_is "2.6" do + ruby_version_is "2.6"..."2.7" do it "is deprecated" do -> do Object.new =~ /regexp/ diff --git a/spec/ruby/core/kernel/proc_spec.rb b/spec/ruby/core/kernel/proc_spec.rb index 2a79548313..7854af44d0 100644 --- a/spec/ruby/core/kernel/proc_spec.rb +++ b/spec/ruby/core/kernel/proc_spec.rb @@ -49,6 +49,14 @@ describe "Kernel#proc" do end ruby_version_is "2.7" do + before :each do + @deprecated = Warning[:deprecated] + Warning[:deprecated] = true + end + after :each do + Warning[:deprecated] = @deprecated + end + it "can be created when called with no block" do def some_method proc diff --git a/spec/ruby/core/module/deprecate_constant_spec.rb b/spec/ruby/core/module/deprecate_constant_spec.rb index 7bcced981b..6a8086bc8f 100644 --- a/spec/ruby/core/module/deprecate_constant_spec.rb +++ b/spec/ruby/core/module/deprecate_constant_spec.rb @@ -10,6 +10,16 @@ describe "Module#deprecate_constant" do @module.private_constant :PRIVATE @module.deprecate_constant :PRIVATE @pattern = /deprecated/ + if Warning.respond_to?(:[]) + @deprecated = Warning[:deprecated] + Warning[:deprecated] = true + end + end + + after :each do + if Warning.respond_to?(:[]) + Warning[:deprecated] = @deprecated + end end describe "when accessing the deprecated module" do diff --git a/spec/ruby/core/proc/new_spec.rb b/spec/ruby/core/proc/new_spec.rb index cc033467e5..8faf142614 100644 --- a/spec/ruby/core/proc/new_spec.rb +++ b/spec/ruby/core/proc/new_spec.rb @@ -204,6 +204,14 @@ describe "Proc.new without a block" do end ruby_version_is "2.7" do + before :each do + @deprecated = Warning[:deprecated] + Warning[:deprecated] = true + end + after :each do + Warning[:deprecated] = @deprecated + end + 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 diff --git a/spec/ruby/language/predefined_spec.rb b/spec/ruby/language/predefined_spec.rb index cec6bc852c..cdf2c28dcb 100644 --- a/spec/ruby/language/predefined_spec.rb +++ b/spec/ruby/language/predefined_spec.rb @@ -1076,6 +1076,14 @@ TRUE TrueClass Synonym for true. =end describe "The predefined global constants" do + before :each do + @deprecated = Warning[:deprecated] + Warning[:deprecated] = true + end + after :each do + Warning[:deprecated] = @deprecated + end + it "includes TRUE" do Object.const_defined?(:TRUE).should == true -> { diff --git a/spec/ruby/library/net/http/HTTPServerException_spec.rb b/spec/ruby/library/net/http/HTTPServerException_spec.rb index 87841ab499..b8ac8cac76 100644 --- a/spec/ruby/library/net/http/HTTPServerException_spec.rb +++ b/spec/ruby/library/net/http/HTTPServerException_spec.rb @@ -13,7 +13,7 @@ ruby_version_is ""..."2.6" do end end -ruby_version_is "2.6" do +ruby_version_is "2.6"..."2.7" do describe "Net::HTTPServerException" do it "is a subclass of Net::ProtoServerError and is warned as deprecated" do -> { Net::HTTPServerException.should < Net::ProtoServerError }.should complain(/warning: constant Net::HTTPServerException is deprecated/) |