Merge pull request travisjeffery#163 from grosser/grosser/tests

nicer tests

Author: Travis Jeffery

Gemfile

@@ -1,19 +1,15 @@
-# A sample Gemfile
 source "https://rubygems.org"
 
-# gem "rails"
 gemspec
 
 group :development do
   gem 'rake'
   gem 'jeweler'
-end
-
-group :development, :test do
   gem 'pry'
-  gem 'mocha', :require => false
-  gem 'activesupport', '>= 3.0.0', '< 4.0.0', :require => "active_support/all"
+  gem 'mocha'
+  gem 'activesupport', '>= 3.0.0', '< 4.0.0'
   gem 'tzinfo'
   gem 'i18n'
-  gem 'minitest', :require => 'minitest/autorun'
+  gem 'minitest'
+  gem 'minitest-rg'
 end

Rakefile

@@ -3,8 +3,6 @@ require 'bundler/gem_tasks'
 require 'rake/testtask'
 require 'rdoc/task'
 
-$LOAD_PATH.unshift("lib")
-
 Rake::RDocTask.new do |rdoc|
   if File.exist?('VERSION')
     version = File.read('VERSION')
@@ -21,7 +19,15 @@ Rake::RDocTask.new do |rdoc|
 end
 
 task :test do
-  system "cd test && ./run_tests.sh" or fail
+  failed = Dir["test/*_test.rb"].map do |test|
+    command = "ruby #{test}"
+    puts
+    puts command
+    command unless system(command)
+  end.compact
+  if failed.any?
+    abort "#{failed.count} Tests failed\n#{failed.join("\n")}"
+  end
 end
 
 desc 'Default: run tests'

test/run_tests.sh

@@ -1,11 +1,12 @@
 require 'bundler/setup'
 require 'minitest/autorun'
+require 'minitest/rg'
 
 $VERBOSE = true # enable ruby warnings
 
 require 'mocha/setup'
 
-class Minitest::Unit::TestCase
+class Minitest::Test
   private
     # Tests to see that two times are within the given distance,
     # in seconds, from each other.

test/test_helper.rb

@@ -4,7 +4,7 @@
 
 require 'active_support/all'
 
-class TestTimeStackItem < Minitest::Unit::TestCase
+class TestTimeStackItem < Minitest::Test
   def teardown
     Timecop.return
     Time.zone = nil

test/time_stack_item_test.rb

@@ -1,7 +1,7 @@
 require_relative "test_helper"
 require 'timecop'
 
-class TestTimecop < Minitest::Unit::TestCase
+class TestTimecop < Minitest::Test
   def setup
     t = Time.local(2008, 9, 1, 10, 5, 0) # monday
     Timecop.travel(t)

test/timecop_date_parse_test.rb

@@ -1,7 +1,7 @@
 require_relative "test_helper"
 require 'timecop'
 
-class TestTimecop < Minitest::Unit::TestCase
+class TestTimecop < Minitest::Test
   def teardown
     Timecop.return
   end

test/timecop_test.rb

@@ -6,7 +6,7 @@
 require_relative "test_helper"
 require 'timecop'
 
-class TestTimecopWithActiveSupport < Minitest::Unit::TestCase
+class TestTimecopWithActiveSupport < Minitest::Test
   def teardown
     Timecop.return
   end

test/timecop_with_active_support_test.rb

@@ -1,7 +1,7 @@
 require_relative "test_helper"
 require "time"
 
-class TestTimecopWithoutDateButWithTime < Minitest::Unit::TestCase
+class TestTimecopWithoutDateButWithTime < Minitest::Test
   def test_loads_properly_when_time_is_required_instead_of_date
     require 'timecop'
   end

test/timecop_without_date_but_with_time_test.rb

@@ -1,7 +1,7 @@
 require_relative "test_helper"
 require 'timecop'
 
-class TestTimecopWithoutDate < Minitest::Unit::TestCase
+class TestTimecopWithoutDate < Minitest::Test
 
   def setup
     Object.send(:remove_const, :Date) if Object.const_defined?(:Date)