sass 3.4.25 → 3.5.0.pre.rc.1

data/test/sass/scss/css_test.rb

@@ -49,26 +49,13 @@ baz {bar: baz}
 SCSS
   end
 
-  if Sass::Util.ruby1_8?
-    def test_unicode
-      assert_parses <<SCSS
-@charset "UTF-8";
-foo {
-  bar: föö bâr; }
-SCSS
-      assert_parses <<SCSS
-foo {
-  bar: föö bâr; }
-SCSS
-    end
-  else
-    def test_unicode
-      assert_parses <<SCSS
+  def test_unicode
+    assert_parses <<SCSS
 @charset "UTF-8";
 foo {
   bar: föö bâr; }
 SCSS
-      assert_equal <<CSS, render(<<SCSS)
+    assert_equal <<CSS, render(<<SCSS)
 @charset "UTF-8";
 foo {
   bar: föö bâr; }
@@ -76,7 +63,6 @@ CSS
 foo {
   bar: föö bâr; }
 SCSS
-    end
   end
 
   def test_invisible_comments
@@ -819,10 +805,10 @@ SCSS
     assert_selector_parses('E > F')
     assert_selector_parses('E + F')
     assert_selector_parses('E ~ F')
-    silence_warnings {assert_selector_parses('E /foo/ F')}
+    assert_selector_parses('E /foo/ F')
     silence_warnings {assert_selector_parses('E! > F')}
 
-    silence_warnings {assert_selector_parses('E /ns|foo/ F')}
+    assert_selector_parses('E /ns|foo/ F')
 
     # From http://dev.w3.org/csswg/css-scoping-1/
     assert_selector_parses('E:host(s)')

data/test/sass/scss/scss_test.rb

@@ -1015,8 +1015,7 @@ SASS
   end
 
   def test_disallowed_function_names
-    Sass::Deprecation.allow_double_warnings do
-      assert_warning(<<WARNING) {render(<<SCSS)}
+    assert_warning(<<WARNING) {render(<<SCSS)}
 DEPRECATION WARNING on line 1 of test_disallowed_function_names_inline.scss:
 Naming a function "calc" is disallowed and will be an error in future versions of Sass.
 This name conflicts with an existing CSS function with special parse rules.
@@ -1024,7 +1023,7 @@ WARNING
 @function calc() {}
 SCSS
 
-      assert_warning(<<WARNING) {render(<<SCSS)}
+    assert_warning(<<WARNING) {render(<<SCSS)}
 DEPRECATION WARNING on line 1 of test_disallowed_function_names_inline.scss:
 Naming a function "-my-calc" is disallowed and will be an error in future versions of Sass.
 This name conflicts with an existing CSS function with special parse rules.
@@ -1032,7 +1031,7 @@ WARNING
 @function -my-calc() {}
 SCSS
 
-      assert_warning(<<WARNING) {render(<<SCSS)}
+    assert_warning(<<WARNING) {render(<<SCSS)}
 DEPRECATION WARNING on line 1 of test_disallowed_function_names_inline.scss:
 Naming a function "element" is disallowed and will be an error in future versions of Sass.
 This name conflicts with an existing CSS function with special parse rules.
@@ -1040,7 +1039,7 @@ WARNING
 @function element() {}
 SCSS
 
-      assert_warning(<<WARNING) {render(<<SCSS)}
+    assert_warning(<<WARNING) {render(<<SCSS)}
 DEPRECATION WARNING on line 1 of test_disallowed_function_names_inline.scss:
 Naming a function "-my-element" is disallowed and will be an error in future versions of Sass.
 This name conflicts with an existing CSS function with special parse rules.
@@ -1048,7 +1047,7 @@ WARNING
 @function -my-element() {}
 SCSS
 
-      assert_warning(<<WARNING) {render(<<SCSS)}
+    assert_warning(<<WARNING) {render(<<SCSS)}
 DEPRECATION WARNING on line 1 of test_disallowed_function_names_inline.scss:
 Naming a function "expression" is disallowed and will be an error in future versions of Sass.
 This name conflicts with an existing CSS function with special parse rules.
@@ -1056,14 +1055,13 @@ WARNING
 @function expression() {}
 SCSS
 
-      assert_warning(<<WARNING) {render(<<SCSS)}
+    assert_warning(<<WARNING) {render(<<SCSS)}
 DEPRECATION WARNING on line 1 of test_disallowed_function_names_inline.scss:
 Naming a function "url" is disallowed and will be an error in future versions of Sass.
 This name conflicts with an existing CSS function with special parse rules.
 WARNING
 @function url() {}
 SCSS
-    end
   end
 
   def test_allowed_function_names
@@ -2174,7 +2172,7 @@ SCSS
   end
 
   def test_selector_interpolation_in_reference_combinator
-    silence_warnings {assert_equal <<CSS, render(<<SCSS)}
+    assert_equal <<CSS, render(<<SCSS)
 .foo /a/ .bar /b|c/ .baz {
   a: b; }
 CSS
@@ -3389,22 +3387,22 @@ SCSS
   def test_uses_property_exception_with_star_hack
     render <<SCSS
 foo {
-  *bar:baz [fail]; }
+  *bar:baz <fail>; }
 SCSS
     assert(false, "Expected syntax error")
   rescue Sass::SyntaxError => e
-    assert_equal 'Invalid CSS after "  *bar:baz ": expected ";", was "[fail]; }"', e.message
+    assert_equal 'Invalid CSS after "  *bar:baz <fail>": expected expression (e.g. 1px, bold), was "; }"', e.message
     assert_equal 2, e.sass_line
   end
 
   def test_uses_property_exception_with_colon_hack
     render <<SCSS
 foo {
-  :bar:baz [fail]; }
+  :bar:baz <fail>; }
 SCSS
     assert(false, "Expected syntax error")
   rescue Sass::SyntaxError => e
-    assert_equal 'Invalid CSS after "  :bar:baz ": expected ";", was "[fail]; }"', e.message
+    assert_equal 'Invalid CSS after "  :bar:baz <fail>": expected expression (e.g. 1px, bold), was "; }"', e.message
     assert_equal 2, e.sass_line
   end
 
@@ -3422,22 +3420,22 @@ SCSS
   def test_uses_property_exception_with_space_after_name
     render <<SCSS
 foo {
-  bar: baz [fail]; }
+  bar: baz <fail>; }
 SCSS
     assert(false, "Expected syntax error")
   rescue Sass::SyntaxError => e
-    assert_equal 'Invalid CSS after "  bar: baz ": expected ";", was "[fail]; }"', e.message
+    assert_equal 'Invalid CSS after "  bar: baz <fail>": expected expression (e.g. 1px, bold), was "; }"', e.message
     assert_equal 2, e.sass_line
   end
 
   def test_uses_property_exception_with_non_identifier_after_name
     render <<SCSS
 foo {
-  bar:1px [fail]; }
+  bar:1px <fail>; }
 SCSS
     assert(false, "Expected syntax error")
   rescue Sass::SyntaxError => e
-    assert_equal 'Invalid CSS after "  bar:1px ": expected ";", was "[fail]; }"', e.message
+    assert_equal 'Invalid CSS after "  bar:1px <fail>": expected expression (e.g. 1px, bold), was "; }"', e.message
     assert_equal 2, e.sass_line
   end
 
@@ -3668,9 +3666,8 @@ SCSS
   # Ensures that the fix for #2031 doesn't hide legitimate warnings.
   def test_interpolation_warning_in_selector_like_property
     assert_warning(<<WARNING) {assert_equal(<<CSS, render(<<SCSS))}
-DEPRECATION WARNING on line 2 of #{filename_for_test :scss}:
-\#{} interpolation near operators will be simplified in a future version of Sass.
-To preserve the current behavior, use quotes:
+DEPRECATION WARNING on line 2 of #{filename_for_test :scss}: \#{} interpolation near operators will be simplified
+in a future version of Sass. To preserve the current behavior, use quotes:
 
   unquote("n+1")
 
@@ -3860,19 +3857,7 @@ SCSS
   end
 
   def test_reference_combinator_with_parent_ref
-    silence_warnings {assert_equal <<CSS, render(<<SCSS)}
-a /foo/ b {
-  c: d; }
-CSS
-a {& /foo/ b {c: d}}
-SCSS
-  end
-
-  def test_reference_combinator_warning
-    assert_warning(<<WARNING) {assert_equal <<CSS, render(<<SCSS)}
-DEPRECATION WARNING on line 1, column 8 of test_reference_combinator_warning_inline.scss:
-The reference combinator /foo/ is deprecated and will be removed in a future release.
-WARNING
+    assert_equal <<CSS, render(<<SCSS)
 a /foo/ b {
   c: d; }
 CSS
@@ -3942,12 +3927,13 @@ a.\#{"foo"} b
 SCSS
   end
 
-  def test_extra_comma_in_mixin_arglist_error
-    assert_raise_message(Sass::SyntaxError, <<MESSAGE.rstrip) {render <<SCSS}
-Invalid CSS after "...clude foo(bar, ": expected mixin argument, was ");"
-MESSAGE
-@mixin foo($a1, $a2) {
-  baz: $a1 $a2;
+  def test_extra_comma_in_mixin_arglist
+    assert_equal <<CSS, render(<<SCSS)
+.bar {
+  baz: bar; }
+CSS
+@mixin foo($a1,) {
+  baz: $a1;
 }
 
 .bar {
@@ -3956,6 +3942,39 @@ MESSAGE
 SCSS
   end
 
+
+  def test_extra_comma_between_parameters_in_mixin_arglist
+    assert_raise_message(Sass::SyntaxError, "Invalid CSS after \"...nclude foo(bar,\": expected \")\", was \", baz );\"") {render <<SCSS}
+@mixin foo($a1, $a2) {
+  baz: $a1;
+  bef: $a2;
+}
+
+.bar {
+  @include foo(bar,, baz );
+}
+SCSS
+  end
+
+
+  def test_extra_comma_in_mixin_arglist_ending_needs_have_parentheses_after
+    assert_raise_message(Sass::SyntaxError, "Invalid CSS after \"    bri,\": expected \")\", was \"};\"") {render <<SCSS}
+@mixin foo($a1, $a2) {
+  baz: $a1;
+  bal: $a2;
+}
+
+.bar {
+  @include foo(
+    bar,
+    bri,
+  };
+}
+SCSS
+  end
+
+
+
   def test_interpolation
     assert_equal <<CSS, render(<<SCSS)
 ul li#foo a span.label {

data/test/sass/source_map_test.rb

@@ -37,7 +37,7 @@ JSON
   end
 
   def test_simple_mapping_sass
-    silence_warnings {assert_parses_with_sourcemap <<SASS, <<CSS, <<JSON, :syntax => :sass}
+    assert_parses_with_sourcemap <<SASS, <<CSS, <<JSON, :syntax => :sass
 a
   foo: bar
   /* SOME COMMENT */
@@ -61,7 +61,7 @@ JSON
   end
 
   def test_simple_mapping_with_file_uris
-    uri = Sass::Util.file_uri_from_path(Sass::Util.absolute_path(filename_for_test(:scss)))
+    uri = Sass::Util.file_uri_from_path(File.absolute_path(filename_for_test(:scss)))
     assert_parses_with_sourcemap <<SCSS, <<CSS, <<JSON, :sourcemap => :file
 a {
   foo: bar;
@@ -114,7 +114,7 @@ JSON
 
   def test_mapping_with_directory_sass
     options = {:filename => "sass/style.sass", :output => "css/style.css", :syntax => :sass}
-    silence_warnings {assert_parses_with_sourcemap <<SASS, <<CSS, <<JSON, options}
+    assert_parses_with_sourcemap <<SASS, <<CSS, <<JSON, options
 a
   foo: bar
   /* SOME COMMENT */
@@ -137,9 +137,8 @@ CSS
 JSON
   end
 
-  unless Sass::Util.ruby1_8?
-    def test_simple_charset_mapping_scss
-      assert_parses_with_sourcemap <<SCSS, <<CSS, <<JSON
+  def test_simple_charset_mapping_scss
+    assert_parses_with_sourcemap <<SCSS, <<CSS, <<JSON
 a {
   fóó: bár;
 }
@@ -158,10 +157,10 @@ CSS
 "file": "test.css"
 }
 JSON
-    end
+  end
 
-    def test_simple_charset_mapping_sass
-      assert_parses_with_sourcemap <<SASS, <<CSS, <<JSON, :syntax => :sass
+  def test_simple_charset_mapping_sass
+    assert_parses_with_sourcemap <<SASS, <<CSS, <<JSON, :syntax => :sass
 a
   fóó: bár
 SASS
@@ -179,10 +178,10 @@ CSS
 "file": "test.css"
 }
 JSON
-    end
+  end
 
-    def test_different_charset_than_encoding_scss
-      assert_parses_with_sourcemap(<<SCSS.force_encoding("IBM866"), <<CSS, <<JSON)
+  def test_different_charset_than_encoding_scss
+    assert_parses_with_sourcemap(<<SCSS.force_encoding("IBM866"), <<CSS, <<JSON)
 @charset "IBM866";
 f\x86\x86 {
   \x86: b;
@@ -202,10 +201,10 @@ CSS
 "file": "test.css"
 }
 JSON
-    end
+  end
 
-    def test_different_charset_than_encoding_sass
-      assert_parses_with_sourcemap(<<SASS.force_encoding("IBM866"), <<CSS, <<JSON, :syntax => :sass)
+  def test_different_charset_than_encoding_sass
+    assert_parses_with_sourcemap(<<SASS.force_encoding("IBM866"), <<CSS, <<JSON, :syntax => :sass)
 @charset "IBM866"
 f\x86\x86
   \x86: b
@@ -224,7 +223,6 @@ CSS
 "file": "test.css"
 }
 JSON
-    end
   end
 
   def test_import_sourcemap_scss
@@ -362,7 +360,8 @@ $translucent-red: rgba(255, 0, 0, 0.5);
     }
   }
   {{22}}&:active {{/22}}{
-    {{23}}border{{/23}}: {{24}}$width solid black{{/24}};
+    {{23}}color{{/23}}: {{24}}#010203 + #040506{{/24}};
+    {{25}}border{{/25}}: {{26}}$width solid black{{/26}};
   }
 {{2}}/* SOME COMMENT */{{/2}}
   {{3}}font{{/3}}: {{4}}2px/3px {{/4}}{
@@ -385,7 +384,8 @@ SCSS
     {{19}}a .special:after{{/19}} {
       {{20}}content{{/20}}: {{21}}"I ate 15 pies 2px thick!"{{/21}}; }
   {{22}}a:active{{/22}} {
-    {{23}}border{{/23}}: {{24}}2px solid black{{/24}}; }
+    {{23}}color{{/23}}: {{24}}#050709{{/24}};
+    {{25}}border{{/25}}: {{26}}2px solid black{{/26}}; }
 
 /*# sourceMappingURL=test.css.map */
 CSS
@@ -405,7 +405,8 @@ $translucent-red: rgba(255, 0, 0, 0.5)
     {{19}}&:after{{/19}}
       {{20}}content{{/20}}: {{21}}"I ate #{5 + 10} pies #{$width} thick!"{{/21}}
   {{22}}&:active{{/22}}
-    {{23}}border{{/23}}: {{24}}$width solid black{{/24}}
+    {{23}}color{{/23}}: {{24}}#010203 + #040506{{/24}}
+    {{25}}border{{/25}}: {{26}}$width solid black{{/26}}
 
   {{2}}/* SOME COMMENT */{{/2}}
   {{3}}font{{/3}}: {{4}}2px/3px{{/4}}
@@ -426,7 +427,8 @@ SASS
     {{19}}a .special:after{{/19}} {
       {{20}}content{{/20}}: {{21}}"I ate 15 pies 2px thick!"{{/21}}; }
   {{22}}a:active{{/22}} {
-    {{23}}border{{/23}}: {{24}}2px solid black{{/24}}; }
+    {{23}}color{{/23}}: {{24}}#050709{{/24}};
+    {{25}}border{{/25}}: {{26}}2px solid black{{/26}}; }
 
 /*# sourceMappingURL=test.css.map */
 CSS
@@ -663,7 +665,7 @@ CSS
   end
 
 def test_mixin_sourcemap_sass
-  silence_warnings {assert_parses_with_mapping <<'SASS', <<'CSS', :syntax => :sass}
+  assert_parses_with_mapping <<'SASS', <<'CSS', :syntax => :sass
 =large-text
   :font
     {{2}}size{{/2}}: {{3}}20px{{/3}}
@@ -757,7 +759,7 @@ CSS
   # Regression tests
 
   def test_properties_sass
-    silence_warnings {assert_parses_with_mapping <<SASS, <<CSS, :syntax => :sass}
+    assert_parses_with_mapping <<SASS, <<CSS, :syntax => :sass
 {{1}}.foo{{/1}}
   :{{2}}name{{/2}} {{3}}value{{/3}}
   {{4}}name{{/4}}: {{5}}value{{/5}}
@@ -796,7 +798,7 @@ SCSS
 
     interpolated = engine.to_tree.children.
       first.children.
-      first.value.children[1]
+      first.value.first.children[1]
     assert_equal "123", interpolated.to_sass
     range = interpolated.source_range
     assert_equal 3, range.start_pos.line
@@ -984,11 +986,7 @@ CSS
   def assert_ranges_equal(expected, actual, lines, prefix)
     assert_positions_equal(expected.start_pos, actual.start_pos, lines, prefix + " start position")
     assert_positions_equal(expected.end_pos, actual.end_pos, lines, prefix + " end position")
-    if expected.file.nil?
-      assert_nil(actual.file)
-    else
-      assert_equal(expected.file, actual.file)
-    end
+    assert_equal(expected.file, actual.file)
   end
 
   def assert_sourcemaps_equal(source, css, expected, actual)

data/test/sass/templates/_partial.sass

@@ -1,2 +1,2 @@
 #foo
-  background-color: #baf
+  :background-color #baf

data/test/sass/templates/basic.sass

@@ -1,23 +1,23 @@
 
 
 body
-  font: Arial
-  background: blue
+  :font Arial
+  :background blue
 
 #page
-  width: 700px
-  height: 100
+  :width 700px
+  :height 100
   #header
-    height: 300px
+    :height 300px
     h1
-      font-size: 50px
-      color:     blue
+      :font-size 50px
+      :color     blue
 
 #content.user.show
   #container.top
     #column.left
-      width: 100px
+      :width 100px
     #column.right
-      width: 600px
+      :width 600px
   #container.bottom
-    background: brown
+    :background brown