sass 3.3.0 → 3.4.25

data/test/sass/engine_test.rb

@@ -17,6 +17,11 @@ module Sass::Script::Functions::UserFunctions
     return Sass::Script::Value::Null.new
   end
 
+  def set_a_global_variable(name, value)
+    environment.set_global_var(name.value, value)
+    return Sass::Script::Value::Null.new
+  end
+
   def get_a_variable(name)
     environment.var(name.value) || Sass::Script::Value::String.new("undefined")
   end
@@ -26,7 +31,7 @@ module Sass::Script::Functions
   include Sass::Script::Functions::UserFunctions
 end
 
-class SassEngineTest < Test::Unit::TestCase
+class SassEngineTest < MiniTest::Test
   FAKE_FILE_NAME = __FILE__.gsub(/rb$/,"sass")
   # A map of erroneous Sass documents to the error messages they should produce.
   # The error messages may be arrays;
@@ -68,12 +73,11 @@ MSG
     "$a: 1b >= 2c" => "Incompatible units: 'c' and 'b'.",
     "a\n  b: 1b * 2c" => "2b*c isn't a valid CSS value.",
     "a\n  b: 1b % 2c" => "Incompatible units: 'c' and 'b'.",
-    "$a: 2px + #ccc" => "Cannot add a number with units (2px) to a color (#cccccc).",
-    "$a: #ccc + 2px" => "Cannot add a number with units (2px) to a color (#cccccc).",
+    "$a: 2px + #ccc" => "Cannot add a number with units (2px) to a color (#ccc).",
+    "$a: #ccc + 2px" => "Cannot add a number with units (2px) to a color (#ccc).",
     "& a\n  :b c" => ["Base-level rules cannot contain the parent-selector-referencing character '&'.", 1],
     "a\n  :b\n    c" => "Illegal nesting: Only properties may be nested beneath properties.",
     "$a: b\n  :c d\n" => "Illegal nesting: Nothing may be nested beneath variable declarations.",
-    "$a: b\n  :c d\n" => "Illegal nesting: Nothing may be nested beneath variable declarations.",
     "@import templates/basic\n  foo" => "Illegal nesting: Nothing may be nested beneath import directives.",
     "foo\n  @import foo.css" => "CSS import directives may only be used at the root of a document.",
     "@if true\n  @import foo" => "Import directives may not be used within control directives or mixins.",
@@ -141,6 +145,8 @@ MSG
     '@while' => "Invalid while directive '@while': expected expression.",
     '@debug' => "Invalid debug directive '@debug': expected expression.",
     %Q{@debug "a message"\n  "nested message"} => "Illegal nesting: Nothing may be nested beneath debug directives.",
+    '@error' => "Invalid error directive '@error': expected expression.",
+    %Q{@error "a message"\n  "nested message"} => "Illegal nesting: Nothing may be nested beneath error directives.",
     '@warn' => "Invalid warn directive '@warn': expected expression.",
     %Q{@warn "a message"\n  "nested message"} => "Illegal nesting: Nothing may be nested beneath warn directives.",
     "/* foo\n    bar\n  baz" => "Inconsistent indentation: previous line was indented by 4 spaces, but this line was indented by 2 spaces.",
@@ -171,6 +177,8 @@ MSG
     "& foo\n  bar: baz\n  blat: bang" => ["Base-level rules cannot contain the parent-selector-referencing character '&'.", 1],
     "a\n  b: c\n& foo\n  bar: baz\n  blat: bang" => ["Base-level rules cannot contain the parent-selector-referencing character '&'.", 3],
     "@" => "Invalid directive: '@'.",
+    "$r: 20em * #ccc" => ["Cannot multiply a number with units (20em) to a color (#ccc).", 1],
+    "$r: #ccc / 1em" => ["Cannot divide a number with units (1em) to a color (#ccc).", 1],
   }
 
   def teardown
@@ -280,10 +288,10 @@ ERROR
   def test_exception_line
     to_render = <<SASS
 rule
-  :prop val
+  prop: val
   // comment!
 
-  :broken
+  broken:
 SASS
     begin
       Sass::Engine.new(to_render).render
@@ -297,10 +305,10 @@ SASS
   def test_exception_location
     to_render = <<SASS
 rule
-  :prop val
+  prop: val
   // comment!
 
-  :broken
+  broken:
 SASS
     begin
       Sass::Engine.new(to_render, :filename => FAKE_FILE_NAME, :line => (__LINE__-7)).render
@@ -526,9 +534,9 @@ ERR
     opts = {:full_exception => true, :line => 362}
     render(("a\n  b: c\n" * 10) + "d\n  e:\n" + ("f\n  g: h\n" * 10), opts)
   rescue Sass::SyntaxError => e
-    assert_equal(<<CSS, Sass::SyntaxError.exception_to_css(e, opts).split("\n")[0..15].join("\n"))
+    assert_equal(<<CSS, Sass::SyntaxError.exception_to_css(e, opts[:line]).split("\n")[0..15].join("\n"))
 /*
-Syntax error: Invalid property: "e:" (no value).
+Error: Invalid property: "e:" (no value).
         on line 383 of test_exception_css_with_offset_inline.sass
 
 378: a
@@ -548,8 +556,7 @@ CSS
   end
 
   def test_exception_css_with_mixins
-    opts = {:full_exception => true}
-    render(<<SASS, opts)
+    render(<<SASS, :full_exception => true)
 =error-mixin($a)
   color: $a * 1em * 1px
 
@@ -560,9 +567,9 @@ CSS
   +outer-mixin(12)
 SASS
   rescue Sass::SyntaxError => e
-    assert_equal(<<CSS, Sass::SyntaxError.exception_to_css(e, opts).split("\n")[0..13].join("\n"))
+    assert_equal(<<CSS, Sass::SyntaxError.exception_to_css(e).split("\n")[0..13].join("\n"))
 /*
-Syntax error: 12em*px isn't a valid CSS value.
+Error: 12em*px isn't a valid CSS value.
         on line 2 of test_exception_css_with_mixins_inline.sass, in `error-mixin'
         from line 5 of test_exception_css_with_mixins_inline.sass, in `outer-mixin'
         from line 8 of test_exception_css_with_mixins_inline.sass
@@ -580,8 +587,7 @@ CSS
   end
 
   def test_cssize_exception_css
-    opts = {:full_exception => true}
-    render(<<SASS, opts)
+    render(<<SASS, :full_exception => true)
 .filler
   stuff: "stuff!"
 
@@ -591,9 +597,9 @@ a: b
   a: b
 SASS
   rescue Sass::SyntaxError => e
-    assert_equal(<<CSS, Sass::SyntaxError.exception_to_css(e, opts).split("\n")[0..11].join("\n"))
+    assert_equal(<<CSS, Sass::SyntaxError.exception_to_css(e).split("\n")[0..11].join("\n"))
 /*
-Syntax error: Properties are only allowed within rules, directives, mixin includes, or other properties.
+Error: Properties are only allowed within rules, directives, mixin includes, or other properties.
         on line 4 of test_cssize_exception_css_inline.sass
 
 1: .filler
@@ -613,12 +619,12 @@ CSS
   end
 
   def test_http_import
-    assert_equal("@import url(http://fonts.googleapis.com/css?family=Droid+Sans);\n",
+    assert_equal("@import \"http://fonts.googleapis.com/css?family=Droid+Sans\";\n",
       render("@import \"http://fonts.googleapis.com/css?family=Droid+Sans\""))
   end
 
   def test_protocol_relative_import
-    assert_equal("@import url(//fonts.googleapis.com/css?family=Droid+Sans);\n",
+    assert_equal("@import \"//fonts.googleapis.com/css?family=Droid+Sans\";\n",
       render("@import \"//fonts.googleapis.com/css?family=Droid+Sans\""))
   end
 
@@ -648,18 +654,18 @@ SASS
 
   def test_sass_import
     sassc_file = sassc_path("importee")
-    assert !File.exists?(sassc_file)
+    assert !File.exist?(sassc_file)
     renders_correctly "import", { :style => :compact, :load_paths => [File.dirname(__FILE__) + "/templates"] }
-    assert File.exists?(sassc_file)
+    assert File.exist?(sassc_file)
   end
 
   def test_sass_pathname_import
     sassc_file = sassc_path("importee")
-    assert !File.exists?(sassc_file)
+    assert !File.exist?(sassc_file)
     renders_correctly("import",
       :style => :compact,
       :load_paths => [Pathname.new(File.dirname(__FILE__) + "/templates")])
-    assert File.exists?(sassc_file)
+    assert File.exist?(sassc_file)
   end
 
   def test_import_from_global_load_paths
@@ -675,7 +681,6 @@ SASS
   def test_nonexistent_import
     assert_raise_message(Sass::SyntaxError, <<ERR.rstrip) do
 File to import not found or unreadable: nonexistent.sass.
-Load path: #{Dir.pwd}
 ERR
       render("@import nonexistent.sass")
     end
@@ -684,30 +689,29 @@ ERR
   def test_nonexistent_extensionless_import
     assert_raise_message(Sass::SyntaxError, <<ERR.rstrip) do
 File to import not found or unreadable: nonexistent.
-Load path: #{Dir.pwd}
 ERR
       render("@import nonexistent")
     end
   end
 
   def test_no_cache
-    assert !File.exists?(sassc_path("importee"))
+    assert !File.exist?(sassc_path("importee"))
     renders_correctly("import", {
         :style => :compact, :cache => false,
         :load_paths => [File.dirname(__FILE__) + "/templates"],
       })
-    assert !File.exists?(sassc_path("importee"))
+    assert !File.exist?(sassc_path("importee"))
   end
 
   def test_import_in_rule
     assert_equal(<<CSS, render(<<SASS, :load_paths => [File.dirname(__FILE__) + '/templates/']))
 .foo #foo {
-  background-color: #bbaaff; }
+  background-color: #baf; }
 
 .bar {
   a: b; }
   .bar #foo {
-    background-color: #bbaaff; }
+    background-color: #baf; }
 CSS
 .foo
   @import partial
@@ -745,22 +749,22 @@ SASS
 
   def test_basic_multiline_selector
     assert_equal("#foo #bar,\n#baz #boom {\n  foo: bar; }\n",
-                 render("#foo #bar,\n#baz #boom\n  :foo bar"))
+                 render("#foo #bar,\n#baz #boom\n  foo: bar"))
     assert_equal("#foo #bar,\n#foo #baz {\n  foo: bar; }\n",
-                 render("#foo\n  #bar,\n  #baz\n    :foo bar"))
+                 render("#foo\n  #bar,\n  #baz\n    foo: bar"))
     assert_equal("#foo,\n#bar {\n  foo: bar; }\n  #foo #baz,\n  #bar #baz {\n    foo: bar; }\n",
-                 render("#foo,\n#bar\n  :foo bar\n  #baz\n    :foo bar"))
+                 render("#foo,\n#bar\n  foo: bar\n  #baz\n    foo: bar"))
     assert_equal("#foo #bar, #baz #boom { foo: bar; }\n",
-                 render("#foo #bar,\n#baz #boom\n  :foo bar", :style => :compact))
+                 render("#foo #bar,\n#baz #boom\n  foo: bar", :style => :compact))
                  
     assert_equal("#foo #bar,#baz #boom{foo:bar}\n",
-                 render("#foo #bar,\n#baz #boom\n  :foo bar", :style => :compressed))
+                 render("#foo #bar,\n#baz #boom\n  foo: bar", :style => :compressed))
 
     assert_equal("#foo #bar,\n#baz #boom {\n  foo: bar; }\n",
-                 render("#foo #bar,,\n,#baz #boom,\n  :foo bar"))
+                 render("#foo #bar,,\n,#baz #boom,\n  foo: bar"))
 
     assert_equal("#bip #bop {\n  foo: bar; }\n",
-                 render("#bip #bop,, ,\n  :foo bar"))
+                 render("#bip #bop,, ,\n  foo: bar"))
   end
 
   def test_complex_multiline_selector
@@ -779,7 +783,7 @@ SASS
     end
 
     begin
-      render("a\n  :b c", :property_syntax => :new)
+      silence_warnings {render("a\n  :b c", :property_syntax => :new)}
       assert_equal(2, e.sass_line)
     rescue Sass::SyntaxError => e
       assert_equal("Illegal property syntax: can't use old syntax when :property_syntax => :new is set.",
@@ -802,53 +806,53 @@ SASS
   def test_directive
     assert_equal("@a b;\n", render("@a b"))
 
-    assert_equal("@a {\n  b: c; }\n", render("@a\n  :b c"))
-    assert_equal("@a { b: c; }\n", render("@a\n  :b c", :style => :compact))
-    assert_equal("@a {\n  b: c;\n}\n", render("@a\n  :b c", :style => :expanded))
-    assert_equal("@a{b:c}\n", render("@a\n  :b c", :style => :compressed))
+    assert_equal("@a {\n  b: c; }\n", render("@a\n  b: c"))
+    assert_equal("@a { b: c; }\n", render("@a\n  b: c", :style => :compact))
+    assert_equal("@a {\n  b: c;\n}\n", render("@a\n  b: c", :style => :expanded))
+    assert_equal("@a{b:c}\n", render("@a\n  b: c", :style => :compressed))
 
     assert_equal("@a {\n  b: c;\n  d: e; }\n",
-                 render("@a\n  :b c\n  :d e"))
+                 render("@a\n  b: c\n  d: e"))
     assert_equal("@a { b: c; d: e; }\n",
-                 render("@a\n  :b c\n  :d e", :style => :compact))
+                 render("@a\n  b: c\n  d: e", :style => :compact))
     assert_equal("@a {\n  b: c;\n  d: e;\n}\n",
-                 render("@a\n  :b c\n  :d e", :style => :expanded))
+                 render("@a\n  b: c\n  d: e", :style => :expanded))
     assert_equal("@a{b:c;d:e}\n",
-                 render("@a\n  :b c\n  :d e", :style => :compressed))
+                 render("@a\n  b: c\n  d: e", :style => :compressed))
 
     assert_equal("@a {\n  #b {\n    c: d; } }\n",
-                 render("@a\n  #b\n    :c d"))
+                 render("@a\n  #b\n    c: d"))
     assert_equal("@a { #b { c: d; } }\n",
-                 render("@a\n  #b\n    :c d", :style => :compact))
+                 render("@a\n  #b\n    c: d", :style => :compact))
     assert_equal("@a {\n  #b {\n    c: d;\n  }\n}\n",
-                 render("@a\n  #b\n    :c d", :style => :expanded))
+                 render("@a\n  #b\n    c: d", :style => :expanded))
     assert_equal("@a{#b{c:d}}\n",
-                 render("@a\n  #b\n    :c d", :style => :compressed))
+                 render("@a\n  #b\n    c: d", :style => :compressed))
 
     assert_equal("@a {\n  #b {\n    a: b; }\n    #b #c {\n      d: e; } }\n",
-                 render("@a\n  #b\n    :a b\n    #c\n      :d e"))
+                 render("@a\n  #b\n    a: b\n    #c\n      d: e"))
     assert_equal("@a { #b { a: b; }\n  #b #c { d: e; } }\n",
-                 render("@a\n  #b\n    :a b\n    #c\n      :d e", :style => :compact))
+                 render("@a\n  #b\n    a: b\n    #c\n      d: e", :style => :compact))
     assert_equal("@a {\n  #b {\n    a: b;\n  }\n  #b #c {\n    d: e;\n  }\n}\n",
-                 render("@a\n  #b\n    :a b\n    #c\n      :d e", :style => :expanded))
+                 render("@a\n  #b\n    a: b\n    #c\n      d: e", :style => :expanded))
     assert_equal("@a{#b{a:b}#b #c{d:e}}\n",
-                 render("@a\n  #b\n    :a b\n    #c\n      :d e", :style => :compressed))
+                 render("@a\n  #b\n    a: b\n    #c\n      d: e", :style => :compressed))
                  
     assert_equal("@a {\n  #foo,\n  #bar {\n    b: c; } }\n",
-                 render("@a\n  #foo, \n  #bar\n    :b c"))
+                 render("@a\n  #foo, \n  #bar\n    b: c"))
     assert_equal("@a { #foo, #bar { b: c; } }\n",
-                 render("@a\n  #foo, \n  #bar\n    :b c", :style => :compact))
+                 render("@a\n  #foo, \n  #bar\n    b: c", :style => :compact))
     assert_equal("@a {\n  #foo,\n  #bar {\n    b: c;\n  }\n}\n",
-                 render("@a\n  #foo, \n  #bar\n    :b c", :style => :expanded))
+                 render("@a\n  #foo, \n  #bar\n    b: c", :style => :expanded))
     assert_equal("@a{#foo,#bar{b:c}}\n",
-                 render("@a\n  #foo, \n  #bar\n    :b c", :style => :compressed))
+                 render("@a\n  #foo, \n  #bar\n    b: c", :style => :compressed))
 
     to_render = <<END
 @a
-  :b c
+  b: c
   #d
-    :e f
-  :g h
+    e: f
+  g: h
 END
     rendered = <<END
 @a { b: c;
@@ -1026,7 +1030,6 @@ SASS
 @-webkit-keyframes warm {
   from {
     color: black; }
-
   to {
     color: red; } }
 CSS
@@ -1130,9 +1133,15 @@ SASS
   end
 
   def test_default_values_for_mixin_arguments
-    assert_equal("white {\n  color: white; }\n\nblack {\n  color: black; }\n", render(<<SASS))
+    assert_equal(<<CSS, render(<<SASS))
+white {
+  color: #FFF; }
+
+black {
+  color: #000; }
+CSS
 =foo($a: #FFF)
-  :color $a
+  color: $a
 white
   +foo
 black
@@ -1140,25 +1149,25 @@ black
 SASS
     assert_equal(<<CSS, render(<<SASS))
 one {
-  color: white;
+  color: #fff;
   padding: 1px;
   margin: 4px; }
 
 two {
-  color: white;
+  color: #fff;
   padding: 2px;
   margin: 5px; }
 
 three {
-  color: white;
+  color: #fff;
   padding: 2px;
   margin: 3px; }
 CSS
 $a: 5px
 =foo($a, $b: 1px, $c: 3px + $b)
-  :color $a
-  :padding $b
-  :margin $c
+  color: $a
+  padding: $b
+  margin: $c
 one
   +foo(#fff)
 two
@@ -1168,17 +1177,17 @@ three
 SASS
     assert_equal(<<CSS, render(<<SASS))
 one {
-  color: white;
+  color: #fff;
   padding: 1px;
   margin: 4px; }
 
 two {
-  color: white;
+  color: #fff;
   padding: 2px;
   margin: 5px; }
 
 three {
-  color: white;
+  color: #fff;
   padding: 2px;
   margin: 3px; }
 CSS
@@ -1383,7 +1392,7 @@ CSS
 $variable: 0
 bar
   $local: 10
-  -no-op: set-a-variable(variable, 5)
+  -no-op: set-a-global-variable(variable, 5)
   a: $variable
 SASS
   end
@@ -1617,31 +1626,6 @@ a
 SASS
   end
 
-  def test_variable_scope
-    silence_warnings {assert_equal(<<CSS, render(<<SASS))}
-a {
-  b-1: c;
-  b-2: c;
-  d: 12; }
-
-b {
-  d: 17; }
-CSS
-$i: 12
-a
-  @for $i from 1 through 2
-    b-\#{$i}: c
-  d: $i
-
-=foo
-  $i: 17
-
-b
-  +foo
-  d: $i
-SASS
-  end
-
   def test_hyphen_underscore_insensitive_variables
     assert_equal(<<CSS, render(<<SASS))
 d {
@@ -1684,7 +1668,7 @@ SASS
   end
 
   def test_argument_error
-    assert_raise(Sass::SyntaxError) { render("a\n  b: hsl(1)") }
+    assert_raises(Sass::SyntaxError) { render("a\n  b: hsl(1)") }
   end
 
   def test_comments_at_the_top_of_a_document
@@ -2029,10 +2013,10 @@ $var: "bar"
 SASS
   end
 
-  def test_interpolation_doesnt_deep_unquote_strings
+  def test_interpolation_deep_unquotes_strings
     assert_equal(<<CSS, render(<<SASS))
 .foo {
-  a: "bar" "baz"; }
+  a: bar baz; }
 CSS
 .foo
   a: \#{"bar" "baz"}
@@ -2074,20 +2058,21 @@ SASS
   end
 
   def test_warn_with_imports
+    prefix = Sass::Util.cleanpath(File.dirname(__FILE__)).to_s
     expected_warning = <<WARN
 WARNING: In the main file
-         on line 1 of #{File.dirname(__FILE__)}/templates/warn.sass
+         on line 1 of #{prefix}/templates/warn.sass
 
 WARNING: Imported
-         on line 1 of #{File.dirname(__FILE__)}/templates/warn_imported.sass
-         from line 2 of #{File.dirname(__FILE__)}/templates/warn.sass
+         on line 1 of #{prefix}/templates/warn_imported.sass
+         from line 2 of #{prefix}/templates/warn.sass
 
 WARNING: In an imported mixin
-         on line 4 of #{File.dirname(__FILE__)}/templates/warn_imported.sass, in `emits-a-warning'
-         from line 3 of #{File.dirname(__FILE__)}/templates/warn.sass
+         on line 4 of #{prefix}/templates/warn_imported.sass, in `emits-a-warning'
+         from line 3 of #{prefix}/templates/warn.sass
 WARN
     assert_warning expected_warning do
-      renders_correctly "warn", :style => :compact, :load_paths => [File.dirname(__FILE__) + "/templates"]
+      renders_correctly "warn", :style => :compact, :load_paths => ["#{prefix}/templates"]
     end
   end
 
@@ -2472,6 +2457,18 @@ SASS
 
   # Regression tests
 
+  def test_interpolation_in_multiline_selector
+    assert_equal(<<CSS, render(<<SASS))
+.foo,
+.bar {
+  a: b; }
+CSS
+.foo,
+\#{".bar"}
+  a: b
+SASS
+  end
+
   def test_list_separator_with_arg_list
     assert_equal(<<CSS, render(<<SASS))
 .test {
@@ -2601,29 +2598,29 @@ SASS
   border-style: solid; }
 RESULT
 .box
-  :border
-    //:color black
-    :style solid
+  border:
+    //color: black
+    style: solid
 SOURCE
 
     assert_equal(<<RESULT, render(<<SOURCE))
 .box {
-  /* :color black */
+  /* color: black */
   border-style: solid; }
 RESULT
 .box
-  :border
-    /* :color black
-    :style solid
+  border:
+    /* color: black
+    style: solid
 SOURCE
 
     assert_equal(<<RESULT, render(<<SOURCE, :style => :compressed))
 .box{border-style:solid}
 RESULT
 .box
-  :border
-    /*:color black
-    :style solid
+  border:
+    /*color: black
+    style: solid
 SOURCE
   end
 
@@ -2898,145 +2895,6 @@ CSS
 SASS
   end
 
-  # Encodings
-
-  unless Sass::Util.ruby1_8?
-    def test_encoding_error
-      render("foo\nbar\nb\xFEaz".force_encoding("utf-8"))
-      assert(false, "Expected exception")
-    rescue Sass::SyntaxError => e
-      assert_equal(3, e.sass_line)
-      assert_equal('Invalid UTF-8 character "\xFE"', e.message)
-    end
-
-    def test_ascii_incompatible_encoding_error
-      template = "foo\nbar\nb_z".encode("utf-16le")
-      template[9] = "\xFE".force_encoding("utf-16le")
-      render(template)
-      assert(false, "Expected exception")
-    rescue Sass::SyntaxError => e
-      assert_equal(3, e.sass_line)
-      assert_equal('Invalid UTF-16LE character "\xFE"', e.message)
-    end
-
-    def test_same_charset_as_encoding
-      assert_renders_encoded(<<CSS, <<SASS)
-@charset "UTF-8";
-fóó {
-  a: b; }
-CSS
-@charset "utf-8"
-fóó
-  a: b
-SASS
-    end
-
-    def test_different_charset_than_encoding
-      assert_renders_encoded(<<CSS.force_encoding("IBM866"), <<SASS)
-@charset "IBM866";
-fóó {
-  a: b; }
-CSS
-@charset "ibm866"
-fóó
-  a: b
-SASS
-    end
-
-    def test_different_encoding_than_system
-      assert_renders_encoded(<<CSS.encode("IBM866"), <<SASS.encode("IBM866"))
-@charset "IBM866";
-тАЬ {
-  a: b; }
-CSS
-тАЬ
-  a: b
-SASS
-    end
-
-    def test_multibyte_charset
-      assert_renders_encoded(<<CSS.encode("UTF-16LE"), <<SASS.encode("UTF-16LE").force_encoding("UTF-8"))
-@charset "UTF-16LE";
-fóó {
-  a: b; }
-CSS
-@charset "utf-16le"
-fóó
-  a: b
-SASS
-    end
-
-    def test_multibyte_charset_without_endian_specifier
-      assert_renders_encoded(<<CSS.encode("UTF-32BE"), <<SASS.encode("UTF-32BE").force_encoding("UTF-8"))
-@charset "UTF-32BE";
-fóó {
-  a: b; }
-CSS
-@charset "utf-32"
-fóó
-  a: b
-SASS
-    end
-
-    def test_utf8_bom
-      assert_renders_encoded(<<CSS, <<SASS.force_encoding("BINARY"))
-@charset "UTF-8";
-fóó {
-  a: b; }
-CSS
-\uFEFFfóó
-  a: b
-SASS
-    end
-
-    def test_utf16le_bom
-      assert_renders_encoded(<<CSS.encode("UTF-16LE"), <<SASS.encode("UTF-16LE").force_encoding("BINARY"))
-@charset "UTF-16LE";
-fóó {
-  a: b; }
-CSS
-\uFEFFfóó
-  a: b
-SASS
-    end
-
-    def test_utf32be_bom
-      assert_renders_encoded(<<CSS.encode("UTF-32BE"), <<SASS.encode("UTF-32BE").force_encoding("BINARY"))
-@charset "UTF-32BE";
-fóó {
-  a: b; }
-CSS
-\uFEFFfóó
-  a: b
-SASS
-    end
-
-    # Encoding Regression Test
-
-    def test_multibyte_prop_name
-      assert_equal(<<CSS, render(<<SASS))
-@charset "UTF-8";
-#bar {
-  cölor: blue; }
-CSS
-#bar
-  cölor: blue
-SASS
-    end
-
-    def test_multibyte_and_interpolation
-      assert_equal(<<CSS, render(<<SCSS, :syntax => :scss))
-#bar {
-  background: a 0%; }
-CSS
-#bar {
-  // 
-  background: \#{a} 0%;
-}
-SCSS
-    end
-  end
-
   def test_original_filename_set
     importer = MockImporter.new
     importer.add_import("imported", "div{color:red}")
@@ -3057,7 +2915,7 @@ SCSS
       assert_equal <<CSS, render(<<SASS)
 div {
   maximum: 1.00000001;
-  too-much: 1.0; }
+  too-much: 1; }
 CSS
 div
   maximum : 1.00000001
@@ -3287,6 +3145,13 @@ test_debug_inspects_sass_objects_inline.scss:1 DEBUG: (a: 1, b: 2)
 END
   end
 
+  def test_error_throws_sass_objects
+    assert_raise_message(Sass::SyntaxError, "(a: 1, b: 2)") {render("@error (a: 1, b: 2)")}
+    assert_raise_message(Sass::SyntaxError, "(a: 1, b: 2)") do
+      render("$map: (a: 1, b: 2); @error $map", :syntax => :scss)
+    end
+  end
+
   def test_default_arg_before_splat
     assert_equal <<CSS, render(<<SASS, :syntax => :scss)
 .foo-positional {
@@ -3315,10 +3180,227 @@ CSS
 SASS
   end
 
+  def test_keyframes
+    assert_equal <<CSS, render(<<SASS)
+@keyframes identifier {
+  0% {
+    top: 0;
+    left: 0; }
+  30% {
+    top: 50px; }
+  68%, 72% {
+    left: 50px; }
+  100% {
+    top: 100px;
+    left: 100%; } }
+CSS
+@keyframes identifier
+  0%
+    top: 0
+    left: 0
+  \#{"30%"}
+    top: 50px
+  68%, 72%
+    left: 50px
+  100%
+    top: 100px
+    left: 100%
+SASS
+  end
+
+  def test_prefixed_keyframes
+    assert_equal <<CSS, render(<<SASS)
+@-moz-keyframes identifier {
+  0% {
+    top: 0;
+    left: 0; }
+  30% {
+    top: 50px; }
+  68%, 72% {
+    left: 50px; }
+  100% {
+    top: 100px;
+    left: 100%; } }
+CSS
+@-moz-keyframes identifier
+  0%
+    top: 0
+    left: 0
+  \#{"30%"}
+    top: 50px
+  68%, 72%
+    left: 50px
+  100%
+    top: 100px
+    left: 100%
+SASS
+  end
+
+  def test_uppercase_keyframes
+    assert_equal <<CSS, render(<<SASS)
+@KEYFRAMES identifier {
+  0% {
+    top: 0;
+    left: 0; }
+  30% {
+    top: 50px; }
+  68%, 72% {
+    left: 50px; }
+  100% {
+    top: 100px;
+    left: 100%; } }
+CSS
+@KEYFRAMES identifier
+  0%
+    top: 0
+    left: 0
+  \#{"30%"}
+    top: 50px
+  68%, 72%
+    left: 50px
+  100%
+    top: 100px
+    left: 100%
+SASS
+  end
+
+  def test_compressed_unknown_directive
+    assert_equal(<<CSS, render(<<SASS, :style => :compressed))
+x{@foo;a:b;@bar}
+CSS
+x
+  @foo
+  a: b
+  @bar
+SASS
+  end
+
+  def test_compressed_unknown_directive_in_directive
+    assert_equal(<<CSS, render(<<SASS, :style => :compressed))
+@x{@foo;a:b;@bar}
+CSS
+@x
+  @foo
+  a: b
+  @bar
+SASS
+  end
+
+  def test_compressed_unknown_directive_with_children_in_directive
+    assert_equal(<<CSS, render(<<SASS, :style => :compressed))
+@x{@foo{a:b}c:d;@bar{e:f}}
+CSS
+@x
+  @foo
+    a: b
+  c: d
+  @bar
+    e: f
+SASS
+  end
+
+  def test_compressed_rule_in_directive
+    assert_equal(<<CSS, render(<<SASS, :style => :compressed))
+@x{foo{a:b}c:d;bar{e:f}}
+CSS
+@x
+  foo
+    a: b
+  c: d
+  bar
+    e: f
+SASS
+  end
+
+  def test_import_two_css_files_issue_1806
+    assert_equal(<<CSS, render(<<SASS, :syntax => :scss, :style => :compressed))
+@import url(\"foo.css\");@import url(\"bar.css\");@import url(\"baz.css\")
+CSS
+@import url("foo.css");
+@import url("bar.css");
+@import url("baz.css");
+SASS
+  end
+
+  def test_numeric_formatting_of_integers
+    assert_equal(<<CSS, render(<<SASS, :syntax => :scss, :style => :compressed))
+a{near:3.00001;plus:3;minus:3;negative:-3}
+CSS
+a {
+  near: (3 + 0.00001);
+  plus: (3 + 0.0000001);
+  minus: (3 - 0.0000001);
+  negative: (-3 + 0.0000001);
+}
+SASS
+  end
+
+  def test_escaped_semicolons_are_not_compressed
+    assert_equal(<<'CSS', render(<<'SASS', :syntax => :scss, :style => :compressed))
+div{color:#f00000\9\0\;}
+CSS
+div {
+ color: #f00000\9\0\;
+}
+SASS
+  end
+
+  def test_compressed_output_of_nth_selectors
+    assert_equal(<<CSS, render(<<SASS, :syntax => :scss, :style => :compressed))
+:nth-of-type(2n-1),:nth-child(2n-1),:nth(2n-1),:nth-of-type(2n-1),:nth-of-type(2n-1){color:red}:nth-of-type(2n+1),:nth-child(2n+1),:nth(2n+1),:nth-of-type(2n+1),:nth-of-type(2n+1){color:red}
+CSS
+:nth-of-type(2n-1), :nth-child(2n-  1), :nth(2n  -1), :nth-of-type(2n  -  1), :nth-of-type( 2n  -  1 ) {
+  color: red }
+:nth-of-type(2n+1), :nth-child(2n+  1), :nth(2n  +1), :nth-of-type(2n  +  1), :nth-of-type( 2n  +  1 ) {
+  color: red }
+SASS
+  end
+
+  def test_descendant_selectors_with_leading_dash
+    assert_equal(<<CSS, render(<<SASS, :syntax => :scss, :style => :compressed))
+a -b{color:red}
+CSS
+a -b {
+  color: red }
+SASS
+  end
+
+  def test_import_with_supports_clause_interp
+    assert_equal(<<CSS, render(<<'SASS', :style => :compressed))
+@import url("fallback-layout.css") supports(not (display: flex))
+CSS
+$display-type: flex
+@import url("fallback-layout.css") supports(not (display: #{$display-type}))
+SASS
+  end
+
+  def test_import_with_supports_clause
+    assert_equal(<<CSS, render(<<SASS, :style => :compressed))
+@import url("fallback-layout.css") supports(not (display: flex))
+CSS
+@import url("fallback-layout.css") supports(not (display: flex))
+SASS
+  end
+
+  def test_compressed_commas_in_attribute_selectors
+    assert_equal(<<CSS, render(<<SASS, :style => :compressed))
+.classname[a="1, 2, 3"],.another[b="4, 5, 6"]{color:red}
+CSS
+.classname[a="1, 2, 3"], .another[b="4, 5, 6"]
+  color: red
+SASS
+  end
+
   private
 
   def assert_hash_has(hash, expected)
-    expected.each {|k, v| assert_equal(v, hash[k])}
+    expected.each do |k, v|
+      if v.nil?
+        assert_nil(hash[k])
+      else
+        assert_equal(v, hash[k])
+      end
+    end
   end
 
   def assert_renders_encoded(css, sass)
@@ -3350,7 +3432,8 @@ SASS
   end
 
   def filename(name, type)
-    File.dirname(__FILE__) + "/#{type == 'sass' ? 'templates' : 'results'}/#{name}.#{type}"
+    path = File.dirname(__FILE__) + "/#{type == 'sass' ? 'templates' : 'results'}/#{name}.#{type}"
+    Sass::Util.cleanpath(path).to_s
   end
 
   def sassc_path(template)