diff options
author | delano <delano@delanotes.com> | 2015-04-11 13:08:21 -0700 |
---|---|---|
committer | delano <delano@delanotes.com> | 2015-04-11 13:08:21 -0700 |
commit | 7e60465a3bb6a00132d0584accff1bb059421446 (patch) | |
tree | cc97b4441e2d2bae705c154f90586c7b9e41446f /test/common.rb | |
parent | 36b55e6b45ca9657fe20e3c8f1481d59c6408b2e (diff) | |
parent | ecb3bb5686ca80e36364949f48a9a3ee51f33aab (diff) | |
download | net-ssh-multi-juliandunn-minitest.tar.gz |
Merge branch 'minitest' of https://github.com/juliandunn/net-ssh-multi into juliandunn-minitestjuliandunn-minitest
Diffstat (limited to 'test/common.rb')
-rw-r--r-- | test/common.rb | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/test/common.rb b/test/common.rb index dd4f074..ef6ef4f 100644 --- a/test/common.rb +++ b/test/common.rb @@ -1,2 +1,9 @@ -require 'test/unit' -require 'mocha'
\ No newline at end of file +require 'minitest/autorun' +require 'mocha/setup' + +if Minitest.const_defined?('Test') + # We're on Minitest 5+. Nothing to do here. +else + # Minitest 4 doesn't have Minitest::Test yet. + Minitest::Test = MiniTest::Unit::TestCase +end |