Moved tests out of Haml directory

test/benchmark.rb

@@ -37,9 +37,8 @@ RBench.run(times) do
   column :erubis, :title => "Erubis"
 
   template_name = 'standard'
-  directory = File.dirname(__FILE__) + '/haml'
-  haml_template    = File.read("#{directory}/templates/#{template_name}.haml")
-  erb_template     = File.read("#{directory}/erb/#{template_name}.erb")
+  haml_template    = File.read("#{File.dirname(__FILE__)}/templates/#{template_name}.haml")
+  erb_template     = File.read("#{File.dirname(__FILE__)}/erb/#{template_name}.erb")
 
   report "Cached" do
     obj = Object.new

test/engine_test.rb

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

test/helper_test.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../test_helper'
+require File.dirname(__FILE__) + '/test_helper'
 
 class ActionView::Base
   def nested_tag

test/html2haml_test.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../test_helper'
+require File.dirname(__FILE__) + '/test_helper'
 require File.dirname(__FILE__) + '/html2haml/erb_tests'
 require 'haml/html'
 

test/spec_test.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../test_helper'
+require File.dirname(__FILE__) + '/test_helper'
 
 begin
   require 'json'
@@ -7,7 +7,7 @@ rescue LoadError
 end
 
 class SpecTest < Test::Unit::TestCase
-  spec_file = File.dirname(__FILE__) + '/spec/tests.json'
+  spec_file = File.dirname(__FILE__) + '/haml/spec/tests.json'
   if !File.exists?(spec_file)
     error = <<MSG.rstrip
 Couldn't load haml-spec, skipping some tests.

test/template_test.rb

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

test/util_test.rb

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