1 files changed, 39 insertions, 39 deletions
diff --git a/spec/ruby/core/module/private_spec.rb b/spec/ruby/core/module/private_spec.rb
index d476c6f54e..e60fdb24cc 100644
--- a/spec/ruby/core/module/private_spec.rb
+++ b/spec/ruby/core/module/private_spec.rb
@@ -17,7 +17,7 @@ describe "Module#private" do
       private :foo
     end
 
-    lambda { obj.foo }.should raise_error(NoMethodError)
+    -> { obj.foo }.should.raise(NoMethodError)
   end
 
   it "makes a public Object instance method private in a new module" do
@@ -25,71 +25,71 @@ describe "Module#private" do
       private :module_specs_public_method_on_object
     end
 
-    m.should have_private_instance_method(:module_specs_public_method_on_object)
+    m.private_instance_methods(false).should.include?(:module_specs_public_method_on_object)
 
     # Ensure we did not change Object's method
-    Object.should_not have_private_instance_method(:module_specs_public_method_on_object)
+    Object.private_instance_methods(true).should_not.include?(:module_specs_public_method_on_object)
   end
 
   it "makes a public Object instance method private in Kernel" do
-    Kernel.should have_private_instance_method(
+    Kernel.private_instance_methods(false).should.include?(
                   :module_specs_public_method_on_object_for_kernel_private)
-    Object.should_not have_private_instance_method(
+    Object.private_instance_methods(true).should_not.include?(
                   :module_specs_public_method_on_object_for_kernel_private)
   end
 
-  it "returns self" do
+  it "returns argument or arguments if given" do
     (class << Object.new; self; end).class_eval do
       def foo; end
-      private(:foo).should equal(self)
-      private.should equal(self)
+      private(:foo).should.equal?(:foo)
+      private([:foo, :foo]).should == [:foo, :foo]
+      private(:foo, :foo).should == [:foo, :foo]
+      private.should.equal?(nil)
     end
   end
 
   it "raises a NameError when given an undefined name" do
-    lambda do
+    -> do
       Module.new.send(:private, :undefined)
-    end.should raise_error(NameError)
+    end.should.raise(NameError)
   end
 
-  ruby_bug "#14604", ""..."2.5.1" do
-    it "only makes the method private in the class it is called on" do
-      base = Class.new do
-        def wrapped
-          1
-        end
+  it "only makes the method private in the class it is called on" do
+    base = Class.new do
+      def wrapped
+        1
       end
+    end
 
-      klass = Class.new(base) do
-        def wrapped
-          super + 1
-        end
-        private :wrapped
+    klass = Class.new(base) do
+      def wrapped
+        super + 1
       end
-
-      base.new.wrapped.should == 1
-      lambda do
-        klass.new.wrapped
-      end.should raise_error(NameError)
+      private :wrapped
     end
 
-    it "continues to allow a prepended module method to call super" do
-      wrapper = Module.new do
-        def wrapped
-          super + 1
-        end
+    base.new.wrapped.should == 1
+    -> do
+      klass.new.wrapped
+    end.should.raise(NameError)
+  end
+
+  it "continues to allow a prepended module method to call super" do
+    wrapper = Module.new do
+      def wrapped
+        super + 1
       end
+    end
 
-      klass = Class.new do
-        prepend wrapper
+    klass = Class.new do
+      prepend wrapper
 
-        def wrapped
-          1
-        end
-        private :wrapped
+      def wrapped
+        1
       end
-
-      klass.new.wrapped.should == 2
+      private :wrapped
     end
+
+    klass.new.wrapped.should == 2
   end
 end