aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsorah <sorah@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-02-18 05:28:00 +0000
committersorah <sorah@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-02-18 05:28:00 +0000
commitda61291a25faae95f33de6756b2eaa4804d5ef2b (patch)
treea146e2e9a3a3a8d3ae4d23640f948d84740afb34
parent7c030a5ded8acc4b29b25a6f416347e41125197f (diff)
downloadruby-da61291a25faae95f33de6756b2eaa4804d5ef2b.tar.gz
* lib/test/unit.rb: Requires minitest < 5.0.0 if Gem is available.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@45033 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--lib/test/unit.rb1
2 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 001e777c7f..8689cf5ea7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Feb 18 14:27:18 2014 Shota Fukumori <her@sorah.jp>
+
+ * lib/test/unit.rb: Requires minitest < 5.0.0 if Gem is available.
+
Tue Feb 18 14:24:07 2014 Shota Fukumori <her@sorah.jp>
* lib/test/unit/test-unit.gemspec: Add minitest < 5.0.0 dependency
diff --git a/lib/test/unit.rb b/lib/test/unit.rb
index 13a993fc6c..ccfe1ce7ef 100644
--- a/lib/test/unit.rb
+++ b/lib/test/unit.rb
@@ -1,3 +1,4 @@
+gem 'minitest', '< 5.0.0' if defined? Gem
require 'minitest/unit'
require 'test/unit/assertions'
require 'test/unit/testcase'