sass 3.2.19 → 3.3.0.alpha.1

data/test/sass/extend_test.rb

@@ -489,7 +489,7 @@ CSS
 SCSS
   end
 
-  def test_another_nested_extender_with_early_child_selectors_doesnt_subseq_them
+  def test_nested_extender_with_early_child_selectors_doesnt_subseq_them
     assert_equal <<CSS, render(<<SCSS)
 .foo .bar, .foo .bip > .baz {
   a: b; }
@@ -1154,182 +1154,37 @@ b.foo {@extend .bar}
 SCSS
   end
 
-  def test_optional_extend_does_not_warn_when_extendee_doesnt_exist
-    assert_no_warning {assert_equal("", render(<<SCSS))}
-.foo {@extend .bar !optional}
-SCSS
-  end
-
-  def test_optional_extend_does_not_warn_when_extension_fails
+  def test_extend_does_not_warn_when_one_extension_fails_but_others_dont
     assert_no_warning {assert_equal(<<CSS, render(<<SCSS))}
 a.bar {
   a: b; }
-CSS
-a.bar {a: b}
-b.foo {@extend .bar !optional}
-SCSS
-  end
-
-  # Regression Tests
-
-  def test_pseudo_element_superselector
-    # Pseudo-elements shouldn't be removed in superselector calculations.
-    assert_equal <<CSS, render(<<SCSS)
-a#bar, a#bar::fblthp {
-  a: b; }
-CSS
-%x#bar {a: b} // Add an id to make the results have high specificity
-%y, %y::fblthp {@extend %x}
-a {@extend %y}
-SCSS
-
-    # Pseudo-classes can be removed when the second law allows.
-    assert_equal <<CSS, render(<<SCSS)
-a#bar {
-  a: b; }
-CSS
-%x#bar {a: b}
-%y, %y:fblthp {@extend %x}
-a {@extend %y}
-SCSS
 
-    # A few pseudo-elements can be written as pseudo-elements for historical
-    # reasons. See http://www.w3.org/TR/selectors4/#pseudo-elements.
-    %w[first-line first-letter before after].each do |pseudo|
-      assert_equal <<CSS, render(<<SCSS)
-a#bar, a#bar:#{pseudo} {
-  a: b; }
-CSS
-%x#bar {a: b}
-%y, %y:#{pseudo} {@extend %x}
-a {@extend %y}
-SCSS
-    end
-  end
-
-  def test_multiple_source_redundancy_elimination
-    assert_equal <<CSS, render(<<SCSS)
-.test-case, .test-case:active {
-  color: red; }
-
-.test-case:hover {
-  color: green; }
-CSS
-%default-color {color: red}
-%alt-color {color: green}
-
-%default-style {
-  @extend %default-color;
-  &:hover {@extend %alt-color}
-  &:active {@extend %default-color}
-}
-
-.test-case {@extend %default-style}
-SCSS
-  end
-
-  def test_nested_sibling_extend
-    assert_equal <<CSS, render(<<SCSS)
-.parent .bar, .parent .foo {
-  width: 2000px; }
-CSS
-.foo {@extend .bar}
-
-.parent {
-  .bar {
-    width: 2000px;
-  }
-  .foo {
-    @extend .bar
-  }
-}
-SCSS
-  end
-
-  def test_parent_and_sibling_extend
-    assert_equal <<CSS, render(<<SCSS)
-.parent1 .parent2 .child1.child2, .parent2 .parent1 .child1.child2 {
+.bar, b.foo {
   c: d; }
 CSS
-%foo %bar%baz {c: d}
-
-.parent1 {
-  @extend %foo;
-  .child1 {@extend %bar}
-}
-
-.parent2 {
-  @extend %foo;
-  .child2 {@extend %baz}
-}
+a.bar {a: b}
+.bar {c: d}
+b.foo {@extend .bar}
 SCSS
   end
 
-  def test_nested_extend_specificity
-    assert_equal <<CSS, render(<<SCSS)
-a :b, a :b:c {
-  a: b; }
-CSS
-%foo {a: b}
-
-a {
-  :b {@extend %foo}
-  :b:c {@extend %foo}
-}
+  def test_optional_extend_does_not_warn_when_extendee_doesnt_exist
+    assert_no_warning {assert_equal("", render(<<SCSS))}
+.foo {@extend .bar !optional}
 SCSS
   end
 
-  def test_nested_double_extend_optimization
-    assert_equal <<CSS, render(<<SCSS)
-.parent1 .child {
+  def test_optional_extend_does_not_warn_when_extension_fails
+    assert_no_warning {assert_equal(<<CSS, render(<<SCSS))}
+a.bar {
   a: b; }
 CSS
-%foo %bar {
-  a: b;
-}
-
-.parent1 {
-  @extend %foo;
-
-  .child {
-    @extend %bar;
-  }
-}
-
-.parent2 {
-  @extend %foo;
-}
-SCSS
-  end
-
-  def test_extend_in_double_nested_media_query
-    assert_equal <<CSS, render(<<SCSS)
-@media all and (orientation: landscape) {
-  .bar {
-    color: blue; } }
-CSS
-@media all {
-  @media (orientation: landscape) {
-    %foo {color: blue}
-    .bar {@extend %foo}
-  }
-}
+a.bar {a: b}
+b.foo {@extend .bar !optional}
 SCSS
   end
 
-  def test_partially_failed_extend
-    assert_no_warning {assert_equal(<<CSS, render(<<SCSS))}
-.rc, test {
-  color: white; }
-
-.prices span.pill span.rc {
-  color: red; }
-CSS
-test { @extend .rc; }
-.rc {color: white;}
-.prices span.pill span.rc {color: red;}
-SCSS
-  end
+  # Regression Tests
 
   def test_newline_near_combinator
     assert_equal <<CSS, render(<<SCSS)
@@ -1418,22 +1273,22 @@ SCSS
 
   def test_extend_cross_branch_redundancy_elimination
     assert_equal <<CSS, render(<<SCSS)
-.a .c .d, .b .c .a .d {
+a c d, b c a d {
   a: b; }
 CSS
-%x .c %y {a: b}
-.a, .b {@extend %x}
-.a .d {@extend %y}
+%x c %y {a: b}
+a, b {@extend %x}
+a d {@extend %y}
 SCSS
 
     assert_equal <<CSS, render(<<SCSS)
-.e .a .c .d, .a .c .e .d, .e .b .c .a .d, .b .c .a .e .d {
+e a c d, a c e d, e b c a d, b c a e d {
   a: b; }
 CSS
-.e %z {a: b}
-%x .c %y {@extend %z}
-.a, .b {@extend %x}
-.a .d {@extend %y}
+e %z {a: b}
+%x c %y {@extend %z}
+a, b {@extend %x}
+a d {@extend %y}
 SCSS
   end
 

data/test/sass/functions_test.rb

@@ -84,9 +84,9 @@ class SassFunctionTest < Test::Unit::TestCase
   end
 
   def test_hsl_checks_types
-    assert_error_message("$hue: \"foo\" is not a number for `hsl'", "hsl(\"foo\", 10, 12)");
-    assert_error_message("$saturation: \"foo\" is not a number for `hsl'", "hsl(10, \"foo\", 12)");
-    assert_error_message("$lightness: \"foo\" is not a number for `hsl'", "hsl(10, 10, \"foo\")");
+    assert_error_message("\"foo\" is not a number for `hsl'", "hsl(\"foo\", 10, 12)");
+    assert_error_message("\"foo\" is not a number for `hsl'", "hsl(10, \"foo\", 12)");
+    assert_error_message("\"foo\" is not a number for `hsl'", "hsl(10, 10, \"foo\")");
   end
 
   def test_hsla
@@ -104,10 +104,10 @@ class SassFunctionTest < Test::Unit::TestCase
   end
 
   def test_hsla_checks_types
-    assert_error_message("$hue: \"foo\" is not a number for `hsla'", "hsla(\"foo\", 10, 12, 0.3)");
-    assert_error_message("$saturation: \"foo\" is not a number for `hsla'", "hsla(10, \"foo\", 12, 0)");
-    assert_error_message("$lightness: \"foo\" is not a number for `hsla'", "hsla(10, 10, \"foo\", 1)");
-    assert_error_message("$alpha: \"foo\" is not a number for `hsla'", "hsla(10, 10, 10, \"foo\")");
+    assert_error_message("\"foo\" is not a number for `hsla'", "hsla(\"foo\", 10, 12, 0.3)");
+    assert_error_message("\"foo\" is not a number for `hsla'", "hsla(10, \"foo\", 12, 0)");
+    assert_error_message("\"foo\" is not a number for `hsla'", "hsla(10, 10, \"foo\", 1)");
+    assert_error_message("\"foo\" is not a number for `hsla'", "hsla(10, 10, 10, \"foo\")");
   end
 
   def test_percentage
@@ -118,9 +118,9 @@ class SassFunctionTest < Test::Unit::TestCase
   end
 
   def test_percentage_checks_types
-    assert_error_message("$value: 25px is not a unitless number for `percentage'", "percentage(25px)")
-    assert_error_message("$value: #cccccc is not a unitless number for `percentage'", "percentage(#ccc)")
-    assert_error_message("$value: \"string\" is not a unitless number for `percentage'", %Q{percentage("string")})
+    assert_error_message("25px is not a unitless number for `percentage'", "percentage(25px)")
+    assert_error_message("#cccccc is not a unitless number for `percentage'", "percentage(#ccc)")
+    assert_error_message("\"string\" is not a unitless number for `percentage'", %Q{percentage("string")})
   end
 
   def test_round
@@ -129,7 +129,7 @@ class SassFunctionTest < Test::Unit::TestCase
     assert_equal("5px", evaluate("round(5.49px)"))
     assert_equal("5px", evaluate("round($value: 5.49px)"))
 
-    assert_error_message("$value: #cccccc is not a number for `round'", "round(#ccc)")
+    assert_error_message("#cccccc is not a number for `round'", "round(#ccc)")
   end
 
   def test_floor
@@ -137,7 +137,7 @@ class SassFunctionTest < Test::Unit::TestCase
     assert_equal("4px", evaluate("floor(4.8px)"))
     assert_equal("4px", evaluate("floor($value: 4.8px)"))
 
-    assert_error_message("$value: \"foo\" is not a number for `floor'", "floor(\"foo\")")
+    assert_error_message("\"foo\" is not a number for `floor'", "floor(\"foo\")")
   end
 
   def test_ceil
@@ -145,7 +145,7 @@ class SassFunctionTest < Test::Unit::TestCase
     assert_equal("5px", evaluate("ceil(4.8px)"))
     assert_equal("5px", evaluate("ceil($value: 4.8px)"))
 
-    assert_error_message("$value: \"a\" is not a number for `ceil'", "ceil(\"a\")")
+    assert_error_message("\"a\" is not a number for `ceil'", "ceil(\"a\")")
   end
 
   def test_abs
@@ -155,7 +155,7 @@ class SassFunctionTest < Test::Unit::TestCase
     assert_equal("5px", evaluate("abs(5px)"))
     assert_equal("5px", evaluate("abs($value: 5px)"))
 
-    assert_error_message("$value: #aaaaaa is not a number for `abs'", "abs(#aaa)")
+    assert_error_message("#aaaaaa is not a number for `abs'", "abs(#aaa)")
   end
 
   def test_min
@@ -193,31 +193,31 @@ class SassFunctionTest < Test::Unit::TestCase
   end
 
   def test_rgb_tests_bounds
-    assert_error_message("$red: Color value 256 must be between 0 and 255 for `rgb'",
+    assert_error_message("Color value 256 must be between 0 and 255 for `rgb'",
       "rgb(256, 1, 1)")
-    assert_error_message("$green: Color value 256 must be between 0 and 255 for `rgb'",
+    assert_error_message("Color value 256 must be between 0 and 255 for `rgb'",
       "rgb(1, 256, 1)")
-    assert_error_message("$blue: Color value 256 must be between 0 and 255 for `rgb'",
+    assert_error_message("Color value 256 must be between 0 and 255 for `rgb'",
       "rgb(1, 1, 256)")
-    assert_error_message("$green: Color value 256 must be between 0 and 255 for `rgb'",
+    assert_error_message("Color value 256 must be between 0 and 255 for `rgb'",
       "rgb(1, 256, 257)")
-    assert_error_message("$red: Color value -1 must be between 0 and 255 for `rgb'",
+    assert_error_message("Color value -1 must be between 0 and 255 for `rgb'",
       "rgb(-1, 1, 1)")
   end
 
   def test_rgb_test_percent_bounds
-    assert_error_message("$red: Color value 100.1% must be between 0% and 100% for `rgb'",
+    assert_error_message("Color value 100.1% must be between 0% and 100% for `rgb'",
       "rgb(100.1%, 0, 0)")
-    assert_error_message("$green: Color value -0.1% must be between 0% and 100% for `rgb'",
+    assert_error_message("Color value -0.1% must be between 0% and 100% for `rgb'",
       "rgb(0, -0.1%, 0)")
-    assert_error_message("$blue: Color value 101% must be between 0% and 100% for `rgb'",
+    assert_error_message("Color value 101% must be between 0% and 100% for `rgb'",
       "rgb(0, 0, 101%)")
   end
 
   def test_rgb_tests_types
-    assert_error_message("$red: \"foo\" is not a number for `rgb'", "rgb(\"foo\", 10, 12)");
-    assert_error_message("$green: \"foo\" is not a number for `rgb'", "rgb(10, \"foo\", 12)");
-    assert_error_message("$blue: \"foo\" is not a number for `rgb'", "rgb(10, 10, \"foo\")");
+    assert_error_message("\"foo\" is not a number for `rgb'", "rgb(\"foo\", 10, 12)");
+    assert_error_message("\"foo\" is not a number for `rgb'", "rgb(10, \"foo\", 12)");
+    assert_error_message("\"foo\" is not a number for `rgb'", "rgb(10, 10, \"foo\")");
   end
 
   def test_rgba
@@ -228,15 +228,15 @@ class SassFunctionTest < Test::Unit::TestCase
   end
 
   def test_rgba_tests_bounds
-    assert_error_message("$red: Color value 256 must be between 0 and 255 for `rgba'",
+    assert_error_message("Color value 256 must be between 0 and 255 for `rgba'",
       "rgba(256, 1, 1, 0.3)")
-    assert_error_message("$green: Color value 256 must be between 0 and 255 for `rgba'",
+    assert_error_message("Color value 256 must be between 0 and 255 for `rgba'",
       "rgba(1, 256, 1, 0.3)")
-    assert_error_message("$blue: Color value 256 must be between 0 and 255 for `rgba'",
+    assert_error_message("Color value 256 must be between 0 and 255 for `rgba'",
       "rgba(1, 1, 256, 0.3)")
-    assert_error_message("$green: Color value 256 must be between 0 and 255 for `rgba'",
+    assert_error_message("Color value 256 must be between 0 and 255 for `rgba'",
       "rgba(1, 256, 257, 0.3)")
-    assert_error_message("$red: Color value -1 must be between 0 and 255 for `rgba'",
+    assert_error_message("Color value -1 must be between 0 and 255 for `rgba'",
       "rgba(-1, 1, 1, 0.3)")
     assert_error_message("Alpha channel -0.2 must be between 0 and 1 for `rgba'",
       "rgba(1, 1, 1, -0.2)")
@@ -245,10 +245,10 @@ class SassFunctionTest < Test::Unit::TestCase
   end
 
   def test_rgba_tests_types
-    assert_error_message("$red: \"foo\" is not a number for `rgba'", "rgba(\"foo\", 10, 12, 0.2)");
-    assert_error_message("$green: \"foo\" is not a number for `rgba'", "rgba(10, \"foo\", 12, 0.1)");
-    assert_error_message("$blue: \"foo\" is not a number for `rgba'", "rgba(10, 10, \"foo\", 0)");
-    assert_error_message("$alpha: \"foo\" is not a number for `rgba'", "rgba(10, 10, 10, \"foo\")");
+    assert_error_message("\"foo\" is not a number for `rgba'", "rgba(\"foo\", 10, 12, 0.2)");
+    assert_error_message("\"foo\" is not a number for `rgba'", "rgba(10, \"foo\", 12, 0.1)");
+    assert_error_message("\"foo\" is not a number for `rgba'", "rgba(10, 10, \"foo\", 0)");
+    assert_error_message("\"foo\" is not a number for `rgba'", "rgba(10, 10, 10, \"foo\")");
   end
 
   def test_rgba_with_color
@@ -258,8 +258,8 @@ class SassFunctionTest < Test::Unit::TestCase
   end
 
   def test_rgba_with_color_tests_types
-    assert_error_message("$color: \"foo\" is not a color for `rgba'", "rgba(\"foo\", 0.2)");
-    assert_error_message("$alpha: \"foo\" is not a number for `rgba'", "rgba(blue, \"foo\")");
+    assert_error_message("\"foo\" is not a color for `rgba'", "rgba(\"foo\", 0.2)");
+    assert_error_message("\"foo\" is not a number for `rgba'", "rgba(blue, \"foo\")");
   end
 
   def test_rgba_tests_num_args
@@ -275,7 +275,7 @@ class SassFunctionTest < Test::Unit::TestCase
   end
 
   def test_red_exception
-    assert_error_message("$color: 12 is not a color for `red'", "red(12)")
+    assert_error_message("12 is not a color for `red'", "red(12)")
   end
 
   def test_green
@@ -284,7 +284,7 @@ class SassFunctionTest < Test::Unit::TestCase
   end
 
   def test_green_exception
-    assert_error_message("$color: 12 is not a color for `green'", "green(12)")
+    assert_error_message("12 is not a color for `green'", "green(12)")
   end
 
   def test_blue
@@ -293,7 +293,7 @@ class SassFunctionTest < Test::Unit::TestCase
   end
 
   def test_blue_exception
-    assert_error_message("$color: 12 is not a color for `blue'", "blue(12)")
+    assert_error_message("12 is not a color for `blue'", "blue(12)")
   end
 
   def test_hue
@@ -302,7 +302,7 @@ class SassFunctionTest < Test::Unit::TestCase
   end
 
   def test_hue_exception
-    assert_error_message("$color: 12 is not a color for `hue'", "hue(12)")
+    assert_error_message("12 is not a color for `hue'", "hue(12)")
   end
 
   def test_saturation
@@ -312,7 +312,7 @@ class SassFunctionTest < Test::Unit::TestCase
   end
 
   def test_saturation_exception
-    assert_error_message("$color: 12 is not a color for `saturation'", "saturation(12)")
+    assert_error_message("12 is not a color for `saturation'", "saturation(12)")
   end
 
   def test_lightness
@@ -322,7 +322,7 @@ class SassFunctionTest < Test::Unit::TestCase
   end
 
   def test_lightness_exception
-    assert_error_message("$color: 12 is not a color for `lightness'", "lightness(12)")
+    assert_error_message("12 is not a color for `lightness'", "lightness(12)")
   end
 
   def test_alpha
@@ -333,7 +333,7 @@ class SassFunctionTest < Test::Unit::TestCase
   end
 
   def test_alpha_exception
-    assert_error_message("$color: 12 is not a color for `alpha'", "alpha(12)")
+    assert_error_message("12 is not a color for `alpha'", "alpha(12)")
   end
 
   def test_opacity
@@ -345,7 +345,7 @@ class SassFunctionTest < Test::Unit::TestCase
   end
 
   def test_opacity_exception
-    assert_error_message("$color: \"foo\" is not a color for `opacity'", "opacity(foo)")
+    assert_error_message("\"foo\" is not a color for `opacity'", "opacity(foo)")
   end
 
   def test_opacify
@@ -367,8 +367,8 @@ class SassFunctionTest < Test::Unit::TestCase
   end
 
   def test_opacify_tests_types
-    assert_error_message("$color: \"foo\" is not a color for `opacify'", "opacify(\"foo\", 10%)")
-    assert_error_message("$amount: \"foo\" is not a number for `opacify'", "opacify(#fff, \"foo\")")
+    assert_error_message("\"foo\" is not a color for `opacify'", "opacify(\"foo\", 10%)")
+    assert_error_message("\"foo\" is not a number for `opacify'", "opacify(#fff, \"foo\")")
   end
 
   def test_transparentize
@@ -390,8 +390,8 @@ class SassFunctionTest < Test::Unit::TestCase
   end
 
   def test_transparentize_tests_types
-    assert_error_message("$color: \"foo\" is not a color for `transparentize'", "transparentize(\"foo\", 10%)")
-    assert_error_message("$amount: \"foo\" is not a number for `transparentize'", "transparentize(#fff, \"foo\")")
+    assert_error_message("\"foo\" is not a color for `transparentize'", "transparentize(\"foo\", 10%)")
+    assert_error_message("\"foo\" is not a number for `transparentize'", "transparentize(#fff, \"foo\")")
   end
 
   def test_lighten
@@ -412,8 +412,8 @@ class SassFunctionTest < Test::Unit::TestCase
   end
 
   def test_lighten_tests_types
-    assert_error_message("$color: \"foo\" is not a color for `lighten'", "lighten(\"foo\", 10%)")
-    assert_error_message("$amount: \"foo\" is not a number for `lighten'", "lighten(#fff, \"foo\")")
+    assert_error_message("\"foo\" is not a color for `lighten'", "lighten(\"foo\", 10%)")
+    assert_error_message("\"foo\" is not a number for `lighten'", "lighten(#fff, \"foo\")")
   end
 
   def test_darken
@@ -434,8 +434,8 @@ class SassFunctionTest < Test::Unit::TestCase
   end
 
   def test_darken_tests_types
-    assert_error_message("$color: \"foo\" is not a color for `darken'", "darken(\"foo\", 10%)")
-    assert_error_message("$amount: \"foo\" is not a number for `darken'", "darken(#fff, \"foo\")")
+    assert_error_message("\"foo\" is not a color for `darken'", "darken(\"foo\", 10%)")
+    assert_error_message("\"foo\" is not a number for `darken'", "darken(#fff, \"foo\")")
   end
 
   def test_saturate
@@ -458,8 +458,8 @@ class SassFunctionTest < Test::Unit::TestCase
   end
 
   def test_saturate_tests_types
-    assert_error_message("$color: \"foo\" is not a color for `saturate'", "saturate(\"foo\", 10%)")
-    assert_error_message("$amount: \"foo\" is not a number for `saturate'", "saturate(#fff, \"foo\")")
+    assert_error_message("\"foo\" is not a color for `saturate'", "saturate(\"foo\", 10%)")
+    assert_error_message("\"foo\" is not a number for `saturate'", "saturate(#fff, \"foo\")")
   end
 
   def test_desaturate
@@ -481,8 +481,8 @@ class SassFunctionTest < Test::Unit::TestCase
   end
 
   def test_desaturate_tests_types
-    assert_error_message("$color: \"foo\" is not a color for `desaturate'", "desaturate(\"foo\", 10%)")
-    assert_error_message("$amount: \"foo\" is not a number for `desaturate'", "desaturate(#fff, \"foo\")")
+    assert_error_message("\"foo\" is not a color for `desaturate'", "desaturate(\"foo\", 10%)")
+    assert_error_message("\"foo\" is not a number for `desaturate'", "desaturate(#fff, \"foo\")")
   end
 
   def test_adjust_hue
@@ -498,8 +498,8 @@ class SassFunctionTest < Test::Unit::TestCase
   end
 
   def test_adjust_hue_tests_types
-    assert_error_message("$color: \"foo\" is not a color for `adjust-hue'", "adjust-hue(\"foo\", 10%)")
-    assert_error_message("$degrees: \"foo\" is not a number for `adjust-hue'", "adjust-hue(#fff, \"foo\")")
+    assert_error_message("\"foo\" is not a color for `adjust-hue'", "adjust-hue(\"foo\", 10%)")
+    assert_error_message("\"foo\" is not a number for `adjust-hue'", "adjust-hue(#fff, \"foo\")")
   end
 
   def test_adjust_color
@@ -557,7 +557,7 @@ class SassFunctionTest < Test::Unit::TestCase
   end
 
   def test_adjust_color_tests_types
-    assert_error_message("$color: \"foo\" is not a color for `adjust-color'", "adjust-color(foo, $hue: 10)")
+    assert_error_message("\"foo\" is not a color for `adjust-color'", "adjust-color(foo, $hue: 10)")
     # HSL
     assert_error_message("$hue: \"foo\" is not a number for `adjust-color'",
       "adjust-color(blue, $hue: foo)")
@@ -663,7 +663,7 @@ class SassFunctionTest < Test::Unit::TestCase
   end
 
   def test_scale_color_tests_types
-    assert_error_message("$color: \"foo\" is not a color for `scale-color'", "scale-color(foo, $red: 10%)")
+    assert_error_message("\"foo\" is not a color for `scale-color'", "scale-color(foo, $red: 10%)")
     # HSL
     assert_error_message("$saturation: \"foo\" is not a number for `scale-color'",
       "scale-color(blue, $saturation: foo)")
@@ -734,7 +734,7 @@ class SassFunctionTest < Test::Unit::TestCase
   end
 
   def test_change_color_tests_types
-    assert_error_message("$color: \"foo\" is not a color for `change-color'", "change-color(foo, $red: 10%)")
+    assert_error_message("\"foo\" is not a color for `change-color'", "change-color(foo, $red: 10%)")
     # HSL
     assert_error_message("$saturation: \"foo\" is not a number for `change-color'",
       "change-color(blue, $saturation: foo)")
@@ -797,9 +797,9 @@ class SassFunctionTest < Test::Unit::TestCase
   end
 
   def test_mix_tests_types
-    assert_error_message("$color-1: \"foo\" is not a color for `mix'", "mix(\"foo\", #f00, 10%)")
-    assert_error_message("$color-2: \"foo\" is not a color for `mix'", "mix(#f00, \"foo\", 10%)")
-    assert_error_message("$weight: \"foo\" is not a number for `mix'", "mix(#f00, #baf, \"foo\")")
+    assert_error_message("\"foo\" is not a color for `mix'", "mix(\"foo\", #f00, 10%)")
+    assert_error_message("\"foo\" is not a color for `mix'", "mix(#f00, \"foo\", 10%)")
+    assert_error_message("\"foo\" is not a number for `mix'", "mix(#f00, #baf, \"foo\")")
   end
 
   def test_mix_tests_bounds
@@ -822,7 +822,7 @@ class SassFunctionTest < Test::Unit::TestCase
   end
 
   def tets_grayscale_tests_types
-    assert_error_message("$color: \"foo\" is not a color for `grayscale'", "grayscale(\"foo\")")
+    assert_error_message("\"foo\" is not a color for `grayscale'", "grayscale(\"foo\")")
   end
 
   def test_complement
@@ -835,7 +835,7 @@ class SassFunctionTest < Test::Unit::TestCase
   end
 
   def tets_complement_tests_types
-    assert_error_message("$color: \"foo\" is not a color for `complement'", "complement(\"foo\")")
+    assert_error_message("\"foo\" is not a color for `complement'", "complement(\"foo\")")
   end
 
   def test_invert
@@ -845,7 +845,7 @@ class SassFunctionTest < Test::Unit::TestCase
   end
 
   def test_invert_tests_types
-    assert_error_message("$color: \"foo\" is not a color for `invert'", "invert(\"foo\")")
+    assert_error_message("\"foo\" is not a color for `invert'", "invert(\"foo\")")
   end
 
   def test_unquote
@@ -861,7 +861,7 @@ class SassFunctionTest < Test::Unit::TestCase
   end
 
   def test_quote_tests_type
-    assert_error_message("$string: #ff0000 is not a string for `quote'", "quote(#f00)")
+    assert_error_message("#ff0000 is not a string for `quote'", "quote(#f00)")
   end
 
   def test_user_defined_function
@@ -900,14 +900,14 @@ MSG
     assert_equal(%Q{"em/rem"}, evaluate("unit(10px * 5em / 30cm / 1rem)"))
     assert_equal(%Q{"em*vh/cm*rem"}, evaluate("unit(10vh * 5em / 30cm / 1rem)"))
     assert_equal(%Q{"px"}, evaluate("unit($number: 100px)"))
-    assert_error_message("$number: #ff0000 is not a number for `unit'", "unit(#f00)")
+    assert_error_message("#ff0000 is not a number for `unit'", "unit(#f00)")
   end
 
   def test_unitless
     assert_equal(%Q{true}, evaluate("unitless(100)"))
     assert_equal(%Q{false}, evaluate("unitless(100px)"))
     assert_equal(%Q{false}, evaluate("unitless($number: 100px)"))
-    assert_error_message("$number: #ff0000 is not a number for `unitless'", "unitless(#f00)")
+    assert_error_message("#ff0000 is not a number for `unitless'", "unitless(#f00)")
   end
 
   def test_comparable
@@ -915,8 +915,8 @@ MSG
     assert_equal(%Q{true}, evaluate("comparable(10cm, 3mm)"))
     assert_equal(%Q{false}, evaluate("comparable(100px, 3em)"))
     assert_equal(%Q{false}, evaluate("comparable($number-1: 100px, $number-2: 3em)"))
-    assert_error_message("$number-1: #ff0000 is not a number for `comparable'", "comparable(#f00, 1px)")
-    assert_error_message("$number-2: #ff0000 is not a number for `comparable'", "comparable(1px, #f00)")
+    assert_error_message("#ff0000 is not a number for `comparable'", "comparable(#f00, 1px)")
+    assert_error_message("#ff0000 is not a number for `comparable'", "comparable(1px, #f00)")
   end
 
   def test_length
@@ -941,7 +941,6 @@ MSG
     assert_error_message("List index is 5 but list is only 4 items long for `nth'", "nth(1 2 3 4, 5)")
     assert_error_message("List index is 2 but list is only 1 item long for `nth'", "nth(foo, 2)")
     assert_error_message("List index is 1 but list has no items for `nth'", "nth((), 1)")
-    assert_error_message("$n: \"foo\" is not a number for `nth'", "nth(1 2 3, foo)")
   end
 
   def test_join
@@ -980,7 +979,6 @@ MSG
     assert_equal("false", evaluate("(1, 2, ()) == join((), (1, 2))"))
 
     assert_error_message("Separator name must be space, comma, or auto for `join'", "join(1, 2, baboon)")
-    assert_error_message("$separator: 12 is not a string for `join'", "join(1, 2, 12)")
   end
 
   def test_append
@@ -1015,23 +1013,19 @@ MSG
     assert_equal("true", evaluate("(1 2) == nth(append((), 1 2), 1)"))
 
     assert_error_message("Separator name must be space, comma, or auto for `append'", "append(1, 2, baboon)")
-    assert_error_message("$separator: 12 is not a string for `append'", "append(1, 2, 12)")
   end
 
   def test_zip
     assert_equal("1 3 5, 2 4 6", evaluate("zip(1 2, 3 4, 5 6)"))
     assert_equal("1 4 7, 2 5 8", evaluate("zip(1 2 3, 4 5 6, 7 8)"))
-    assert_equal("1 2 3", evaluate("zip(1, 2, 3)"))
   end
 
   def test_index
     assert_equal("1", evaluate("index(1px solid blue, 1px)"))
     assert_equal("2", evaluate("index(1px solid blue, solid)"))
     assert_equal("3", evaluate("index(1px solid blue, #00f)"))
-    assert_equal("1", evaluate("index(1px, 1px)"))
     assert_equal("false", evaluate("index(1px solid blue, 1em)"))
     assert_equal("false", evaluate("index(1px solid blue, notfound)"))
-    assert_equal("false", evaluate("index(1px, #00f)"))
   end
 
   def test_if
@@ -1040,18 +1034,6 @@ MSG
     assert_equal("2px", evaluate("if(null, 1px, 2px)"))
   end
 
-  def test_counter
-    assert_equal("counter(foo)", evaluate("counter(foo)"))
-    assert_equal('counter(item,".")', evaluate('counter(item, ".")'))
-    assert_equal('counter(item,".")', evaluate('counter(item,".")'))
-  end
-
-  def test_counters
-    assert_equal("counters(foo)", evaluate("counters(foo)"))
-    assert_equal('counters(item,".")', evaluate('counters(item, ".")'))
-    assert_equal('counters(item,".")', evaluate('counters(item,".")'))
-  end
-
   def test_keyword_args_rgb
     assert_equal(%Q{white}, evaluate("rgb($red: 255, $green: 255, $blue: 255)"))
   end
@@ -1120,9 +1102,7 @@ MSG
   private
 
   def evaluate(value)
-    result = perform(value)
-    assert_kind_of Sass::Script::Literal, result
-    return result.to_s
+    Sass::Script::Parser.parse(value, 0, 0).perform(Sass::Environment.new).to_s
   end
 
   def perform(value)