Permalink
Browse files

Moved tests out of Haml directory

  • Loading branch information...
1 parent 6341bdf commit 4876668fef72ef72589bdffde41ee3262108d508 @norman norman committed Apr 26, 2012
Showing with 9 additions and 10 deletions.
  1. +2 −3 test/benchmark.rb
  2. +1 −1 test/{haml → }/engine_test.rb
  3. 0 test/{haml → }/erb/_av_partial_1.erb
  4. 0 test/{haml → }/erb/_av_partial_2.erb
  5. 0 test/{haml → }/erb/action_view.erb
  6. 0 test/{haml → }/erb/standard.erb
  7. +1 −1 test/{haml → }/helper_test.rb
  8. 0 test/{haml → }/html2haml/erb_tests.rb
  9. +1 −1 test/{haml → }/html2haml_test.rb
  10. 0 test/{haml → }/markaby/standard.mab
  11. 0 test/{haml → }/mocks/article.rb
  12. 0 test/{haml → }/results/content_for_layout.xhtml
  13. 0 test/{haml → }/results/eval_suppressed.xhtml
  14. 0 test/{haml → }/results/filters.xhtml
  15. 0 test/{haml → }/results/helpers.xhtml
  16. 0 test/{haml → }/results/helpful.xhtml
  17. 0 test/{haml → }/results/just_stuff.xhtml
  18. 0 test/{haml → }/results/list.xhtml
  19. 0 test/{haml → }/results/nuke_inner_whitespace.xhtml
  20. 0 test/{haml → }/results/nuke_outer_whitespace.xhtml
  21. 0 test/{haml → }/results/original_engine.xhtml
  22. 0 test/{haml → }/results/partial_layout.xhtml
  23. 0 test/{haml → }/results/partials.xhtml
  24. 0 test/{haml → }/results/render_layout.xhtml
  25. 0 test/{haml → }/results/silent_script.xhtml
  26. 0 test/{haml → }/results/standard.xhtml
  27. 0 test/{haml → }/results/tag_parsing.xhtml
  28. 0 test/{haml → }/results/very_basic.xhtml
  29. 0 test/{haml → }/results/whitespace_handling.xhtml
  30. +2 −2 test/{haml → }/spec_test.rb
  31. +1 −1 test/{haml → }/template_test.rb
  32. 0 test/{haml → }/templates/_av_partial_1.haml
  33. 0 test/{haml → }/templates/_av_partial_1_ugly.haml
  34. 0 test/{haml → }/templates/_av_partial_2.haml
  35. 0 test/{haml → }/templates/_av_partial_2_ugly.haml
  36. 0 test/{haml → }/templates/_layout.erb
  37. 0 test/{haml → }/templates/_layout_for_partial.haml
  38. 0 test/{haml → }/templates/_partial.haml
  39. 0 test/{haml → }/templates/_text_area.haml
  40. 0 test/{haml → }/templates/action_view.haml
  41. 0 test/{haml → }/templates/action_view_ugly.haml
  42. 0 test/{haml → }/templates/breakage.haml
  43. 0 test/{haml → }/templates/content_for_layout.haml
  44. 0 test/{haml → }/templates/eval_suppressed.haml
  45. 0 test/{haml → }/templates/filters.haml
  46. 0 test/{haml → }/templates/helpers.haml
  47. 0 test/{haml → }/templates/helpful.haml
  48. 0 test/{haml → }/templates/just_stuff.haml
  49. 0 test/{haml → }/templates/list.haml
  50. 0 test/{haml → }/templates/nuke_inner_whitespace.haml
  51. 0 test/{haml → }/templates/nuke_outer_whitespace.haml
  52. 0 test/{haml → }/templates/original_engine.haml
  53. 0 test/{haml → }/templates/partial_layout.haml
  54. 0 test/{haml → }/templates/partialize.haml
  55. 0 test/{haml → }/templates/partials.haml
  56. 0 test/{haml → }/templates/render_layout.haml
  57. 0 test/{haml → }/templates/silent_script.haml
  58. 0 test/{haml → }/templates/standard.haml
  59. 0 test/{haml → }/templates/standard_ugly.haml
  60. 0 test/{haml → }/templates/tag_parsing.haml
  61. 0 test/{haml → }/templates/very_basic.haml
  62. 0 test/{haml → }/templates/whitespace_handling.haml
  63. +1 −1 test/{haml → }/util_test.rb
View
5 test/benchmark.rb
@@ -37,9 +37,8 @@ def render(view, file)
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
View
2 test/haml/engine_test.rb → 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.
View
0 test/haml/erb/_av_partial_1.erb → test/erb/_av_partial_1.erb
File renamed without changes.
View
0 test/haml/erb/_av_partial_2.erb → test/erb/_av_partial_2.erb
File renamed without changes.
View
0 test/haml/erb/action_view.erb → test/erb/action_view.erb
File renamed without changes.
View
0 test/haml/erb/standard.erb → test/erb/standard.erb
File renamed without changes.
View
2 test/haml/helper_test.rb → 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
View
0 test/haml/html2haml/erb_tests.rb → test/html2haml/erb_tests.rb
File renamed without changes.
View
2 test/haml/html2haml_test.rb → 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'
View
0 test/haml/markaby/standard.mab → test/markaby/standard.mab
File renamed without changes.
View
0 test/haml/mocks/article.rb → test/mocks/article.rb
File renamed without changes.
View
0 test/haml/results/content_for_layout.xhtml → test/results/content_for_layout.xhtml
File renamed without changes.
View
0 test/haml/results/eval_suppressed.xhtml → test/results/eval_suppressed.xhtml
File renamed without changes.
View
0 test/haml/results/filters.xhtml → test/results/filters.xhtml
File renamed without changes.
View
0 test/haml/results/helpers.xhtml → test/results/helpers.xhtml
File renamed without changes.
View
0 test/haml/results/helpful.xhtml → test/results/helpful.xhtml
File renamed without changes.
View
0 test/haml/results/just_stuff.xhtml → test/results/just_stuff.xhtml
File renamed without changes.
View
0 test/haml/results/list.xhtml → test/results/list.xhtml
File renamed without changes.
View
0 .../haml/results/nuke_inner_whitespace.xhtml → test/results/nuke_inner_whitespace.xhtml
File renamed without changes.
View
0 .../haml/results/nuke_outer_whitespace.xhtml → test/results/nuke_outer_whitespace.xhtml
File renamed without changes.
View
0 test/haml/results/original_engine.xhtml → test/results/original_engine.xhtml
File renamed without changes.
View
0 test/haml/results/partial_layout.xhtml → test/results/partial_layout.xhtml
File renamed without changes.
View
0 test/haml/results/partials.xhtml → test/results/partials.xhtml
File renamed without changes.
View
0 test/haml/results/render_layout.xhtml → test/results/render_layout.xhtml
File renamed without changes.
View
0 test/haml/results/silent_script.xhtml → test/results/silent_script.xhtml
File renamed without changes.
View
0 test/haml/results/standard.xhtml → test/results/standard.xhtml
File renamed without changes.
View
0 test/haml/results/tag_parsing.xhtml → test/results/tag_parsing.xhtml
File renamed without changes.
View
0 test/haml/results/very_basic.xhtml → test/results/very_basic.xhtml
File renamed without changes.
View
0 test/haml/results/whitespace_handling.xhtml → test/results/whitespace_handling.xhtml
File renamed without changes.
View
4 test/haml/spec_test.rb → test/spec_test.rb
@@ -1,13 +1,13 @@
#!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../test_helper'
+require File.dirname(__FILE__) + '/test_helper'
begin
require 'json'
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.
View
2 test/haml/template_test.rb → 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'
View
0 test/haml/templates/_av_partial_1.haml → test/templates/_av_partial_1.haml
File renamed without changes.
View
0 test/haml/templates/_av_partial_1_ugly.haml → test/templates/_av_partial_1_ugly.haml
File renamed without changes.
View
0 test/haml/templates/_av_partial_2.haml → test/templates/_av_partial_2.haml
File renamed without changes.
View
0 test/haml/templates/_av_partial_2_ugly.haml → test/templates/_av_partial_2_ugly.haml
File renamed without changes.
View
0 test/haml/templates/_layout.erb → test/templates/_layout.erb
File renamed without changes.
View
0 test/haml/templates/_layout_for_partial.haml → test/templates/_layout_for_partial.haml
File renamed without changes.
View
0 test/haml/templates/_partial.haml → test/templates/_partial.haml
File renamed without changes.
View
0 test/haml/templates/_text_area.haml → test/templates/_text_area.haml
File renamed without changes.
View
0 test/haml/templates/action_view.haml → test/templates/action_view.haml
File renamed without changes.
View
0 test/haml/templates/action_view_ugly.haml → test/templates/action_view_ugly.haml
File renamed without changes.
View
0 test/haml/templates/breakage.haml → test/templates/breakage.haml
File renamed without changes.
View
0 test/haml/templates/content_for_layout.haml → test/templates/content_for_layout.haml
File renamed without changes.
View
0 test/haml/templates/eval_suppressed.haml → test/templates/eval_suppressed.haml
File renamed without changes.
View
0 test/haml/templates/filters.haml → test/templates/filters.haml
File renamed without changes.
View
0 test/haml/templates/helpers.haml → test/templates/helpers.haml
File renamed without changes.
View
0 test/haml/templates/helpful.haml → test/templates/helpful.haml
File renamed without changes.
View
0 test/haml/templates/just_stuff.haml → test/templates/just_stuff.haml
File renamed without changes.
View
0 test/haml/templates/list.haml → test/templates/list.haml
File renamed without changes.
View
0 ...haml/templates/nuke_inner_whitespace.haml → test/templates/nuke_inner_whitespace.haml
File renamed without changes.
View
0 ...haml/templates/nuke_outer_whitespace.haml → test/templates/nuke_outer_whitespace.haml
File renamed without changes.
View
0 test/haml/templates/original_engine.haml → test/templates/original_engine.haml
File renamed without changes.
View
0 test/haml/templates/partial_layout.haml → test/templates/partial_layout.haml
File renamed without changes.
View
0 test/haml/templates/partialize.haml → test/templates/partialize.haml
File renamed without changes.
View
0 test/haml/templates/partials.haml → test/templates/partials.haml
File renamed without changes.
View
0 test/haml/templates/render_layout.haml → test/templates/render_layout.haml
File renamed without changes.
View
0 test/haml/templates/silent_script.haml → test/templates/silent_script.haml
File renamed without changes.
View
0 test/haml/templates/standard.haml → test/templates/standard.haml
File renamed without changes.
View
0 test/haml/templates/standard_ugly.haml → test/templates/standard_ugly.haml
File renamed without changes.
View
0 test/haml/templates/tag_parsing.haml → test/templates/tag_parsing.haml
File renamed without changes.
View
0 test/haml/templates/very_basic.haml → test/templates/very_basic.haml
File renamed without changes.
View
0 test/haml/templates/whitespace_handling.haml → test/templates/whitespace_handling.haml
File renamed without changes.
View
2 test/haml/util_test.rb → 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

0 comments on commit 4876668

Please sign in to comment.