Make the symlinked-Rails facility work properly.

test/haml/engine_test.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/test_helper'
+require File.dirname(__FILE__) + '/../test_helper'
 
 class EngineTest < Test::Unit::TestCase
   # A map of erroneous Sass documents to the error messages they should produce.

test/haml/helper_test.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/test_helper'
+require File.dirname(__FILE__) + '/../test_helper'
 require 'haml/template'
 
 class HelperTest < Test::Unit::TestCase

test/haml/html2haml_test.rb

@@ -1,7 +1,5 @@
 #!/usr/bin/env ruby
-
-require 'test/unit'
-require File.dirname(__FILE__) + '/../../lib/haml'
+require File.dirname(__FILE__) + '/../test_helper'
 require 'haml/html'
 
 class Html2HamlTest < Test::Unit::TestCase

test/haml/template_test.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/test_helper'
+require File.dirname(__FILE__) + '/../test_helper'
 require 'haml/template'
 require File.dirname(__FILE__) + '/mocks/article'
 

test/sass/engine_test.rb

@@ -1,7 +1,5 @@
 #!/usr/bin/env ruby
-
-require 'test/unit'
-require File.dirname(__FILE__) + '/../../lib/sass'
+require File.dirname(__FILE__) + '/../test_helper'
 require 'sass/engine'
 
 class SassEngineTest < Test::Unit::TestCase

test/sass/plugin_test.rb

@@ -3,13 +3,9 @@
 MERB_ENV = RAILS_ENV  = 'testing'
 RAILS_ROOT = '.'
 
-require 'test/unit'
-require 'fileutils'
-require File.dirname(__FILE__) + '/../../lib/sass'
-require 'rubygems'
-
-require 'action_controller'
+require File.dirname(__FILE__) + '/../test_helper'
 require 'sass/plugin'
+require 'fileutils'
 
 class SassPluginTest < Test::Unit::TestCase
   @@templates = %w{

test/test_helper.rb

@@ -1,7 +1,7 @@
 # allows testing with edge Rails by creating a test/rails symlink
-linked_rails = File.dirname(__FILE__) + '/../rails'
+linked_rails = File.dirname(__FILE__) + '/rails'
 
-if File.exists? linked_rails
+if File.exists?(linked_rails) && !$:.include?(linked_rails + '/activesupport/lib')
   puts "[ using linked Rails ]"
   $:.unshift linked_rails + '/activesupport/lib'
   $:.unshift linked_rails + '/actionpack/lib'
@@ -12,4 +12,5 @@ require 'action_controller'
 require 'action_view'
 
 require 'test/unit'
-require File.dirname(__FILE__) + '/../../lib/haml'
+require File.dirname(__FILE__) + '/../lib/haml'
+require File.dirname(__FILE__) + '/../lib/sass'