Merge pull request #309 from mattbrictson/minitest-5

Upgrade to minitest 5

Author: leehambley

sshkit.gemspec

@@ -20,9 +20,9 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency('net-ssh',  '>= 2.8.0')
   gem.add_runtime_dependency('net-scp',  '>= 1.1.2')
 
-  gem.add_development_dependency('minitest', ['>= 2.11.3', '< 2.12.0'])
+  gem.add_development_dependency('minitest', '>= 5.0.0')
+  gem.add_development_dependency('minitest-reporters')
   gem.add_development_dependency('rake')
-  gem.add_development_dependency('turn')
   gem.add_development_dependency('unindent')
   gem.add_development_dependency('mocha')
 end

test/functional/backends/test_local.rb

@@ -3,7 +3,7 @@ module SSHKit
 
   module Backend
 
-    class TestLocal < MiniTest::Unit::TestCase
+    class TestLocal < Minitest::Test
 
       def setup
         super

test/helper.rb

@@ -1,9 +1,9 @@
 require 'rubygems'
 require 'bundler/setup'
 require 'tempfile'
-require 'minitest/unit'
+require 'minitest/autorun'
+require 'minitest/reporters'
 require 'mocha/setup'
-require 'turn'
 require 'unindent'
 require 'stringio'
 require 'json'
@@ -14,7 +14,7 @@
 
 Dir[File.expand_path('test/support/*.rb')].each { |file| require file }
 
-class UnitTest < MiniTest::Unit::TestCase
+class UnitTest < Minitest::Test
 
   def setup
     SSHKit.reset_configuration!
@@ -27,7 +27,7 @@ def flush_connections
   end
 end
 
-class FunctionalTest < MiniTest::Unit::TestCase
+class FunctionalTest < Minitest::Test
 
   def setup
     unless VagrantWrapper.running?
@@ -78,7 +78,4 @@ def create_user_with_key(username, password = :secret)
 #
 # Force colours in Autotest
 #
-Turn.config.ansi = true
-Turn.config.format = :pretty
-
-MiniTest::Unit.autorun
+Minitest::Reporters.use! Minitest::Reporters::SpecReporter.new