sass 3.3.0.rc.2 → 3.3.0.rc.3

data/test/sass/plugin_test.rb

@@ -164,6 +164,20 @@ CSS
     end
   end
 
+  def test_import_name_cleanup
+    File.delete(tempfile_loc('subdir/import_up1'))
+    check_for_updates!
+    File.open(tempfile_loc('subdir/import_up1')) do |file|
+      assert_equal(<<CSS.strip, file.read.split("\n")[0...5].join("\n"))
+/*
+Syntax error: File to import not found or unreadable: ../subdir/import_up3.scss.
+              Load path: #{template_loc}
+        on line 1 of #{template_loc 'subdir/import_up2'}
+        from line 1 of #{template_loc 'subdir/import_up1'}
+CSS
+    end
+  end
+
   def test_nonfull_exception_handling
     old_full_exception = Sass::Plugin.options[:full_exception]
     Sass::Plugin.options[:full_exception] = false

data/test/sass/script_conversion_test.rb

@@ -58,6 +58,10 @@ class SassScriptConversionTest < Test::Unit::TestCase
     assert_renders "foo($karg1: val, $karg2: val2)"
   end
 
+  def test_funcall_with_hyphen_conversion_keyword_arg
+    assert_renders "foo($a-b_c: val)"
+  end
+
   def test_url
     assert_renders "url(foo.gif)"
     assert_renders "url($var)"
@@ -105,10 +109,6 @@ class SassScriptConversionTest < Test::Unit::TestCase
     assert_renders "(foo: (bar, baz), bip: bop)"
   end
 
-  def test_selector
-    assert_renders "&"
-  end
-
   def self.test_precedence(outer, inner)
     op_outer = Sass::Script::Lexer::OPERATORS_REVERSE[outer]
     op_inner = Sass::Script::Lexer::OPERATORS_REVERSE[inner]

data/test/sass/script_test.rb

@@ -401,6 +401,12 @@ SASS
     assert_equal "true", resolve('() != null')
   end
 
+  def test_mod
+    assert_equal "5", resolve("29 % 12")
+    assert_equal "5px", resolve("29px % 12")
+    assert_equal "5px", resolve("29px % 12px")
+  end
+
   def test_operation_precedence
     assert_equal "false true", resolve("true and false false or true")
     assert_equal "true", resolve("false and true or true and true")
@@ -564,27 +570,6 @@ SASS
     assert_equal "true", resolve("$ie or $undef", {}, env('ie' => Sass::Script::Value::Bool.new(true)))
   end
 
-  def test_selector
-    env = Sass::Environment.new
-    assert_equal "true", resolve("& == null", {}, env)
-
-    env.selector = selector('.foo.bar .baz.bang, .bip.bop')
-    assert_equal ".foo.bar .baz.bang, .bip.bop", resolve("&", {}, env)
-    assert_equal ".foo.bar .baz.bang", resolve("nth(&, 1)", {}, env)
-    assert_equal ".bip.bop", resolve("nth(&, 2)", {}, env)
-    assert_equal ".foo.bar", resolve("nth(nth(&, 1), 1)", {}, env)
-    assert_equal ".baz.bang", resolve("nth(nth(&, 1), 2)", {}, env)
-    assert_equal ".bip.bop", resolve("nth(nth(&, 2), 1)", {}, env)
-    assert_equal "string", resolve("type-of(nth(nth(&, 1), 1))", {}, env)
-
-    env.selector = selector('.foo > .bar')
-    assert_equal ".foo > .bar", resolve("&", {}, env)
-    assert_equal ".foo > .bar", resolve("nth(&, 1)", {}, env)
-    assert_equal ".foo", resolve("nth(nth(&, 1), 1)", {}, env)
-    assert_equal ">", resolve("nth(nth(&, 1), 2)", {}, env)
-    assert_equal ".bar", resolve("nth(nth(&, 1), 3)", {}, env)
-  end
-
   def test_setting_global_variable_locally_warns
     assert_warning(<<WARNING) {assert_equal(<<CSS, render(<<SCSS, :syntax => :scss))}
 DEPRECATION WARNING on line 4 of test_setting_global_variable_locally_warns_inline.scss:
@@ -611,6 +596,23 @@ $var: 1;
 SCSS
   end
 
+  def test_setting_global_variable_locally_warns_only_once
+    assert_warning(<<WARNING) {assert_equal(<<CSS, render(<<SCSS, :syntax => :scss))}
+DEPRECATION WARNING on line 3 of test_setting_global_variable_locally_warns_only_once_inline.scss:
+Assigning to global variable "$var" by default is deprecated.
+In future versions of Sass, this will create a new local variable.
+If you want to assign to the global variable, use "$var: x !global" instead.
+WARNING
+CSS
+$var: 1;
+
+@mixin foo {$var: x}
+@include foo;
+@include foo;
+@include foo;
+SCSS
+  end
+
   def test_setting_global_variable_globally
     assert_no_warning {assert_equal(<<CSS, render(<<SCSS, :syntax => :scss))}
 .foo {
@@ -686,6 +688,34 @@ SCSS
 
   # Regression Tests
 
+  def test_minus_without_whitespace
+    assert_equal "5px", resolve("15px-10px")
+  end
+
+  def test_user_defined_function_forces_division
+    assert_equal(<<CSS, render(<<SASS))
+a {
+  b: 10px; }
+CSS
+@function foo()
+  @return 20px
+
+a
+  b: (foo() / 2)
+SASS
+
+    assert_equal(<<CSS, render(<<SASS))
+a {
+  b: 10px; }
+CSS
+@function foo()
+  @return 20px
+
+a
+  b: foo() / 2
+SASS
+end
+
   def test_funcall_has_higher_precedence_than_color_name
     assert_equal "teal(12)", resolve("teal(12)")
     assert_equal "tealbang(12)", resolve("tealbang(12)")
@@ -693,6 +723,13 @@ SCSS
     assert_equal "teal\\+bang(12)", resolve("teal\\+bang(12)")
   end
 
+  def test_funcall_has_higher_precedence_than_true_false_null
+    assert_equal "teal(12)", resolve("teal(12)")
+    assert_equal "tealbang(12)", resolve("tealbang(12)")
+    assert_equal "teal-bang(12)", resolve("teal-bang(12)")
+    assert_equal "teal\\+bang(12)", resolve("teal\\+bang(12)")
+  end
+
   def test_interpolation_after_hash
     assert_equal "#2", resolve('"##{1 + 1}"')
   end

data/test/sass/scss/css_test.rb

@@ -505,13 +505,20 @@ SCSS
     assert_parses '@import url(foo.css);'
   end
 
-  def test_import_directive_with_media
+  def test_string_import_directive_with_media
     assert_parses '@import "foo.css" screen;'
     assert_parses '@import "foo.css" screen, print;'
     assert_parses '@import "foo.css" screen, print and (foo: 0);'
     assert_parses '@import "foo.css" screen, only print, screen and (foo: 0);'
   end
 
+  def test_url_import_directive_with_media
+    assert_parses '@import url("foo.css") screen;'
+    assert_parses '@import url("foo.css") screen, print;'
+    assert_parses '@import url("foo.css") screen, print and (foo: 0);'
+    assert_parses '@import url("foo.css") screen, only print, screen and (foo: 0);'
+  end
+
   def test_page_directive
     assert_parses <<SCSS
 @page {

data/test/sass/scss/scss_test.rb

@@ -163,6 +163,51 @@ CSS
 SCSS
   end
 
+  def test_for_directive_with_same_start_and_end
+    assert_equal <<CSS, render(<<SCSS)
+CSS
+.foo {
+  @for $var from 1 to 1 {a: $var;}
+}
+SCSS
+
+    assert_equal <<CSS, render(<<SCSS)
+.foo {
+  a: 1; }
+CSS
+.foo {
+  @for $var from 1 through 1 {a: $var;}
+}
+SCSS
+  end
+
+  def test_decrementing_estfor_directive
+    assert_equal <<CSS, render(<<SCSS)
+.foo {
+  a: 5;
+  a: 4;
+  a: 3;
+  a: 2;
+  a: 1; }
+CSS
+.foo {
+  @for $var from 5 through 1 {a: $var;}
+}
+SCSS
+
+    assert_equal <<CSS, render(<<SCSS)
+.foo {
+  a: 5;
+  a: 4;
+  a: 3;
+  a: 2; }
+CSS
+.foo {
+  @for $var from 5 to 1 {a: $var;}
+}
+SCSS
+  end
+
   def test_if_directive
     assert_equal <<CSS, render(<<SCSS)
 foo {
@@ -295,6 +340,20 @@ SCSS
     assert_equal "@import url(foo.css);\n", render('@import url(foo.css);')
   end
 
+  def test_css_string_import_directive_with_media
+    assert_parses '@import "foo.css" screen;'
+    assert_parses '@import "foo.css" screen, print;'
+    assert_parses '@import "foo.css" screen, print and (foo: 0);'
+    assert_parses '@import "foo.css" screen, only print, screen and (foo: 0);'
+  end
+
+  def test_css_url_import_directive_with_media
+    assert_parses '@import url("foo.css") screen;'
+    assert_parses '@import url("foo.css") screen, print;'
+    assert_parses '@import url("foo.css") screen, print and (foo: 0);'
+    assert_parses '@import url("foo.css") screen, only print, screen and (foo: 0);'
+  end
+
   def test_media_import
     assert_equal("@import \"./fonts.sass\" all;\n", render("@import \"./fonts.sass\" all;"))
   end
@@ -333,6 +392,44 @@ SCSS
     assert_equal("@import url(fonts.sass);\n", render("@import url(fonts.sass);"))
   end
 
+  def test_css_import_doesnt_move_through_comments
+    assert_equal <<CSS, render(<<SCSS)
+/* Comment 1 */
+@import url("foo.css");
+/* Comment 2 */
+@import url("bar.css");
+CSS
+/* Comment 1 */
+@import url("foo.css");
+
+/* Comment 2 */
+@import url("bar.css");
+SCSS
+  end
+
+  def test_css_import_movement_stops_at_comments
+    assert_equal <<CSS, render(<<SCSS)
+/* Comment 1 */
+@import url("foo.css");
+/* Comment 2 */
+@import url("bar.css");
+.foo {
+  a: b; }
+
+/* Comment 3 */
+CSS
+/* Comment 1 */
+@import url("foo.css");
+
+/* Comment 2 */
+
+.foo {a: b}
+
+/* Comment 3 */
+@import url("bar.css");
+SCSS
+  end
+
   def test_block_comment_in_script
     assert_equal <<CSS, render(<<SCSS)
 foo {
@@ -563,6 +660,33 @@ foo bar {
 SCSS
   end
 
+  def test_parent_selector_with_suffix
+    assert_equal <<CSS, render(<<SCSS)
+.foo-bar {
+  a: b; }
+.foo_bar {
+  c: d; }
+.foobar {
+  e: f; }
+.foo123 {
+  e: f; }
+
+:hover-suffix {
+  g: h; }
+CSS
+.foo {
+  &-bar {a: b}
+  &_bar {c: d}
+  &bar {e: f}
+  &123 {e: f}
+}
+
+:hover {
+  &-suffix {g: h}
+}
+SCSS
+  end
+
   def test_unknown_directive_bubbling
     assert_equal(<<CSS, render(<<SCSS, :style => :nested))
 @fblthp {
@@ -1174,6 +1298,49 @@ CSS
 SCSS
   end
 
+  def test_mixin_map_splat_converts_hyphens_and_underscores_for_real_args
+    assert_equal <<CSS, render(<<SCSS)
+.foo {
+  a: 1;
+  b: 2;
+  c: 3;
+  d: 4; }
+CSS
+@mixin foo($a-1, $b-2, $c_3, $d_4) {
+  a: $a-1;
+  b: $b-2;
+  c: $c_3;
+  d: $d_4;
+}
+
+.foo {
+  $map: (a-1: 1, b_2: 2, c-3: 3, d_4: 4);
+  @include foo($map...);
+}
+SCSS
+  end
+
+  def test_mixin_map_splat_doesnt_convert_hyphens_and_underscores_for_var_args
+    assert_equal <<CSS, render(<<SCSS)
+.foo {
+  a-1: 1;
+  b_2: 2;
+  c-3: 3;
+  d_4: 4; }
+CSS
+@mixin foo($args...) {
+  @each $key, $value in keywords($args) {
+    \#{$key}: $value;
+  }
+}
+
+.foo {
+  $map: (a-1: 1, b_2: 2, c-3: 3, d_4: 4);
+  @include foo($map...);
+}
+SCSS
+  end
+
   def test_mixin_conflicting_splat_after_keyword_args
     assert_raise_message(Sass::SyntaxError, <<MESSAGE.rstrip) {render(<<SCSS)}
 Mixin foo was passed argument $b both by position and by name.
@@ -2167,6 +2334,123 @@ CSS
 SCSS
   end
 
+  def test_comments_in_at_root
+    assert_equal <<CSS, render(<<SCSS)
+/* foo */
+.bar {
+  a: b; }
+
+/* baz */
+CSS
+.foo {
+  @at-root {
+    /* foo */
+    .bar {a: b}
+    /* baz */
+  }
+}
+SCSS
+  end
+
+  def test_comments_in_at_root_in_media
+    assert_equal <<CSS, render(<<SCSS)
+@media screen {
+  /* foo */
+  .bar {
+    a: b; }
+
+  /* baz */ }
+CSS
+@media screen {
+  .foo {
+    @at-root {
+      /* foo */
+      .bar {a: b}
+      /* baz */
+    }
+  }
+}
+SCSS
+  end
+
+  def test_comments_in_at_root_in_unknown_directive
+    assert_equal <<CSS, render(<<SCSS)
+@fblthp {
+  /* foo */
+  .bar {
+    a: b; }
+
+  /* baz */ }
+CSS
+@fblthp {
+  .foo {
+    @at-root {
+      /* foo */
+      .bar {a: b}
+      /* baz */
+    }
+  }
+}
+SCSS
+  end
+
+  def test_media_directive_in_at_root
+    assert_equal <<CSS, render(<<SCSS)
+@media screen {
+  .bar {
+    a: b; } }
+CSS
+.foo {
+  @at-root {
+    @media screen {.bar {a: b}}
+  }
+}
+SCSS
+  end
+
+  def test_bubbled_media_directive_in_at_root
+    assert_equal <<CSS, render(<<SCSS)
+@media screen {
+  .bar .baz {
+    a: b; } }
+CSS
+.foo {
+  @at-root {
+    .bar {
+      @media screen {.baz {a: b}}
+    }
+  }
+}
+SCSS
+  end
+
+  def test_unknown_directive_in_at_root
+    assert_equal <<CSS, render(<<SCSS)
+@fblthp {
+  .bar {
+    a: b; } }
+CSS
+.foo {
+  @at-root {
+    @fblthp {.bar {a: b}}
+  }
+}
+SCSS
+  end
+
+  def test_at_root_in_at_root
+    assert_equal <<CSS, render(<<SCSS)
+.bar {
+  a: b; }
+CSS
+.foo {
+  @at-root {
+    @at-root .bar {a: b}
+  }
+}
+SCSS
+  end
+
   def test_at_root_with_parent_ref
     assert_equal <<CSS, render(<<SCSS)
 .foo {
@@ -2212,6 +2496,45 @@ CSS
 SCSS
   end
 
+  def test_at_root_beneath_comma_selector
+    assert_equal(<<CSS, render(<<SCSS))
+.baz {
+  a: b; }
+CSS
+.foo, .bar {
+  @at-root .baz {
+    a: b;
+  }
+}
+SCSS
+  end
+
+  def test_at_root_with_parent_ref_and_class
+    assert_equal(<<CSS, render(<<SCSS))
+.foo.bar {
+  a: b; }
+CSS
+.foo {
+  @at-root &.bar {
+    a: b;
+  }
+}
+SCSS
+  end
+
+  def test_at_root_beneath_comma_selector_with_parent_ref
+    assert_equal(<<CSS, render(<<SCSS))
+.foo.baz, .bar.baz {
+  a: b; }
+CSS
+.foo, .bar {
+  @at-root &.baz {
+    a: b;
+  }
+}
+SCSS
+  end
+
   ## @at-root (...)
 
   def test_at_root_without_media
@@ -2268,6 +2591,7 @@ SCSS
 
   def test_at_root_without_unknown_directive
     assert_equal <<CSS, render(<<SCSS)
+@fblthp {}
 .foo .bar {
   a: b; }
 CSS
@@ -2305,6 +2629,8 @@ SCSS
 
   def test_at_root_without_all
     assert_equal <<CSS, render(<<SCSS)
+@supports (foo: bar) {
+  @fblthp {} }
 .bar {
   a: b; }
 CSS
@@ -2325,6 +2651,7 @@ SCSS
   def test_at_root_with_media
     assert_equal <<CSS, render(<<SCSS)
 @media screen {
+  @fblthp {}
   .bar {
     a: b; } }
 CSS
@@ -2346,6 +2673,8 @@ SCSS
 
   def test_at_root_with_rule
     assert_equal <<CSS, render(<<SCSS)
+@media screen {
+  @fblthp {} }
 .foo .bar {
   a: b; }
 CSS
@@ -2367,6 +2696,8 @@ SCSS
 
   def test_at_root_with_supports
     assert_equal <<CSS, render(<<SCSS)
+@media screen {
+  @fblthp {} }
 @supports (foo: bar) {
   .bar {
     a: b; } }
@@ -2389,6 +2720,8 @@ SCSS
 
   def test_at_root_with_unknown_directive
     assert_equal <<CSS, render(<<SCSS)
+@media screen {
+  @fblthp {} }
 @fblthp {
   .bar {
     a: b; } }
@@ -2412,6 +2745,7 @@ SCSS
   def test_at_root_with_multiple
     assert_equal <<CSS, render(<<SCSS)
 @media screen {
+  @fblthp {}
   .foo .bar {
     a: b; } }
 CSS
@@ -2514,185 +2848,6 @@ CSS
 SCSS
   end
 
-  ## Selector Script
-
-  def test_selector_script
-    assert_equal(<<CSS, render(<<SCSS))
-.foo .bar {
-  content: ".foo .bar"; }
-CSS
-.foo .bar {
-  content: "\#{&}";
-}
-SCSS
-  end
-
-  def test_nested_selector_script
-    assert_equal(<<CSS, render(<<SCSS))
-.foo .bar {
-  content: ".foo .bar"; }
-CSS
-.foo {
-  .bar {
-    content: "\#{&}";
-  }
-}
-SCSS
-  end
-
-  def test_nested_selector_script_with_outer_comma_selector
-    assert_equal(<<CSS, render(<<SCSS))
-.foo .baz, .bar .baz {
-  content: ".foo .baz, .bar .baz"; }
-CSS
-.foo, .bar {
-  .baz {
-    content: "\#{&}";
-  }
-}
-SCSS
-  end
-
-  def test_nested_selector_script_with_inner_comma_selector
-    assert_equal(<<CSS, render(<<SCSS))
-.foo .bar, .foo .baz {
-  content: ".foo .bar, .foo .baz"; }
-CSS
-.foo {
-  .bar, .baz {
-    content: "\#{&}";
-  }
-}
-SCSS
-  end
-
-  def test_selector_script_through_mixin
-    assert_equal(<<CSS, render(<<SCSS))
-.foo {
-  content: ".foo"; }
-CSS
-@mixin mixin {
-  content: "\#{&}";
-}
-
-.foo {
-  @include mixin;
-}
-SCSS
-  end
-
-  def test_selector_script_through_content
-    assert_equal(<<CSS, render(<<SCSS))
-.foo {
-  content: ".foo"; }
-CSS
-@mixin mixin {
-  @content;
-}
-
-.foo {
-  @include mixin {
-    content: "\#{&}";
-  }
-}
-SCSS
-  end
-
-  def test_selector_script_through_function
-    assert_equal(<<CSS, render(<<SCSS))
-.foo {
-  content: ".foo"; }
-CSS
-@function fn() {
-  @return "\#{&}";
-}
-
-.foo {
-  content: fn();
-}
-SCSS
-  end
-
-  def test_selector_script_through_media
-    assert_equal(<<CSS, render(<<SCSS))
-.foo {
-  content: "outer"; }
-  @media screen {
-    .foo .bar {
-      content: ".foo .bar"; } }
-CSS
-.foo {
-  content: "outer";
-  @media screen {
-    .bar {
-      content: "\#{&}";
-    }
-  }
-}
-SCSS
-  end
-
-  def test_selector_script_save_and_reuse
-    assert_equal(<<CSS, render(<<SCSS))
-.bar {
-  content: ".foo"; }
-CSS
-$var: null;
-.foo {
-  $var: & !global;
-}
-
-.bar {
-  content: "\#{$var}";
-}
-SCSS
-  end
-
-  def test_selector_script_with_at_root
-    assert_equal(<<CSS, render(<<SCSS))
-.foo-bar {
-  a: b; }
-CSS
-.foo {
-  @at-root \#{&}-bar {
-    a: b;
-  }
-}
-SCSS
-  end
-
-  def test_multi_level_at_root_with_inner_selector_script
-    assert_equal <<CSS, render(<<SCSS)
-.bar {
-  a: b; }
-CSS
-.foo {
-  @at-root .bar {
-    @at-root \#{&} {
-      a: b;
-    }
-  }
-}
-SCSS
-  end
-
-  def test_at_root_with_at_root_through_mixin
-    assert_equal(<<CSS, render(<<SCSS))
-.bar-baz {
-  a: b; }
-CSS
-@mixin foo {
-  .bar {
-    @at-root \#{&}-baz {
-      a: b;
-    }
-  }
-}
-
-@include foo;
-SCSS
-  end
-
   ## Errors
 
   def test_nested_mixin_def_is_scoped
@@ -2901,6 +3056,48 @@ MESSAGE
 SCSS
   end
 
+  def test_failed_parent_selector_with_suffix
+    assert_raise_message(Sass::SyntaxError, <<MESSAGE.rstrip) {render(<<SCSS)}
+Invalid parent selector for "&-bar": "*"
+MESSAGE
+* {
+  &-bar {a: b}
+}
+SCSS
+
+    assert_raise_message(Sass::SyntaxError, <<MESSAGE.rstrip) {render(<<SCSS)}
+Invalid parent selector for "&-bar": "[foo=bar]"
+MESSAGE
+[foo=bar] {
+  &-bar {a: b}
+}
+SCSS
+
+    assert_raise_message(Sass::SyntaxError, <<MESSAGE.rstrip) {render(<<SCSS)}
+Invalid parent selector for "&-bar": "::nth-child(2n+1)"
+MESSAGE
+::nth-child(2n+1) {
+  &-bar {a: b}
+}
+SCSS
+
+    assert_raise_message(Sass::SyntaxError, <<MESSAGE.rstrip) {render(<<SCSS)}
+Invalid parent selector for "&-bar": ":not(.foo)"
+MESSAGE
+:not(.foo) {
+  &-bar {a: b}
+}
+SCSS
+
+    assert_raise_message(Sass::SyntaxError, <<MESSAGE.rstrip) {render(<<SCSS)}
+Invalid parent selector for "&-bar": ".foo +"
+MESSAGE
+.foo + {
+  &-bar {a: b}
+}
+SCSS
+  end
+
   # Regression
 
   def test_loud_comment_in_compressed_mode