haml 4.0.7 → 5.0.0

data/test/filters_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class FiltersTest < MiniTest::Unit::TestCase
+class FiltersTest < Haml::TestCase
   test "should be registered as filters when including Haml::Filters::Base" do
     begin
       refute Haml::Filters.defined.has_key? "bar"
@@ -26,8 +26,11 @@ class FiltersTest < MiniTest::Unit::TestCase
   test "should raise error when a Tilt filters dependencies are unavailable for extension" do
     begin
       assert_raises Haml::Error do
-        Haml::Filters.register_tilt_filter "Textile"
-        Haml::Filters.defined["textile"].template_class
+        # ignore warnings from Tilt
+        silence_warnings do
+          Haml::Filters.register_tilt_filter "Textile"
+          Haml::Filters.defined["textile"].template_class
+        end
       end
     ensure
       Haml::Filters.remove_filter "Textile"
@@ -64,7 +67,7 @@ class FiltersTest < MiniTest::Unit::TestCase
   end
 
   test "should respect escaped newlines and interpolation" do
-    html = "\\n\n"
+    html = "\\n\n\n"
     haml = ":plain\n  \\n\#{""}"
     assert_equal(html, render(haml))
   end
@@ -73,16 +76,21 @@ class FiltersTest < MiniTest::Unit::TestCase
     assert_equal("\n", render(':plain'))
   end
 
-  test "should be compatible with ugly mode" do
+  test ":plain with content" do
     expectation = "foo\n"
-    assert_equal(expectation, render(":plain\n  foo", :ugly => true))
+    assert_equal(expectation, render(":plain\n  foo"))
   end
 
   test "should pass options to Tilt filters that precompile" do
-    haml  = ":erb\n  <%= 'foo' %>"
-    refute_match('TEST_VAR', Haml::Engine.new(haml).compiler.precompiled)
-    Haml::Filters::Erb.options = {:outvar => 'TEST_VAR'}
-    assert_match('TEST_VAR', Haml::Engine.new(haml).compiler.precompiled)
+    begin
+      orig_erb_opts = Haml::Filters::Erb.options
+      haml  = ":erb\n  <%= 'foo' %>"
+      refute_match('test_var', Haml::Engine.new(haml).compiler.precompiled)
+      Haml::Filters::Erb.options = {:outvar => 'test_var'}
+      assert_match('test_var', Haml::Engine.new(haml).compiler.precompiled)
+    ensure
+      Haml::Filters::Erb.options = orig_erb_opts
+    end
   end
 
   test "should pass options to Tilt filters that don't precompile" do
@@ -109,9 +117,14 @@ class FiltersTest < MiniTest::Unit::TestCase
     end
   end
 
+  test "interpolated code should be escaped if escape_html is set" do
+    assert_equal "&lt;script&gt;evil&lt;/script&gt;\n\n",
+                 render(":plain\n  \#{'<script>evil</script>'}", :escape_html => true)
+  end
+
 end
 
-class ErbFilterTest < MiniTest::Unit::TestCase
+class ErbFilterTest < Haml::TestCase
   test "multiline expressions should work" do
     html = "foobarbaz\n"
     haml = %Q{:erb\n  <%= "foo" +\n      "bar" +\n      "baz" %>}
@@ -132,7 +145,7 @@ class ErbFilterTest < MiniTest::Unit::TestCase
 
 end
 
-class JavascriptFilterTest < MiniTest::Unit::TestCase
+class JavascriptFilterTest < Haml::TestCase
   test "should interpolate" do
     scope = Object.new.instance_eval {foo = "bar"; nil if foo; binding}
     haml  = ":javascript\n  \#{foo}"
@@ -140,8 +153,8 @@ class JavascriptFilterTest < MiniTest::Unit::TestCase
     assert_match(/bar/, html)
   end
 
-  test "should never HTML-escape ampersands" do
-    html = "<script>\n  & < > &\n</script>\n"
+  test "should never HTML-escape non-interpolated ampersands" do
+    html = "<script>\n  & < > &amp;\n</script>\n"
     haml = %Q{:javascript\n  & < > \#{"&"}}
     assert_equal(html, render(haml, :escape_html => true))
   end
@@ -178,7 +191,7 @@ class JavascriptFilterTest < MiniTest::Unit::TestCase
   end
 end
 
-class CSSFilterTest < MiniTest::Unit::TestCase
+class CSSFilterTest < Haml::TestCase
   test "should wrap output in CDATA and a CSS tag when output is XHTML" do
     html = "<style type='text/css'>\n  /*<![CDATA[*/\n    foo\n  /*]]>*/\n</style>\n"
     haml = ":css\n  foo"
@@ -217,7 +230,7 @@ class CSSFilterTest < MiniTest::Unit::TestCase
   end
 end
 
-class CDATAFilterTest < MiniTest::Unit::TestCase
+class CDATAFilterTest < Haml::TestCase
   test "should wrap output in CDATA tag" do
     html = "<![CDATA[\n    foo\n]]>\n"
     haml = ":cdata\n  foo"
@@ -225,7 +238,7 @@ class CDATAFilterTest < MiniTest::Unit::TestCase
   end
 end
 
-class EscapedFilterTest < MiniTest::Unit::TestCase
+class EscapedFilterTest < Haml::TestCase
   test "should escape ampersands" do
     html = "&amp;\n"
     haml = ":escaped\n  &"
@@ -233,7 +246,7 @@ class EscapedFilterTest < MiniTest::Unit::TestCase
   end
 end
 
-class RubyFilterTest < MiniTest::Unit::TestCase
+class RubyFilterTest < Haml::TestCase
   test "can write to haml_io" do
     haml = ":ruby\n  haml_io.puts 'hello'\n"
     html = "hello\n"
@@ -251,4 +264,4 @@ class RubyFilterTest < MiniTest::Unit::TestCase
     html = "7\n"
     assert_equal(html, render(haml))
   end
-end
+end

data/test/gemfiles/Gemfile.rails-4.0.x

@@ -1,5 +1,11 @@
-source "http://rubygems.org"
+source "https://rubygems.org"
 
-gem 'bundler', '~> 1.3.0'
-gem 'rails', '~> 4.0.0.rc1'
+if ENV['TRAVIS']
+  platform :mri_21 do
+    gem 'coveralls', require: false
+  end
+end
+
+gem 'rails', '~> 4.0.0'
+gem 'nokogiri', RUBY_VERSION < '2.1' ? '~> 1.6.0' : '>= 1.7'
 gemspec :path => '../..'

data/test/gemfiles/Gemfile.rails-4.0.x.lock

@@ -0,0 +1,87 @@
+PATH
+  remote: ../..
+  specs:
+    haml (4.0.7)
+      tilt
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    actionmailer (4.0.13)
+      actionpack (= 4.0.13)
+      mail (~> 2.5, >= 2.5.4)
+    actionpack (4.0.13)
+      activesupport (= 4.0.13)
+      builder (~> 3.1.0)
+      erubis (~> 2.7.0)
+      rack (~> 1.5.2)
+      rack-test (~> 0.6.2)
+    activemodel (4.0.13)
+      activesupport (= 4.0.13)
+      builder (~> 3.1.0)
+    activerecord (4.0.13)
+      activemodel (= 4.0.13)
+      activerecord-deprecated_finders (~> 1.0.2)
+      activesupport (= 4.0.13)
+      arel (~> 4.0.0)
+    activerecord-deprecated_finders (1.0.4)
+    activesupport (4.0.13)
+      i18n (~> 0.6, >= 0.6.9)
+      minitest (~> 4.2)
+      multi_json (~> 1.3)
+      thread_safe (~> 0.1)
+      tzinfo (~> 0.3.37)
+    arel (4.0.2)
+    builder (3.1.4)
+    concurrent-ruby (1.0.2)
+    erubis (2.7.0)
+    i18n (0.7.0)
+    mail (2.6.4)
+      mime-types (>= 1.16, < 4)
+    mime-types (2.99.2)
+    minitest (4.7.5)
+    multi_json (1.12.1)
+    nokogiri (1.5.11)
+    rack (1.5.5)
+    rack-test (0.6.3)
+      rack (>= 1.0)
+    rails (4.0.13)
+      actionmailer (= 4.0.13)
+      actionpack (= 4.0.13)
+      activerecord (= 4.0.13)
+      activesupport (= 4.0.13)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.0.13)
+      sprockets-rails (~> 2.0)
+    railties (4.0.13)
+      actionpack (= 4.0.13)
+      activesupport (= 4.0.13)
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
+    rake (11.2.2)
+    rbench (0.2.3)
+    sprockets (3.7.0)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (2.3.3)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      sprockets (>= 2.8, < 4.0)
+    thor (0.19.1)
+    thread_safe (0.3.5)
+    tilt (2.0.5)
+    tzinfo (0.3.51)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  haml!
+  mime-types (< 3)
+  minitest
+  nokogiri (~> 1.5.10)
+  rails (~> 4.0.0)
+  rbench
+
+BUNDLED WITH
+   1.12.5

data/test/gemfiles/Gemfile.rails-4.1.x

@@ -0,0 +1,5 @@
+source "https://rubygems.org"
+
+gem 'rails', '~> 4.1.0'
+gem 'nokogiri', RUBY_VERSION < '2.1' ? '~> 1.6.0' : '>= 1.7'
+gemspec :path => '../..'

data/test/gemfiles/Gemfile.rails-4.2.x

@@ -0,0 +1,5 @@
+source "https://rubygems.org"
+
+gem 'rails', '~> 4.2.0'
+gem 'nokogiri', RUBY_VERSION < '2.1' ? '~> 1.6.0' : '>= 1.7'
+gemspec :path => '../..'

data/test/gemfiles/Gemfile.rails-5.0.x

@@ -0,0 +1,4 @@
+source "https://rubygems.org"
+
+gem 'rails', '~> 5.0.0'
+gemspec :path => '../..'