Merge branch 'master' into android.rake-ndk-clang

1 files changed, 49 insertions, 0 deletions

diff --git a/test/t/nomethoderror.rb b/test/t/nomethoderror.rb
index 5fed79689..35cbdaee9 100644
--- a/test/t/nomethoderror.rb
+++ b/test/t/nomethoderror.rb
@@ -20,3 +20,52 @@ assert('NoMethodError#args', '15.2.32.2.1') do
     end
   end
 end
+
+assert('Can still raise when Kernel#method_missing is removed') do
+  assert_raise(NoMethodError) do
+    begin
+      Kernel.alias_method(:old_method_missing, :method_missing)
+      Kernel.remove_method(:method_missing)
+      1.__send__(:foo)
+    ensure
+      Kernel.alias_method(:method_missing, :old_method_missing)
+      Kernel.remove_method(:old_method_missing)
+    end
+  end
+end
+
+assert('Can still call super when Kernel#method_missing is removed') do
+  assert_raise(NoMethodError) do
+    class A
+      def foo
+        super
+      end
+    end
+    begin
+      Kernel.alias_method(:old_method_missing, :method_missing)
+      Kernel.remove_method(:method_missing)
+      A.new.foo
+    ensure
+      Kernel.alias_method(:method_missing, :old_method_missing)
+      Kernel.remove_method(:old_method_missing)
+    end
+  end
+end
+
+assert("NoMethodError#new does not return an exception") do
+  begin
+    class << NoMethodError
+      def new(*)
+        nil
+      end
+    end
+
+    assert_raise(TypeError) do
+      Object.q
+    end
+  ensure
+    class << NoMethodError
+      remove_method :new
+    end
+  end
+end