1 files changed, 31 insertions, 11 deletions
diff --git a/spec/ruby/core/module/deprecate_constant_spec.rb b/spec/ruby/core/module/deprecate_constant_spec.rb
index 0954a6d8a5..597379eb87 100644
--- a/spec/ruby/core/module/deprecate_constant_spec.rb
+++ b/spec/ruby/core/module/deprecate_constant_spec.rb
@@ -9,7 +9,6 @@ describe "Module#deprecate_constant" do
     @module::PRIVATE = @value
     @module.private_constant :PRIVATE
     @module.deprecate_constant :PRIVATE
-    @pattern = /deprecated/
   end
 
   describe "when accessing the deprecated module" do
@@ -17,34 +16,55 @@ describe "Module#deprecate_constant" do
       @module.deprecate_constant :PUBLIC1
 
       value = nil
-      lambda {
+      -> {
         value = @module::PUBLIC1
-      }.should complain(@pattern)
-      value.should equal(@value)
+      }.should complain(/warning: constant .+::PUBLIC1 is deprecated/)
+      value.should.equal?(@value)
 
-      lambda { @module::PRIVATE }.should raise_error(NameError)
+      -> { @module::PRIVATE }.should.raise(NameError)
     end
 
     it "warns with a message" do
       @module.deprecate_constant :PUBLIC1
 
-      lambda { @module::PUBLIC1 }.should complain(@pattern)
-      lambda { @module.const_get :PRIVATE }.should complain(@pattern)
+      -> { @module::PUBLIC1 }.should complain(/warning: constant .+::PUBLIC1 is deprecated/)
+      -> { @module.const_get :PRIVATE }.should complain(/warning: constant .+::PRIVATE is deprecated/)
+    end
+
+    it "does not warn if Warning[:deprecated] is false" do
+      @module.deprecate_constant :PUBLIC1
+
+      deprecated = Warning[:deprecated]
+      begin
+        Warning[:deprecated] = false
+        -> { @module::PUBLIC1 }.should_not complain
+      ensure
+        Warning[:deprecated] = deprecated
+      end
+    end
+  end
+
+  ruby_bug '#20900', ''...'3.4' do
+    describe "when removing the deprecated module" do
+      it "warns with a message" do
+        @module.deprecate_constant :PUBLIC1
+        -> { @module.module_eval {remove_const :PUBLIC1} }.should complain(/warning: constant .+::PUBLIC1 is deprecated/)
+      end
     end
   end
 
   it "accepts multiple symbols and strings as constant names" do
     @module.deprecate_constant "PUBLIC1", :PUBLIC2
 
-    lambda { @module::PUBLIC1 }.should complain(@pattern)
-    lambda { @module::PUBLIC2 }.should complain(@pattern)
+    -> { @module::PUBLIC1 }.should complain(/warning: constant .+::PUBLIC1 is deprecated/)
+    -> { @module::PUBLIC2 }.should complain(/warning: constant .+::PUBLIC2 is deprecated/)
   end
 
   it "returns self" do
-    @module.deprecate_constant(:PUBLIC1).should equal(@module)
+    @module.deprecate_constant(:PUBLIC1).should.equal?(@module)
   end
 
   it "raises a NameError when given an undefined name" do
-    lambda { @module.deprecate_constant :UNDEFINED }.should raise_error(NameError)
+    -> { @module.deprecate_constant :UNDEFINED }.should.raise(NameError)
   end
 end