RubyGems - haml - Versions diffs - 2.2.17 → 2.2.18 - Mend

haml 2.2.17 → 2.2.18

Potentially problematic release.

This version of haml might be problematic. Click here for more details.

Files changed (38) hide show

data/.yardopts +3 -0
data/Rakefile +6 -6
data/VERSION +1 -1
data/extra/haml-mode.el +99 -13
data/extra/sass-mode.el +2 -2
data/lib/haml/engine.rb +1 -1
data/lib/haml/exec.rb +13 -5
data/lib/haml/filters.rb +1 -1
data/lib/haml/helpers.rb +3 -2
data/lib/haml/helpers/action_view_mods.rb +2 -1
data/lib/haml/helpers/xss_mods.rb +43 -13
data/lib/haml/html.rb +8 -0
data/lib/haml/precompiler.rb +20 -1
data/lib/haml/template.rb +2 -2
data/lib/haml/util.rb +27 -0
data/lib/sass/engine.rb +42 -2
data/lib/sass/plugin.rb +5 -4
data/lib/sass/plugin/rails.rb +2 -2
data/lib/sass/script.rb +3 -0
data/lib/sass/script/color.rb +4 -2
data/lib/sass/script/lexer.rb +8 -5
data/lib/sass/script/number.rb +2 -0
data/lib/sass/script/parser.rb +1 -1
data/lib/sass/tree/rule_node.rb +1 -0
data/test/haml/engine_test.rb +21 -0
data/test/haml/helper_test.rb +0 -0
data/test/haml/html2haml_test.rb +0 -0
data/test/haml/spec/lua_haml_spec.lua +1 -1
data/test/haml/spec/tests.json +64 -18
data/test/haml/template_test.rb +17 -3
data/test/haml/util_test.rb +0 -0
data/test/sass/css2sass_test.rb +1 -0
data/test/sass/engine_test.rb +31 -0
data/test/sass/functions_test.rb +1 -0
data/test/sass/plugin_test.rb +28 -17
data/test/sass/script_test.rb +7 -7
data/test/sass/to_sass_test.rb +549 -0
metadata +144 -142

@@ -72,6 +72,7 @@ class EngineTest < Test::Unit::TestCase
     "/ foo\n\n  bar" => ["Illegal nesting: nesting within a tag that already has content is illegal.", 3],
     "!!!\n\n  bar" => ["Illegal nesting: nesting within a header command is illegal.", 3],
     "foo\n:ruby\n  1\n  2\n  3\n- raise 'foo'" => ["foo", 6],
+    "foo\n:erb\n  1\n  2\n  3\n- raise 'foo'" => ["foo", 6],
     "= raise 'foo'\nfoo\nbar\nbaz\nbang" => ["foo", 1],
   }
@@ -567,6 +568,17 @@ HTML
 HAML
   end
+  def test_erb_filter_with_multiline_expr
+    assert_equal(<<HTML, render(<<HAML))
+foobarbaz
+HTML
+:erb
+  <%= "foo" +
+      "bar" +
+      "baz" %>
+HAML
+  end
   def test_silent_script_with_hyphen_case
     assert_equal("", render("- 'foo-case-bar-case'"))
   end
@@ -595,6 +607,15 @@ HTML
 HAML
   end
+  def test_html_attributes_with_hash
+    assert_equal("<a href='#' rel='top'>Foo</a>\n",
+      render('%a(href="#" rel="top") Foo'))
+    assert_equal("<a href='#'>Foo</a>\n",
+      render('%a(href="#") #{"Foo"}'))
+    assert_equal("<a href='#\"'></a>\n", render('%a(href="#\\"")'))
+  end
   # HTML escaping tests
   def test_ampersand_equals_should_escape

data/test/haml/helper_test.rb CHANGED

File without changes

data/test/haml/html2haml_test.rb CHANGED

File without changes

data/test/haml/spec/lua_haml_spec.lua CHANGED

@@ -11,7 +11,7 @@ local function get_tests(filename)
   end
 end
-local fh = assert(io.open(get_tests("tests-new.json")))
+local fh = assert(io.open(get_tests("tests.json")))
 local input = fh:read '*a'
 fh:close()

data/test/haml/spec/tests.json CHANGED

@@ -31,6 +31,11 @@
       "html" : "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Frameset//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd\">"
     },
+    "an HTML 5 doctype with XHTML syntax" : {
+      "haml" : "!!! 5",
+      "html" : "<!DOCTYPE html>"
+    },
     "an HTML 5 XML prolog (silent)" : {
       "haml" : "!!! XML",
       "html" : "",
@@ -147,8 +152,12 @@
     "an implicit div with a CSS class" : {
       "haml" : ".class1",
       "html" : "<div class='class1'></div>"
-    }
+    },
+    "multiple simple Haml tags" : {
+      "haml" : "%div\n  %div\n    %p",
+      "html" : "<div>\n  <div>\n    <p></p>\n  </div>\n</div>"
+	}
   },
   "tags with unusual HTML characters" : {
@@ -208,8 +217,12 @@
     "a tag with CSS" : {
       "haml" : "%p.class1 hello",
       "html" : "<p class='class1'>hello</p>"
-    }
+    },
+    "multiple simple tags" : {
+      "haml" : "%div\n  %div\n    %p text",
+      "html" : "<div>\n  <div>\n    <p>text</p>\n  </div>\n</div>"
+    }
   },
   "tags with nested content" : {
@@ -222,6 +235,11 @@
     "a tag with CSS" : {
       "haml" : "%p.class1\n  hello",
       "html" : "<p class='class1'>\n  hello\n</p>"
+    },
+    "multiple simple tags" : {
+      "haml" : "%div\n  %div\n    %p\n      text",
+      "html" : "<div>\n  <div>\n    <p>\n      text\n    </p>\n  </div>\n</div>"
     }
   },
@@ -374,14 +392,6 @@
       "locals" : {
         "var" : "a"
       }
-    },
-    "an interpolated attribute" : {
-      "haml" : "%p{:a =>\"#{var}\"}",
-      "html" : "<p a='value'></p>",
-      "locals" : {
-        "var" : "value"
-      }
     }
   },
@@ -446,14 +456,6 @@
   "interpolation": {
-    "interpolation inside code" : {
-      "haml" : "%p= \"#{var}\"",
-      "html" : "<p>value</p>",
-      "locals" : {
-        "var" : "value"
-      }
-    },
     "interpolation inside inline content" : {
       "haml" : "%p #{var}",
       "html" : "<p>value</p>",
@@ -483,6 +485,50 @@
       }
     }
+  },
+  "HTML escaping" : {
+    "code following '&='" : {
+      "haml" : "&= '<\"&>'",
+      "html" : "&lt;&quot;&amp;&gt;"
+    },
+    "code following '=' when escape_haml is set to true" : {
+      "haml" : "= '<\"&>'",
+      "html" : "&lt;&quot;&amp;&gt;",
+      "config" : {
+        "escape_html" : "true"
+      }
+    },
+    "code following '!=' when escape_haml is set to true" : {
+      "haml" : "!= '<\"&>'",
+      "html" : "<\"&>",
+      "config" : {
+        "escape_html" : "true"
+      }
+    }
+  },
+  "Boolean attributes" : {
+    "boolean attribute with XHTML" : {
+      "haml" : "%input(checked=true)",
+      "html" : "<input checked='checked' />",
+      "config" : {
+        "format" : "xhtml"
+      }
+    },
+    "boolean attribute with HTML" : {
+      "haml" : "%input(checked=true)",
+      "html" : "<input checked>",
+      "config" : {
+        "format" : "html5"
+      }
+    }
   }
 }

data/test/haml/template_test.rb CHANGED

@@ -258,7 +258,7 @@ END
     end
     def test_xss_protection_with_safe_strings
-      assert_equal("Foo & Bar\n", render('= "Foo & Bar".html_safe!', :action_view))
+      assert_equal("Foo & Bar\n", render('= Haml::Util.html_safe("Foo & Bar")', :action_view))
     end
     def test_xss_protection_with_bang
@@ -274,11 +274,11 @@ END
     end
     def test_xss_protection_with_safe_strings_in_interpolation
-      assert_equal("Foo & Bar\n", render('Foo #{"&".html_safe!} Bar', :action_view))
+      assert_equal("Foo & Bar\n", render('Foo #{Haml::Util.html_safe("&")} Bar', :action_view))
     end
     def test_xss_protection_with_mixed_strings_in_interpolation
-      assert_equal("Foo & Bar &amp; Baz\n", render('Foo #{"&".html_safe!} Bar #{"&"} Baz', :action_view))
+      assert_equal("Foo & Bar &amp; Baz\n", render('Foo #{Haml::Util.html_safe("&")} Bar #{"&"} Baz', :action_view))
     end
     def test_rendered_string_is_html_safe
@@ -292,5 +292,19 @@ END
     def test_xss_html_escaping_with_non_strings
       assert_equal("4\n", render("= html_escape(4)"))
     end
+    def test_xss_protection_with_concat
+      assert_equal("Foo &amp; Bar", render('- concat "Foo & Bar"', :action_view))
+    end
+    def test_xss_protection_with_concat_with_safe_string
+      assert_equal("Foo & Bar", render('- concat(Haml::Util.html_safe("Foo & Bar"))', :action_view))
+    end
+    if Haml::Util.has?(:instance_method, ActionView::Helpers::TextHelper, :safe_concat)
+      def test_xss_protection_with_safe_concat
+        assert_equal("Foo & Bar", render('- safe_concat "Foo & Bar"', :action_view))
+      end
+    end
   end
 end

data/test/haml/util_test.rb CHANGED

File without changes

data/test/sass/css2sass_test.rb CHANGED

@@ -1,3 +1,4 @@
+#!/usr/bin/env ruby
 require 'test/unit'
 require File.dirname(__FILE__) + '/../test_helper'
 require 'sass/css'

data/test/sass/engine_test.rb CHANGED

@@ -96,6 +96,7 @@ MSG
     '@if' => "Invalid if directive '@if': expected expression.",
     '@while' => "Invalid while directive '@while': expected expression.",
     '@debug' => "Invalid debug directive '@debug': expected expression.",
+    "/* foo\n    bar\n  baz" => "Inconsistent indentation: previous line was indented by 4 spaces, but this line was indented by 2 spaces.",
     # Regression tests
     "a\n  b:\n    c\n    d" => ["Illegal nesting: Only properties may be nested beneath properties.", 3],
@@ -691,6 +692,36 @@ foo {
 CSS
   end
+  def test_comment_indentation_at_beginning_of_doc
+    assert_equal <<CSS, render(<<SASS)
+/* foo
+ * bar
+ *   baz */
+foo {
+  a: b; }
+CSS
+/* foo
+   bar
+     baz
+foo
+  a: b
+SASS
+  end
+  def test_unusual_comment_indentation
+    assert_equal <<CSS, render(<<SASS)
+foo {
+  /* foo
+   * bar
+   *   baz */ }
+CSS
+foo
+  /* foo
+     bar
+       baz
+SASS
+  end
   def test_attribute_selector_with_spaces
     assert_equal(<<CSS, render(<<SASS))
 a b[foo = bar] {

data/test/sass/functions_test.rb CHANGED

@@ -1,3 +1,4 @@
+#!/usr/bin/env ruby
 require 'test/unit'
 require File.dirname(__FILE__) + '/../../lib/sass'
 require 'sass/script'

data/test/sass/plugin_test.rb CHANGED

@@ -14,6 +14,7 @@ class SassPluginTest < Test::Unit::TestCase
     FileUtils.mkdir tempfile_loc(nil,"more_")
     set_plugin_opts
     Sass::Plugin.update_stylesheets
+    reset_mtimes
   end
   def teardown
@@ -30,23 +31,21 @@ class SassPluginTest < Test::Unit::TestCase
   def test_no_update
     File.delete(tempfile_loc('basic'))
-    assert Sass::Plugin.stylesheet_needs_update?('basic', template_loc, tempfile_loc)
+    assert_needs_update 'basic'
     Sass::Plugin.update_stylesheets
     assert_stylesheet_updated 'basic'
   end
   def test_update_needed_when_modified
-    sleep 1
-    FileUtils.touch(template_loc('basic'))
-    assert Sass::Plugin.stylesheet_needs_update?('basic', template_loc, tempfile_loc)
+    touch 'basic'
+    assert_needs_update 'basic'
     Sass::Plugin.update_stylesheets
     assert_stylesheet_updated 'basic'
   end
   def test_update_needed_when_dependency_modified
-    sleep 1
-    FileUtils.touch(template_loc('basic'))
-    assert Sass::Plugin.stylesheet_needs_update?('import', template_loc, tempfile_loc)
+    touch 'basic'
+    assert_needs_update 'import'
     Sass::Plugin.update_stylesheets
     assert_stylesheet_updated 'basic'
   end
@@ -108,7 +107,7 @@ class SassPluginTest < Test::Unit::TestCase
     set_plugin_opts
     File.delete(tempfile_loc('basic'))
-    assert Sass::Plugin.stylesheet_needs_update?('basic', template_loc, tempfile_loc)
+    assert_needs_update 'basic'
     if defined?(MerbHandler)
       MerbHandler.new('.').process nil, nil
@@ -129,9 +128,8 @@ class SassPluginTest < Test::Unit::TestCase
     FileUtils.mv(template_loc("basic"), template_loc("basic", "more_"))
     set_plugin_opts :load_paths => [result_loc, template_loc(nil, "more_")]
-    sleep 1
-    FileUtils.touch(template_loc("basic", "more_"))
-    assert Sass::Plugin.stylesheet_needs_update?("import", template_loc, tempfile_loc)
+    touch 'basic', 'more_'
+    assert_needs_update "import"
     Sass::Plugin.update_stylesheets
     assert_renders_correctly("import")
   ensure
@@ -162,7 +160,7 @@ class SassPluginTest < Test::Unit::TestCase
   end
   def assert_stylesheet_updated(name)
-    assert !Sass::Plugin.stylesheet_needs_update?(name, template_loc, tempfile_loc)
+    assert_doesnt_need_update name
     # Make sure it isn't an exception
     expected_lines = File.read(result_loc(name)).split("\n")
@@ -172,6 +170,24 @@ class SassPluginTest < Test::Unit::TestCase
     end
   end
+  def assert_needs_update(name)
+    assert(Sass::Plugin.stylesheet_needs_update?(name, template_loc, tempfile_loc),
+      "Expected #{template_loc(name)} to need an update.")
+  end
+  def assert_doesnt_need_update(name)
+    assert(!Sass::Plugin.stylesheet_needs_update?(name, template_loc, tempfile_loc),
+      "Expected #{template_loc(name)} not to need an update.")
+  end
+  def touch(*args)
+    FileUtils.touch(template_loc(*args))
+  end
+  def reset_mtimes
+    Dir["{#{template_loc},#{tempfile_loc}}/**/*.{css,sass}"].each {|f| File.utime(Time.now, Time.now - 1, f)}
+  end
   def template_loc(name = nil, prefix = nil)
     if name
       absolutize "#{prefix}templates/#{name}.sass"
@@ -209,11 +225,6 @@ class SassPluginTest < Test::Unit::TestCase
       :always_update => true,
     }.merge(overrides)
   end
-  def wait_a_tick
-    time = Time.now
-    loop {break if Time.now.sec != time.sec}
-  end
 end
 module Sass::Plugin

data/test/sass/script_test.rb CHANGED

@@ -65,19 +65,19 @@ SASS
     assert_warning(<<WARN) {eval("foo")}
 DEPRECATION WARNING:
 On line 1, character 1 of 'test_implicit_string_warning_inline.sass'
-Implicit strings have been deprecated and will be removed in version 2.4.
+Implicit strings have been deprecated and will be removed in version 3.0.
 'foo' was not quoted. Please add double quotes (e.g. "foo").
 WARN
     assert_warning(<<WARN) {eval("1 + foo")}
 DEPRECATION WARNING:
 On line 1, character 5 of 'test_implicit_string_warning_inline.sass'
-Implicit strings have been deprecated and will be removed in version 2.4.
+Implicit strings have been deprecated and will be removed in version 3.0.
 'foo' was not quoted. Please add double quotes (e.g. "foo").
 WARN
     assert_warning(<<WARN) {render("@if 1 + foo")}
 DEPRECATION WARNING:
 On line 1, character 9 of 'test_implicit_string_warning_inline.sass'
-Implicit strings have been deprecated and will be removed in version 2.4.
+Implicit strings have been deprecated and will be removed in version 3.0.
 'foo' was not quoted. Please add double quotes (e.g. "foo").
 WARN
@@ -85,7 +85,7 @@ WARN
     assert_warning(<<WARN) {render("@if if")}
 DEPRECATION WARNING:
 On line 1, character 5 of 'test_implicit_string_warning_inline.sass'
-Implicit strings have been deprecated and will be removed in version 2.4.
+Implicit strings have been deprecated and will be removed in version 3.0.
 'if' was not quoted. Please add double quotes (e.g. "if").
 WARN
   end
@@ -94,7 +94,7 @@ WARN
     assert_warning <<WARN do
 DEPRECATION WARNING:
 On line 2, character 6 of 'test_inaccessible_functions_inline.sass'
-Implicit strings have been deprecated and will be removed in version 2.4.
+Implicit strings have been deprecated and will be removed in version 3.0.
 'to_s' was not quoted. Please add double quotes (e.g. "to_s").
 WARN
       assert_equal "send(to_s)", resolve("send(to_s)", :line => 2)
@@ -108,14 +108,14 @@ WARN
     assert_warning(<<WARN) {eval("!a-!b", {}, env("a" => a, "b" => b))}
 DEPRECATION WARNING:
 On line 1, character 3 of 'test_hyphen_warning_inline.sass'
-- will be allowed as part of variable names in version 2.4.
+- will be allowed as part of variable names in version 3.0.
 Please add whitespace to separate it from the previous token.
 WARN
     assert_warning(<<WARN) {eval("true-false")}
 DEPRECATION WARNING:
 On line 1, character 5 of 'test_hyphen_warning_inline.sass'
-- will be allowed as part of variable names in version 2.4.
+- will be allowed as part of variable names in version 3.0.
 Please add whitespace to separate it from the previous token.
 WARN
   end

data/test/sass/to_sass_test.rb ADDED

@@ -0,0 +1,549 @@
+#!/usr/bin/env ruby
+require File.dirname(__FILE__) + '/../test_helper'
+class ToSassTest < Test::Unit::TestCase
+  def test_basic
+    assert_renders <<SASS, <<SCSS
+foo bar
+  baz: bang
+  bip: bop
+SASS
+foo bar {
+  baz: bang;
+  bip: bop; }
+SCSS
+    assert_renders <<SASS, <<SCSS, :old => true
+foo bar
+  :baz bang
+  :bip bop
+SASS
+foo bar {
+  baz: bang;
+  bip: bop; }
+SCSS
+  end
+  def test_nesting
+    assert_renders <<SASS, <<SCSS
+foo bar
+  baz bang
+    baz: bang
+    bip: bop
+  blat: boo
+SASS
+foo bar {
+  baz bang {
+    baz: bang;
+    bip: bop; }
+  blat: boo; }
+SCSS
+  end
+  def test_nesting_with_parent_ref
+    assert_renders <<SASS, <<SCSS
+foo bar
+  &:hover
+    baz: bang
+SASS
+foo bar {
+  &:hover {
+    baz: bang; } }
+SCSS
+  end
+  def test_selector_interpolation
+    assert_renders <<SASS, <<SCSS
+foo \#{!bar + "baz"}.bip
+  baz: bang
+SASS
+foo \#{!bar + "baz"}.bip {
+  baz: bang; }
+SCSS
+  end
+  def test_multiline_selector_with_commas
+    assert_renders <<SASS, <<SCSS
+foo bar,
+baz bang
+  baz: bang
+SASS
+foo bar,
+baz bang {
+  baz: bang; }
+SCSS
+    assert_renders <<SASS, <<SCSS
+blat
+  foo bar,
+  baz bang
+    baz: bang
+SASS
+blat {
+  foo bar,
+  baz bang {
+    baz: bang; } }
+SCSS
+  end
+  def test_multiline_selector_without_commas
+    assert_renders <<SASS, <<SCSS
+foo bar baz bang
+  baz: bang
+SASS
+foo bar
+baz bang {
+  baz: bang; }
+SCSS
+  end
+  def test_escaped_selector
+    assert_renders <<SASS, <<SCSS
+foo bar
+  \\:hover
+    baz: bang
+SASS
+foo bar {
+  :hover {
+    baz: bang; } }
+SCSS
+  end
+  def test_property_name_interpolation
+assert_renders <<SASS, <<SCSS
+foo bar
+  baz\#{!bang}bip\#{!bop}: 12
+SASS
+foo bar {
+  baz\#{!bang}bip\#{!bop}: 12; }
+SCSS
+  end
+  def test_property_name_interpolation
+assert_renders <<SASS, <<SCSS
+foo bar
+  baz\#{!bang}bip\#{!bop}: 12
+SASS
+foo bar {
+  baz\#{!bang}bip\#{!bop}: 12; }
+SCSS
+  end
+  def test_property_value_interpolation
+assert_renders <<SASS, <<SCSS
+foo bar
+  baz: 12 \#{!bang} bip \#{"bop"} blat
+SASS
+foo bar {
+  baz: 12 \#{!bang} bip \#{"bop"} blat; }
+SCSS
+  end
+  def test_dynamic_properties
+assert_renders <<SASS, <<SCSS
+foo bar
+  baz= 12 !bang "bip"
+SASS
+foo bar {
+  baz= 12 !bang "bip"; }
+SCSS
+  end
+  def test_dynamic_properties_with_old
+assert_renders <<SASS, <<SCSS, :old => true
+foo bar
+  :baz= 12 !bang "bip"
+SASS
+foo bar {
+  baz= 12 !bang "bip"; }
+SCSS
+  end
+  def test_multiline_properties
+assert_renders <<SASS, <<SCSS
+foo bar
+  baz: bip bam boon
+SASS
+foo bar {
+  baz:
+    bip
+  bam
+        boon; }
+SCSS
+  end
+  def test_multiline_dynamic_properties
+assert_renders <<SASS, <<SCSS
+foo bar
+  baz= !bip "bam" 12px
+SASS
+foo bar {
+  baz=
+    !bip
+  "bam"
+        12px; }
+SCSS
+  end
+  def test_silent_comments
+assert_renders <<SASS, <<SCSS
+// foo
+// bar
+// baz
+foo bar
+  a: b
+SASS
+// foo
+// bar
+// baz
+foo bar {
+  a: b; }
+SCSS
+assert_renders <<SASS, <<SCSS
+// foo
+   bar
+     baz
+   bang
+foo bar
+  a: b
+SASS
+// foo
+// bar
+//   baz
+// bang
+foo bar {
+  a: b; }
+SCSS
+  end
+  def test_loud_comments
+assert_renders <<SASS, <<SCSS
+/* foo
+/* bar
+/* baz
+foo bar
+  a: b
+SASS
+/* foo */
+/* bar */
+/* baz */
+foo bar {
+  a: b; }
+SCSS
+assert_renders <<SASS, <<SCSS
+/* foo
+   bar
+     baz
+   bang
+foo bar
+  a: b
+SASS
+/* foo
+   bar
+     baz
+   bang */
+foo bar {
+  a: b; }
+SCSS
+assert_renders <<SASS, <<SCSS
+/* foo
+   bar
+     baz
+   bang
+foo bar
+  a: b
+SASS
+/* foo
+ * bar
+ *   baz
+ * bang */
+foo bar {
+  a: b; }
+SCSS
+  end
+  def test_loud_comments_with_weird_indentation
+    assert_renders <<SASS, <<SCSS
+foo
+  /*      foo
+     bar
+         baz
+  a: b
+SASS
+foo {
+  /* foo
+bar
+    baz */
+  a: b; }
+SCSS
+  end
+  def test_debug
+    assert_renders <<SASS, <<SCSS
+foo
+  @debug 12px
+  bar: baz
+SASS
+foo {
+  @debug 12px;
+  bar: baz; }
+SCSS
+  end
+  def test_directive_without_children
+    assert_renders <<SASS, <<SCSS
+foo
+  @foo #bar "baz"
+  bar: baz
+SASS
+foo {
+  @foo #bar "baz";
+  bar: baz; }
+SCSS
+  end
+  def test_directive_with_prop_children
+    assert_renders <<SASS, <<SCSS
+foo
+  @foo #bar "baz"
+    a: b
+    c: d
+  bar: baz
+SASS
+foo {
+  @foo #bar "baz" {
+    a: b;
+    c: d; }
+  bar: baz; }
+SCSS
+  end
+  def test_directive_with_rule_children
+    assert_renders <<SASS, <<SCSS
+foo
+  @foo #bar "baz"
+    #blat
+      a: b
+    .bang
+      c: d
+      e: f
+  bar: baz
+SASS
+foo {
+  @foo #bar "baz" {
+    #blat {
+      a: b; }
+    .bang {
+      c: d;
+      e: f; } }
+  bar: baz; }
+SCSS
+  end
+  def test_directive_with_rule_and_prop_children
+    assert_renders <<SASS, <<SCSS
+foo
+  @foo #bar "baz"
+    g: h
+    #blat
+      a: b
+    .bang
+      c: d
+      e: f
+    i: j
+  bar: baz
+SASS
+foo {
+  @foo #bar "baz" {
+    g: h;
+    #blat {
+      a: b; }
+    .bang {
+      c: d;
+      e: f; }
+    i: j; }
+  bar: baz; }
+SCSS
+  end
+  def test_for
+    assert_renders <<SASS, <<SCSS
+foo
+  @for !a from !b to !c
+    a: b
+  @for !c from 1 to 16
+    d: e
+    f: g
+SASS
+foo {
+  @for !a from !b to !c {
+    a: b; }
+  @for !c from 1 to 16 {
+    d: e;
+    f: g; } }
+SCSS
+  end
+  def test_if
+    assert_renders <<SASS, <<SCSS
+foo
+  @if !foo or !bar
+    a: b
+  @if !baz
+    d: e
+  @else if !bang
+    f: g
+  @else
+    h: i
+SASS
+foo {
+  @if !foo or !bar {
+    a: b; }
+  @if !baz {
+    d: e; }
+  @else if !bang {
+    f: g; }
+  @else {
+    h: i; } }
+SCSS
+  end
+  def test_import
+    assert_renders <<SASS, <<SCSS
+@import foo
+foo
+  bar: baz
+SASS
+@import "foo";
+foo {
+  bar: baz; }
+SCSS
+    assert_renders <<SASS, <<SCSS
+@import foo.css
+foo
+  bar: baz
+SASS
+@import "foo.css";
+foo {
+  bar: baz; }
+SCSS
+  end
+  def test_import_as_directive_in_sass
+    assert_sass_to_sass '@import "foo.css"'
+    assert_sass_to_sass '@import url(foo.css)'
+  end
+  def test_import_as_directive_in_scss
+    assert_renders <<SASS, <<SCSS
+@import "foo.css" print
+SASS
+@import "foo.css" print;
+SCSS
+    assert_renders <<SASS, <<SCSS
+@import url(foo.css) screen, print
+SASS
+@import url(foo.css) screen, print;
+SCSS
+  end
+  def test_argless_mixin_definition
+    assert_renders <<SASS, <<SCSS
+=foo-bar
+  baz
+    a: b
+SASS
+@mixin foo-bar {
+  baz {
+    a: b; } }
+SCSS
+    assert_renders <<SASS, render(<<SCSS)
+=foo-bar
+  baz
+    a: b
+SASS
+@mixin foo-bar() {
+  baz {
+    a: b; } }
+SCSS
+  end
+  def test_mixin_definition_without_defaults
+    assert_renders <<SASS, <<SCSS
+=foo-bar(!baz, !bang)
+  baz
+    a = !baz !bang
+SASS
+@mixin foo-bar(!baz, !bang) {
+  baz {
+    a = !baz !bang; } }
+SCSS
+  end
+  def test_mixin_definition_with_defaults
+    assert_renders <<SASS, <<SCSS
+=foo-bar(!baz, !bang = 12px)
+  baz
+    a = !baz !bang
+SASS
+@mixin foo-bar(!baz, !bang = 12px) {
+  baz {
+    a = !baz !bang; } }
+SCSS
+  end
+  private
+  def assert_sass_to_sass(sass, options = {})
+    assert_equal(sass.rstrip, render(sass, options).rstrip,
+      "Expected Sass to transform to itself")
+  end
+  def assert_scss_to_sass(sass, scss, options = {})
+    assert_equal(sass.rstrip, render(scss, options.merge(:syntax => :scss)).rstrip,
+      "Expected SCSS to transform to Sass")
+  end
+  def assert_renders(sass, scss, options = {})
+    assert_sass_to_sass(sass, options)
+    assert_scss_to_sass(sass, scss, options)
+  end
+  def render(scss, options = {})
+    Sass::Engine.new(scss, options).to_tree.to_sass(options)
+  end
+end