From bdd1e2de330e554557cf440f98c436d2d3ac3401 Mon Sep 17 00:00:00 2001
From: Chris Eppstein <chris@eppsteins.net>
Date: Thu, 19 Nov 2009 02:26:35 -0800
Subject: [PATCH] Make the tests pass in ruby 1.9

---
 Rakefile                       | 1 +
 test/command_line_test.rb      | 4 ++--
 test/compass_test.rb           | 4 ++--
 test/configuration_test.rb     | 4 ++--
 test/rails_integration_test.rb | 2 +-
 test/sass_extensions_test.rb   | 4 ++--
 6 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/Rakefile b/Rakefile
index f18b1f3b..29b64f49 100644
--- a/Rakefile
+++ b/Rakefile
@@ -25,6 +25,7 @@ require 'fileutils'
 
 Rake::TestTask.new :run_tests do |t|
   t.libs << 'lib'
+  t.libs << 'test'
   t.libs << 'haml/lib' if ENV["RUN_CODE_RUN"]
   test_files = FileList['test/**/*_test.rb']
   test_files.exclude('test/rails/*', 'test/haml/*')
diff --git a/test/command_line_test.rb b/test/command_line_test.rb
index b23ad2b0..d99f7378 100644
--- a/test/command_line_test.rb
+++ b/test/command_line_test.rb
@@ -1,4 +1,4 @@
-require  File.dirname(__FILE__)+'/test_helper'
+require 'test_helper'
 require 'fileutils'
 require 'compass'
 require 'compass/exec'
@@ -64,4 +64,4 @@ class CommandLineTest < Test::Unit::TestCase
     end
   end
 
-end
\ No newline at end of file
+end
diff --git a/test/compass_test.rb b/test/compass_test.rb
index 1ed50411..eb155b15 100644
--- a/test/compass_test.rb
+++ b/test/compass_test.rb
@@ -1,4 +1,4 @@
-require  File.dirname(__FILE__)+'/test_helper'
+require 'test_helper'
 require 'fileutils'
 require 'compass'
 
@@ -129,4 +129,4 @@ private
     File.join(project_path(project_name), "saved")
   end
 
-end
\ No newline at end of file
+end
diff --git a/test/configuration_test.rb b/test/configuration_test.rb
index 1ba96327..08c872fa 100644
--- a/test/configuration_test.rb
+++ b/test/configuration_test.rb
@@ -1,4 +1,4 @@
-require  File.dirname(__FILE__)+'/test_helper'
+require 'test_helper'
 require 'compass'
 require 'stringio'
 
@@ -120,4 +120,4 @@ EXPECTED
       assert_equal expected_serialization, Compass.configuration.serialize
     end
 
-end
\ No newline at end of file
+end
diff --git a/test/rails_integration_test.rb b/test/rails_integration_test.rb
index d9273504..a46fd2f1 100644
--- a/test/rails_integration_test.rb
+++ b/test/rails_integration_test.rb
@@ -1,4 +1,4 @@
-require  File.join(File.dirname(__FILE__),'test_helper')
+require 'test_helper'
 require 'fileutils'
 require 'compass'
 require 'compass/exec'
diff --git a/test/sass_extensions_test.rb b/test/sass_extensions_test.rb
index 98136c9a..797e235c 100644
--- a/test/sass_extensions_test.rb
+++ b/test/sass_extensions_test.rb
@@ -1,4 +1,4 @@
-require  File.dirname(__FILE__)+'/test_helper'
+require 'test_helper'
 
 class SassExtensionsTest < Test::Unit::TestCase
   def test_simple
@@ -28,4 +28,4 @@ protected
     options = arguments.last.is_a?(Hash) ? arguments.pop : Hash.new
     evaluation_content(options).nest(*arguments.map{|a| Sass::Script::String.new(a)}).to_s
   end
-end
\ No newline at end of file
+end