1 files changed, 29 insertions, 31 deletions
diff --git a/spec/ruby/core/module/shared/set_visibility.rb b/spec/ruby/core/module/shared/set_visibility.rb
index 9f31e230ca..38cc2ad260 100644
--- a/spec/ruby/core/module/shared/set_visibility.rb
+++ b/spec/ruby/core/module/shared/set_visibility.rb
@@ -2,7 +2,7 @@
 
 describe :set_visibility, shared: true do
   it "is a private method" do
-    Module.should have_private_instance_method(@method, false)
+    Module.private_instance_methods(false).should.include?(@method)
   end
 
   describe "with argument" do
@@ -17,26 +17,24 @@ describe :set_visibility, shared: true do
           def test2() end
           send visibility, :test1, :test2
         }
-        mod.should send(:"have_#{visibility}_instance_method", :test1, false)
-        mod.should send(:"have_#{visibility}_instance_method", :test2, false)
+        mod.send(:"#{visibility}_instance_methods", false).should.include?(:test1)
+        mod.send(:"#{visibility}_instance_methods", false).should.include?(:test2)
       end
     end
 
-    ruby_version_is "3.0" do
-      describe "array as a single argument" do
-        it "sets visibility of given method names" do
-          visibility = @method
-          old_visibility = [:protected, :private].find {|vis| vis != visibility }
-
-          mod = Module.new {
-            send old_visibility
-            def test1() end
-            def test2() end
-            send visibility, [:test1, :test2]
-          }
-          mod.should send(:"have_#{visibility}_instance_method", :test1, false)
-          mod.should send(:"have_#{visibility}_instance_method", :test2, false)
-        end
+    describe "array as a single argument" do
+      it "sets visibility of given method names" do
+        visibility = @method
+        old_visibility = [:protected, :private].find {|vis| vis != visibility }
+
+        mod = Module.new {
+          send old_visibility
+          def test1() end
+          def test2() end
+          send visibility, [:test1, :test2]
+        }
+        mod.send(:"#{visibility}_instance_methods", false).should.include?(:test1)
+        mod.send(:"#{visibility}_instance_methods", false).should.include?(:test2)
       end
     end
 
@@ -52,7 +50,7 @@ describe :set_visibility, shared: true do
         send(visibility, :test_method)
       }
 
-      child.should_not send(:"have_#{visibility}_instance_method", :test_method, false)
+      child.send(:"#{visibility}_instance_methods", false).should_not.include?(:test_method)
     end
   end
 
@@ -66,8 +64,8 @@ describe :set_visibility, shared: true do
         def test2() end
       }
 
-      mod.should send(:"have_#{@method}_instance_method", :test1, false)
-      mod.should send(:"have_#{@method}_instance_method", :test2, false)
+      mod.send(:"#{@method}_instance_methods", false).should.include?(:test1)
+      mod.send(:"#{@method}_instance_methods", false).should.include?(:test2)
     end
 
     it "stops setting visibility if the body encounters other visibility setters without arguments" do
@@ -80,7 +78,7 @@ describe :set_visibility, shared: true do
         def test1() end
       }
 
-      mod.should send(:"have_#{new_visibility}_instance_method", :test1, false)
+      mod.send(:"#{new_visibility}_instance_methods", false).should.include?(:test1)
     end
 
     it "continues setting visibility if the body encounters other visibility setters with arguments" do
@@ -92,7 +90,7 @@ describe :set_visibility, shared: true do
         def test2() end
       }
 
-      mod.should send(:"have_#{@method}_instance_method", :test2, false)
+      mod.send(:"#{@method}_instance_methods", false).should.include?(:test2)
     end
 
     it "does not affect module_evaled method definitions when itself is outside the eval" do
@@ -104,8 +102,8 @@ describe :set_visibility, shared: true do
         module_eval " def test2() end "
       }
 
-      mod.should have_public_instance_method(:test1, false)
-      mod.should have_public_instance_method(:test2, false)
+      mod.public_instance_methods(false).should.include?(:test1)
+      mod.public_instance_methods(false).should.include?(:test2)
     end
 
     it "does not affect outside method definitions when itself is inside a module_eval" do
@@ -116,7 +114,7 @@ describe :set_visibility, shared: true do
         def test1() end
       }
 
-      mod.should have_public_instance_method(:test1, false)
+      mod.public_instance_methods(false).should.include?(:test1)
     end
 
     it "affects normally if itself and method definitions are inside a module_eval" do
@@ -129,7 +127,7 @@ describe :set_visibility, shared: true do
         }
       }
 
-      mod.should send(:"have_#{@method}_instance_method", :test1, false)
+      mod.send(:"#{@method}_instance_methods", false).should.include?(:test1)
     end
 
     it "does not affect method definitions when itself is inside an eval and method definitions are outside" do
@@ -142,7 +140,7 @@ describe :set_visibility, shared: true do
         def test1() end
       }
 
-      mod.should send(:"have_#{initialized_visibility}_instance_method", :test1, false)
+      mod.send(:"#{initialized_visibility}_instance_methods", false).should.include?(:test1)
     end
 
     it "affects evaled method definitions when itself is outside the eval" do
@@ -153,7 +151,7 @@ describe :set_visibility, shared: true do
         eval "def test1() end"
       }
 
-      mod.should send(:"have_#{@method}_instance_method", :test1, false)
+      mod.send(:"#{@method}_instance_methods", false).should.include?(:test1)
     end
 
     it "affects normally if itself and following method definitions are inside a eval" do
@@ -166,7 +164,7 @@ describe :set_visibility, shared: true do
         CODE
       }
 
-      mod.should send(:"have_#{@method}_instance_method", :test1, false)
+      mod.send(:"#{@method}_instance_methods", false).should.include?(:test1)
     end
 
     describe "within a closure" do
@@ -179,7 +177,7 @@ describe :set_visibility, shared: true do
           def test1() end
         }
 
-        mod.should send(:"have_#{@method}_instance_method", :test1, false)
+        mod.send(:"#{@method}_instance_methods", false).should.include?(:test1)
       end
     end
   end