Merge pull request #417 from grosser/grosser/test

make ruby xxx_test.rb work and do not add anything to the load path

Author: jonleighton

Rakefile

@@ -3,13 +3,11 @@ require "rake/testtask"
 
 namespace :test do
   Rake::TestTask.new(:unit) do |t|
-    t.libs << "test"
     t.test_files = FileList["test/unit/**/*_test.rb"]
     t.verbose = true
   end
 
   Rake::TestTask.new(:acceptance) do |t|
-    t.libs << "test"
     t.test_files = FileList["test/acceptance_test.rb"]
     t.verbose = true
   end

lib/spring/test/acceptance_test.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require "io/wait"
 require "timeout"
 require "spring/sid"

test/acceptance_test.rb

@@ -1,4 +1,4 @@
-require "helper"
+require_relative "helper"
 
 class AcceptanceTest < Spring::Test::AcceptanceTest
 end

test/helper.rb

@@ -1,5 +1,3 @@
-$LOAD_PATH.unshift File.expand_path("../../lib", __FILE__)
-
 require "bundler/setup"
 require "minitest/autorun"
 

test/unit/client/help_test.rb

@@ -1,6 +1,6 @@
-require 'helper'
+require_relative "../../helper"
 
-require "spring/client/command"
+require 'spring/client/command'
 require 'spring/client/help'
 require 'spring/client'
 

test/unit/client/version_test.rb

@@ -1,4 +1,4 @@
-require 'helper'
+require_relative "../../helper"
 require 'spring/client'
 
 class VersionTest < ActiveSupport::TestCase

test/unit/commands_test.rb

@@ -1,4 +1,4 @@
-require "helper"
+require_relative "../helper"
 require "spring/commands"
 
 class CommandsTest < ActiveSupport::TestCase

test/unit/process_title_updater_test.rb

@@ -1,4 +1,4 @@
-require "helper"
+require_relative "../helper"
 require "spring/process_title_updater"
 require "active_support/time"
 

test/unit/watcher_test.rb

@@ -1,4 +1,4 @@
-require "helper"
+require_relative "../helper"
 require "spring/test/watcher_test"
 require "spring/watcher/polling"