summaryrefslogtreecommitdiff
path: root/spec/mspec
diff options
context:
space:
mode:
authorNobuyoshi Nakada <nobu@ruby-lang.org>2020-02-08 19:43:27 +0900
committerNobuyoshi Nakada <nobu@ruby-lang.org>2020-04-01 15:36:20 +0900
commit826f44834fe11f3f9c52343443a15b6c83466889 (patch)
treef2c2abed62db1c750515cd8b0fbac6442b6d4200 /spec/mspec
parent3a2073e61b6ccce6d07d31ebd89d4c385b9a55f2 (diff)
downloadruby-826f44834fe11f3f9c52343443a15b6c83466889.tar.gz
Drop support for ruby 2.4 from ruby/spec
Diffstat (limited to 'spec/mspec')
-rw-r--r--spec/mspec/README.md2
-rw-r--r--spec/mspec/lib/mspec/utils/script.rb4
-rw-r--r--spec/mspec/lib/mspec/utils/warnings.rb14
3 files changed, 3 insertions, 17 deletions
diff --git a/spec/mspec/README.md b/spec/mspec/README.md
index e6fe44c6a2..86ee369e46 100644
--- a/spec/mspec/README.md
+++ b/spec/mspec/README.md
@@ -38,7 +38,7 @@ specs in a manner compatible with multiple Ruby implementations.
## Requirements
-MSpec requires Ruby 2.4 or more recent.
+MSpec requires Ruby 2.5 or more recent.
## Bundler
diff --git a/spec/mspec/lib/mspec/utils/script.rb b/spec/mspec/lib/mspec/utils/script.rb
index ec841db2e7..e8f581ef06 100644
--- a/spec/mspec/lib/mspec/utils/script.rb
+++ b/spec/mspec/lib/mspec/utils/script.rb
@@ -39,8 +39,8 @@ class MSpecScript
end
def initialize
- ruby_version_is ""..."2.4" do
- abort "MSpec needs Ruby 2.4 or more recent"
+ ruby_version_is ""..."2.5" do
+ abort "MSpec needs Ruby 2.5 or more recent"
end
config[:formatter] = nil
diff --git a/spec/mspec/lib/mspec/utils/warnings.rb b/spec/mspec/lib/mspec/utils/warnings.rb
index fa05c8c677..01fca00b8d 100644
--- a/spec/mspec/lib/mspec/utils/warnings.rb
+++ b/spec/mspec/lib/mspec/utils/warnings.rb
@@ -1,20 +1,6 @@
require 'mspec/guards/version'
if RUBY_ENGINE == "ruby"
- ruby_version_is "2.4"..."2.5" do
- # Kernel#warn does not delegate to Warning.warn in 2.4
- module Kernel
- remove_method :warn
- def warn(*messages)
- return if $VERBOSE == nil or messages.empty?
- msg = messages.join("\n")
- msg += "\n" unless msg.end_with?("\n")
- Warning.warn(msg)
- end
- private :warn
- end
- end
-
def Warning.warn(message)
# Suppress any warning inside the method to prevent recursion
verbose = $VERBOSE