1 files changed, 39 insertions, 24 deletions
diff --git a/spec/ruby/core/module/remove_method_spec.rb b/spec/ruby/core/module/remove_method_spec.rb
index b2e91bcc1f..94b255df62 100644
--- a/spec/ruby/core/module/remove_method_spec.rb
+++ b/spec/ruby/core/module/remove_method_spec.rb
@@ -1,5 +1,5 @@
-require File.expand_path('../../../spec_helper', __FILE__)
-require File.expand_path('../fixtures/classes', __FILE__)
+require_relative '../../spec_helper'
+require_relative 'fixtures/classes'
 
 module ModuleSpecs
   class Parent
@@ -20,15 +20,8 @@ describe "Module#remove_method" do
     @module = Module.new { def method_to_remove; end }
   end
 
-  ruby_version_is ''...'2.5' do
-    it "is a private method" do
-      Module.should have_private_instance_method(:remove_method, false)
-    end
-  end
-  ruby_version_is '2.5' do
-    it "is a public method" do
-      Module.should have_public_instance_method(:remove_method, false)
-    end
+  it "is a public method" do
+    Module.should have_public_instance_method(:remove_method, false)
   end
 
   it "removes the method from a class" do
@@ -50,6 +43,28 @@ describe "Module#remove_method" do
     x.method_to_remove.should == 1
   end
 
+  it "updates the method implementation" do
+    m_module = Module.new do
+      def foo
+        'm'
+      end
+    end
+
+    a_class = Class.new do
+      include m_module
+
+      def foo
+        'a'
+      end
+    end
+
+    a = a_class.new
+    foo = -> { a.foo }
+    foo.call.should == 'a'
+    a_class.remove_method(:foo)
+    foo.call.should == 'm'
+  end
+
   it "removes multiple methods with 1 call" do
     klass = Class.new do
       def method_to_remove_1; 1; end
@@ -77,19 +92,19 @@ describe "Module#remove_method" do
   end
 
   it "raises a NameError when attempting to remove method further up the inheritance tree" do
-    lambda {
-      class Third < ModuleSpecs::Second
+    Class.new(ModuleSpecs::Second) do
+      -> {
         remove_method :method_to_remove
-      end
-    }.should raise_error(NameError)
+      }.should raise_error(NameError)
+    end
   end
 
   it "raises a NameError when attempting to remove a missing method" do
-    lambda {
-      class Third < ModuleSpecs::Second
+    Class.new(ModuleSpecs::Second) do
+      -> {
         remove_method :blah
-      end
-    }.should raise_error(NameError)
+      }.should raise_error(NameError)
+    end
   end
 
   describe "on frozen instance" do
@@ -97,16 +112,16 @@ describe "Module#remove_method" do
       @frozen = @module.dup.freeze
     end
 
-    it "raises a #{frozen_error_class} when passed a name" do
-      lambda { @frozen.send :remove_method, :method_to_remove }.should raise_error(frozen_error_class)
+    it "raises a FrozenError when passed a name" do
+      -> { @frozen.send :remove_method, :method_to_remove }.should raise_error(FrozenError)
     end
 
-    it "raises a #{frozen_error_class} when passed a missing name" do
-      lambda { @frozen.send :remove_method, :not_exist }.should raise_error(frozen_error_class)
+    it "raises a FrozenError when passed a missing name" do
+      -> { @frozen.send :remove_method, :not_exist }.should raise_error(FrozenError)
     end
 
     it "raises a TypeError when passed a not name" do
-      lambda { @frozen.send :remove_method, Object.new }.should raise_error(TypeError)
+      -> { @frozen.send :remove_method, Object.new }.should raise_error(TypeError)
     end
 
     it "does not raise exceptions when no arguments given" do