Moved haml-spec from test/haml/spec to test/haml-spec

.gitmodules

@@ -1,5 +1,5 @@
-[submodule "test/haml/spec"]
-	path = test/haml/spec
+[submodule "test/haml-spec"]
+	path = test/haml-spec
 	url = git://github.com/norman/haml-spec.git
 [submodule "vendor/sass"]
 	path = vendor/sass

Rakefile

@@ -29,7 +29,7 @@ Rake::TestTask.new do |t|
   test_files = FileList[scope('test/**/*_test.rb')]
   test_files.exclude(scope('test/rails/*'))
   test_files.exclude(scope('test/plugins/*'))
-  test_files.exclude(scope('test/haml/spec/*'))
+  test_files.exclude(scope('test/haml-spec/*'))
   t.test_files = test_files
   t.verbose = true
 end
@@ -63,7 +63,7 @@ task :permissions do
   sh %{chmod -R a+r .}
   require 'shellwords'
   Dir.glob('test/**/*_test.rb') do |file|
-    next if file =~ %r{^test/haml/spec/}
+    next if file =~ %r{^test/haml-spec/}
     sh %{chmod a+rx #{file}}
   end
 end

test/haml-spec

@@ -0,0 +1 @@
+Subproject commit f1b2ae7ca110c7a5ad9e7e82144f800559f8411c

test/haml/spec

@@ -1 +0,0 @@
-Subproject commit 7e563d6f5c0b411925a8acbfa1fc43102e48275d

test/spec_test.rb

@@ -7,7 +7,7 @@ rescue LoadError
 end
 
 class SpecTest < Test::Unit::TestCase
-  spec_file = File.dirname(__FILE__) + '/haml/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.