compatibility with minitest 2

yannlugrin · May 23, 2011 · fe82877 · fe82877
1 parent 480bf9b
commit fe82877
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/Rakefile b/Rakefile
@@ -9,11 +9,9 @@ desc 'Run all tests'
 task :test do
   ENV['QUIET'] ||= 'true'
 
-  $LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + '/test'))
-
   MiniTest::Unit.autorun
 
-  test_files = Dir['test/**/*_spec.rb'] + Dir['test/**/test_*.rb']
+  test_files = Dir['./test/**/*_spec.rb'] + Dir['./test/**/test_*.rb']
   test_files.each { |f| require f }
 end
 

diff --git a/test/test_filesystem.rb b/test/test_filesystem.rb
@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-require 'test/helper'
+require './test/helper'
 
 class Nanoc3::DataSources::FilesystemTest < MiniTest::Unit::TestCase
 

diff --git a/test/test_filesystem_i18n.rb b/test/test_filesystem_i18n.rb
@@ -1,4 +1,6 @@
-require 'helper'
+# encoding: utf-8
+
+require './test/helper'
 
 class TestNanocFilesystemI18n < MiniTest::Unit::TestCase
 

diff --git a/test/test_filesystem_unified.rb b/test/test_filesystem_unified.rb
@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-require 'test/helper'
+require './test/helper'
 
 class Nanoc3::DataSources::FilesystemUnifiedTest < MiniTest::Unit::TestCase
 

diff --git a/test/test_filesystem_verbose.rb b/test/test_filesystem_verbose.rb
@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-require 'test/helper'
+require './test/helper'
 
 class Nanoc3::DataSources::FilesystemVerboseTest < MiniTest::Unit::TestCase