sass 3.1.21 → 3.2.0.alpha.3

data/test/sass/extend_test.rb

@@ -741,22 +741,6 @@ SCSS
 CSS
 :foo.baz {a: b}
 :bar {@extend .baz}
-SCSS
-
-    assert_equal <<CSS, render(<<SCSS)
-.baz:foo, :foo:after {
-  a: b; }
-CSS
-.baz:foo {a: b}
-:after {@extend .baz}
-SCSS
-
-    assert_equal <<CSS, render(<<SCSS)
-.baz:after, :foo:after {
-  a: b; }
-CSS
-.baz:after {a: b}
-:foo {@extend .baz}
 SCSS
 
     assert_equal <<CSS, render(<<SCSS)
@@ -876,20 +860,6 @@ CSS
 SCSS
   end
 
-  def test_comma_extendee
-    assert_equal <<CSS, render(<<SCSS)
-.foo, .baz {
-  a: b; }
-
-.bar, .baz {
-  c: d; }
-CSS
-.foo {a: b}
-.bar {c: d}
-.baz {@extend .foo, .bar}
-SCSS
-  end
-
   ## Long Extendees
 
   def test_long_extendee
@@ -1369,291 +1339,6 @@ CSS
 SCSS
   end
 
-  def test_extend_out_of_media
-    assert_warning(<<WARN) {assert_equal(<<CSS, render(<<SCSS))}
-DEPRECATION WARNING on line 3 of test_extend_out_of_media_inline.sass:
-  @extending an outer selector from within @media is deprecated.
-  You may only @extend selectors within the same directive.
-  This will be an error in Sass 3.3.
-  It can only work once @extend is supported natively in the browser.
-WARN
-.foo {
-  a: b; }
-CSS
-.foo {a: b}
-@media screen {
-  .bar {@extend .foo}
-}
-SCSS
-  end
-
-  def test_extend_out_of_unknown_directive
-    assert_warning(<<WARN) {assert_equal(<<CSS, render(<<SCSS))}
-DEPRECATION WARNING on line 3 of test_extend_out_of_unknown_directive_inline.sass:
-  @extending an outer selector from within @flooblehoof is deprecated.
-  You may only @extend selectors within the same directive.
-  This will be an error in Sass 3.3.
-  It can only work once @extend is supported natively in the browser.
-WARN
-.foo {
-  a: b; }
-
-@flooblehoof {}
-CSS
-.foo {a: b}
-@flooblehoof {
-  .bar {@extend .foo}
-}
-SCSS
-  end
-
-  def test_extend_out_of_nested_directives
-    assert_warning(<<WARN) {assert_equal(<<CSS, render(<<SCSS))}
-DEPRECATION WARNING on line 4 of test_extend_out_of_nested_directives_inline.sass:
-  @extending an outer selector from within @flooblehoof is deprecated.
-  You may only @extend selectors within the same directive.
-  This will be an error in Sass 3.3.
-  It can only work once @extend is supported natively in the browser.
-WARN
-@media screen {
-  .foo {
-    a: b; }
-
-  @flooblehoof {} }
-CSS
-@media screen {
-  .foo {a: b}
-  @flooblehoof {
-    .bar {@extend .foo}
-  }
-}
-SCSS
-  end
-
-  def test_extend_within_media
-    assert_equal(<<CSS, render(<<SCSS))
-@media screen {
-  .foo, .bar {
-    a: b; } }
-CSS
-@media screen {
-  .foo {a: b}
-  .bar {@extend .foo}
-}
-SCSS
-  end
-
-  def test_extend_within_unknown_directive
-    assert_equal(<<CSS, render(<<SCSS))
-@flooblehoof {
-  .foo, .bar {
-    a: b; } }
-CSS
-@flooblehoof {
-  .foo {a: b}
-  .bar {@extend .foo}
-}
-SCSS
-  end
-
-  def test_extend_within_nested_directives
-    assert_equal(<<CSS, render(<<SCSS))
-@media screen {
-  @flooblehoof {
-    .foo, .bar {
-      a: b; } } }
-CSS
-@media screen {
-  @flooblehoof {
-    .foo {a: b}
-    .bar {@extend .foo}
-  }
-}
-SCSS
-  end
-
-  def test_extend_within_disparate_media
-    assert_equal(<<CSS, render(<<SCSS))
-@media screen {
-  .foo, .bar {
-    a: b; } }
-CSS
-@media screen {.foo {a: b}}
-@media screen {.bar {@extend .foo}}
-SCSS
-  end
-
-  def test_extend_within_disparate_unknown_directive
-    assert_equal(<<CSS, render(<<SCSS))
-@flooblehoof {
-  .foo, .bar {
-    a: b; } }
-
-@flooblehoof {}
-CSS
-@flooblehoof {.foo {a: b}}
-@flooblehoof {.bar {@extend .foo}}
-SCSS
-  end
-
-  def test_extend_within_disparate_nested_directives
-    assert_equal(<<CSS, render(<<SCSS))
-@media screen {
-  @flooblehoof {
-    .foo, .bar {
-      a: b; } } }
-@media screen {
-  @flooblehoof {} }
-CSS
-@media screen {@flooblehoof {.foo {a: b}}}
-@media screen {@flooblehoof {.bar {@extend .foo}}}
-SCSS
-  end
-
-  def test_extend_within_and_without_media
-    assert_warning(<<WARN) {assert_equal(<<CSS, render(<<SCSS))}
-DEPRECATION WARNING on line 4 of test_extend_within_and_without_media_inline.sass:
-  @extending an outer selector from within @media is deprecated.
-  You may only @extend selectors within the same directive.
-  This will be an error in Sass 3.3.
-  It can only work once @extend is supported natively in the browser.
-WARN
-.foo {
-  a: b; }
-
-@media screen {
-  .foo, .bar {
-    c: d; } }
-CSS
-.foo {a: b}
-@media screen {
-  .foo {c: d}
-  .bar {@extend .foo}
-}
-SCSS
-  end
-
-  def test_extend_within_and_without_unknown_directive
-    assert_warning(<<WARN) {assert_equal(<<CSS, render(<<SCSS))}
-DEPRECATION WARNING on line 4 of test_extend_within_and_without_unknown_directive_inline.sass:
-  @extending an outer selector from within @flooblehoof is deprecated.
-  You may only @extend selectors within the same directive.
-  This will be an error in Sass 3.3.
-  It can only work once @extend is supported natively in the browser.
-WARN
-.foo {
-  a: b; }
-
-@flooblehoof {
-  .foo, .bar {
-    c: d; } }
-CSS
-.foo {a: b}
-@flooblehoof {
-  .foo {c: d}
-  .bar {@extend .foo}
-}
-SCSS
-  end
-
-  def test_extend_within_and_without_nested_directives
-    assert_warning(<<WARN) {assert_equal(<<CSS, render(<<SCSS))}
-DEPRECATION WARNING on line 5 of test_extend_within_and_without_nested_directives_inline.sass:
-  @extending an outer selector from within @flooblehoof is deprecated.
-  You may only @extend selectors within the same directive.
-  This will be an error in Sass 3.3.
-  It can only work once @extend is supported natively in the browser.
-WARN
-@media screen {
-  .foo {
-    a: b; }
-
-  @flooblehoof {
-    .foo, .bar {
-      c: d; } } }
-CSS
-@media screen {
-  .foo {a: b}
-  @flooblehoof {
-    .foo {c: d}
-    .bar {@extend .foo}
-  }
-}
-SCSS
-  end
-
-  # Regression Tests
-
-  def test_duplicated_selector_with_newlines
-    assert_equal(<<CSS, render(<<SCSS))
-.example-1-1,
-.example-1-2,
-.my-page-1 .my-module-1-1,
-.example-1-3 {
-  a: b; }
-CSS
-.example-1-1,
-.example-1-2,
-.example-1-3 {
-  a: b;
-}
-
-.my-page-1 .my-module-1-1 {@extend .example-1-2}
-SCSS
-  end
-
-  def test_nested_selector_with_child_selector_hack_extendee
-    assert_equal <<CSS, render(<<SCSS)
-> .foo, > foo bar {
-  a: b; }
-CSS
-> .foo {a: b}
-foo bar {@extend .foo}
-SCSS
-  end
-
-  def test_nested_selector_with_child_selector_hack_extender
-    assert_equal <<CSS, render(<<SCSS)
-.foo .bar, > .foo foo bar, > foo .foo bar {
-  a: b; }
-CSS
-.foo .bar {a: b}
-> foo bar {@extend .bar}
-SCSS
-  end
-
-  def test_nested_selector_with_child_selector_hack_extender_and_extendee
-    assert_equal <<CSS, render(<<SCSS)
-> .foo, > foo bar {
-  a: b; }
-CSS
-> .foo {a: b}
-> foo bar {@extend .foo}
-SCSS
-  end
-
-  def test_nested_selector_with_child_selector_hack_extender_and_sibling_selector_extendee
-    assert_equal <<CSS, render(<<SCSS)
-~ .foo {
-  a: b; }
-CSS
-~ .foo {a: b}
-> foo bar {@extend .foo}
-SCSS
-  end
-
-  def test_nested_selector_with_child_selector_hack_extender_and_extendee_and_newline
-    assert_equal <<CSS, render(<<SCSS)
-> .foo, > flip,
-> foo bar {
-  a: b; }
-CSS
-> .foo {a: b}
-flip,
-> foo bar {@extend .foo}
-SCSS
-  end
-
   private
 
   def render(sass, options = {})

data/test/sass/functions_test.rb

@@ -76,7 +76,7 @@ class SassFunctionTest < Test::Unit::TestCase
 
   def test_hsl_checks_bounds
     assert_error_message("Saturation -114 must be between 0% and 100% for `hsl'", "hsl(10, -114, 12)");
-    assert_error_message("Lightness 256% must be between 0% and 100% for `hsl'", "hsl(10, 10, 256%)");
+    assert_error_message("Lightness 256 must be between 0% and 100% for `hsl'", "hsl(10, 10, 256%)");
   end
 
   def test_hsl_checks_types
@@ -94,7 +94,7 @@ class SassFunctionTest < Test::Unit::TestCase
 
   def test_hsla_checks_bounds
     assert_error_message("Saturation -114 must be between 0% and 100% for `hsla'", "hsla(10, -114, 12, 1)");
-    assert_error_message("Lightness 256% must be between 0% and 100% for `hsla'", "hsla(10, 10, 256%, 0)");
+    assert_error_message("Lightness 256 must be between 0% and 100% for `hsla'", "hsla(10, 10, 256%, 0)");
     assert_error_message("Alpha channel -0.1 must be between 0 and 1 for `hsla'", "hsla(10, 10, 10, -0.1)");
     assert_error_message("Alpha channel 1.1 must be between 0 and 1 for `hsla'", "hsla(10, 10, 10, 1.1)");
   end
@@ -169,24 +169,24 @@ class SassFunctionTest < Test::Unit::TestCase
   end
 
   def test_rgb_tests_bounds
-    assert_error_message("Color value 256 must be between 0 and 255 for `rgb'",
+    assert_error_message("Color value 256 must be between 0 and 255 inclusive for `rgb'",
       "rgb(256, 1, 1)")
-    assert_error_message("Color value 256 must be between 0 and 255 for `rgb'",
+    assert_error_message("Color value 256 must be between 0 and 255 inclusive for `rgb'",
       "rgb(1, 256, 1)")
-    assert_error_message("Color value 256 must be between 0 and 255 for `rgb'",
+    assert_error_message("Color value 256 must be between 0 and 255 inclusive for `rgb'",
       "rgb(1, 1, 256)")
-    assert_error_message("Color value 256 must be between 0 and 255 for `rgb'",
+    assert_error_message("Color value 256 must be between 0 and 255 inclusive for `rgb'",
       "rgb(1, 256, 257)")
-    assert_error_message("Color value -1 must be between 0 and 255 for `rgb'",
+    assert_error_message("Color value -1 must be between 0 and 255 inclusive for `rgb'",
       "rgb(-1, 1, 1)")
   end
 
   def test_rgb_test_percent_bounds
-    assert_error_message("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% inclusive for `rgb'",
       "rgb(100.1%, 0, 0)")
-    assert_error_message("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% inclusive for `rgb'",
       "rgb(0, -0.1%, 0)")
-    assert_error_message("Color value 101% must be between 0% and 100% for `rgb'",
+    assert_error_message("Color value 101% must be between 0% and 100% inclusive for `rgb'",
       "rgb(0, 0, 101%)")
   end
 
@@ -204,19 +204,19 @@ class SassFunctionTest < Test::Unit::TestCase
   end
 
   def test_rgb_tests_bounds
-    assert_error_message("Color value 256 must be between 0 and 255 for `rgba'",
+    assert_error_message("Color value 256 must be between 0 and 255 inclusive for `rgba'",
       "rgba(256, 1, 1, 0.3)")
-    assert_error_message("Color value 256 must be between 0 and 255 for `rgba'",
+    assert_error_message("Color value 256 must be between 0 and 255 inclusive for `rgba'",
       "rgba(1, 256, 1, 0.3)")
-    assert_error_message("Color value 256 must be between 0 and 255 for `rgba'",
+    assert_error_message("Color value 256 must be between 0 and 255 inclusive for `rgba'",
       "rgba(1, 1, 256, 0.3)")
-    assert_error_message("Color value 256 must be between 0 and 255 for `rgba'",
+    assert_error_message("Color value 256 must be between 0 and 255 inclusive for `rgba'",
       "rgba(1, 256, 257, 0.3)")
-    assert_error_message("Color value -1 must be between 0 and 255 for `rgba'",
+    assert_error_message("Color value -1 must be between 0 and 255 inclusive for `rgba'",
       "rgba(-1, 1, 1, 0.3)")
-    assert_error_message("Alpha channel -0.2 must be between 0 and 1 for `rgba'",
+    assert_error_message("Alpha channel -0.2 must be between 0 and 1 inclusive for `rgba'",
       "rgba(1, 1, 1, -0.2)")
-    assert_error_message("Alpha channel 1.2 must be between 0 and 1 for `rgba'",
+    assert_error_message("Alpha channel 1.2 must be between 0 and 1 inclusive for `rgba'",
       "rgba(1, 1, 1, 1.2)")
   end
 
@@ -312,18 +312,6 @@ class SassFunctionTest < Test::Unit::TestCase
     assert_error_message("12 is not a color for `alpha'", "alpha(12)")
   end
 
-  def test_opacity
-    assert_equal("1", evaluate("opacity(#123456)"))
-    assert_equal("0.34", evaluate("opacity(rgba(0, 1, 2, 0.34))"))
-    assert_equal("0", evaluate("opacity(hsla(0, 1, 2, 0))"))
-    assert_equal("0", evaluate("opacity($color: hsla(0, 1, 2, 0))"))
-    assert_equal("opacity(20%)", evaluate("opacity(20%)"))
-  end
-
-  def test_opacity_exception
-    assert_error_message("\"foo\" is not a color for `opacity'", "opacity(foo)")
-  end
-
   def test_opacify
     assert_equal("rgba(0, 0, 0, 0.75)", evaluate("opacify(rgba(0, 0, 0, 0.5), 0.25)"))
     assert_equal("rgba(0, 0, 0, 0.3)", evaluate("opacify(rgba(0, 0, 0, 0.2), 0.1)"))
@@ -423,7 +411,6 @@ class SassFunctionTest < Test::Unit::TestCase
     assert_equal("#88aa88", evaluate("saturate(#8a8, 0%)"))
     assert_equal("rgba(158, 63, 63, 0.5)", evaluate("saturate(rgba(136, 85, 85, 0.5), 20%)"))
     assert_equal("rgba(158, 63, 63, 0.5)", evaluate("saturate($color: rgba(136, 85, 85, 0.5), $amount: 20%)"))
-    assert_equal("saturate(50%)", evaluate("saturate(50%)"))
   end
 
   def test_saturate_tests_bounds
@@ -726,15 +713,15 @@ class SassFunctionTest < Test::Unit::TestCase
 
   def test_change_color_argument_errors
     # Range
-    assert_error_message("Saturation 101% must be between 0% and 100% for `change-color'",
+    assert_error_message("Saturation must be between 0 and 100 for `change-color'",
       "change-color(blue, $saturation: 101%)")
-    assert_error_message("Lightness 101% must be between 0% and 100% for `change-color'",
+    assert_error_message("Lightness must be between 0 and 100 for `change-color'",
       "change-color(blue, $lightness: 101%)")
-    assert_error_message("Red value -1 must be between 0 and 255 for `change-color'",
+    assert_error_message("Red value must be between 0 and 255 for `change-color'",
       "change-color(blue, $red: -1)")
-    assert_error_message("Green value 256 must be between 0 and 255 for `change-color'",
+    assert_error_message("Green value must be between 0 and 255 for `change-color'",
       "change-color(blue, $green: 256)")
-    assert_error_message("Blue value 500 must be between 0 and 255 for `change-color'",
+    assert_error_message("Blue value must be between 0 and 255 for `change-color'",
       "change-color(blue, $blue: 500)")
 
     # Unknown argument
@@ -785,9 +772,6 @@ class SassFunctionTest < Test::Unit::TestCase
     assert_equal("white", evaluate("grayscale(white)"))
     assert_equal("black", evaluate("grayscale(black)"))
     assert_equal("black", evaluate("grayscale($color: black)"))
-
-    assert_equal("grayscale(2)", evaluate("grayscale(2)"))
-    assert_equal("grayscale(-5px)", evaluate("grayscale(-5px)"))
   end
 
   def tets_grayscale_tests_types
@@ -810,7 +794,6 @@ class SassFunctionTest < Test::Unit::TestCase
   def test_invert
     assert_equal("#112233", evaluate("invert(#edc)"))
     assert_equal("rgba(245, 235, 225, 0.5)", evaluate("invert(rgba(10, 20, 30, 0.5))"))
-    assert_equal("invert(20%)", evaluate("invert(20%)"))
   end
 
   def test_invert_tests_types
@@ -865,8 +848,7 @@ MSG
     assert_equal(%Q{"px"}, evaluate("unit(100px)"))
     assert_equal(%Q{"em*px"}, evaluate("unit(10px * 5em)"))
     assert_equal(%Q{"em*px"}, evaluate("unit(5em * 10px)"))
-    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{"em*px/cm*rem"}, evaluate("unit(10px * 5em / 30cm / 1rem)"))
     assert_equal(%Q{"px"}, evaluate("unit($number: 100px)"))
     assert_error_message("#ff0000 is not a number for `unit'", "unit(#f00)")
   end
@@ -983,19 +965,6 @@ MSG
     assert_error_message("Separator name must be space, comma, or auto for `append'", "append(1, 2, baboon)")
   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)"))
-  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("false", evaluate("index(1px solid blue, 1em)"))
-    assert_equal("false", evaluate("index(1px solid blue, notfound)"))
-  end
-
   def test_if
     assert_equal("1px", evaluate("if(true, 1px, 2px)"))
     assert_equal("2px", evaluate("if(false, 1px, 2px)"))
@@ -1036,12 +1005,6 @@ MSG
     assert_equal "only-kw-args(a, b, c)", evaluate("only-kw-args($a: 1, $b: 2, $c: 3)")
   end
 
-  ## Regression Tests
-
-  def test_saturation_bounds
-    assert_equal "#fbfdff", evaluate("hsl(hue(#fbfdff), saturation(#fbfdff), lightness(#fbfdff))")
-  end
-
   private
 
   def evaluate(value)