sass 3.4.24 → 3.4.25

data/test/sass/functions_test.rb

@@ -1841,8 +1841,11 @@ WARNING
     assert_equal(".bar", evaluate("selector-replace('.foo', '.foo', '.bar')"))
     assert_equal(".foo.baz", evaluate("selector-replace('.foo.bar', '.bar', '.baz')"))
     assert_equal(".a .foo.baz", evaluate("selector-replace('.foo.bar', '.bar', '.a .baz')"))
-    assert_equal(".foo.bar", evaluate("selector-replace('.foo.bar', '.baz.bar', '.qux')"))
-    assert_equal(".bar.qux", evaluate("selector-replace('.foo.bar.baz', '.foo.baz', '.qux')"))
+
+    # These shouldn't warn since we still support componud targets for selector
+    # functions.
+    assert_no_warning {assert_equal(".foo.bar", evaluate("selector-replace('.foo.bar', '.baz.bar', '.qux')"))}
+    assert_no_warning {assert_equal(".bar.qux", evaluate("selector-replace('.foo.bar.baz', '.foo.baz', '.qux')"))}
 
     assert_equal(":not(.bar)", evaluate("selector-replace(':not(.foo)', '.foo', '.bar')"))
     assert_equal(".bar", evaluate("selector-replace(':not(.foo)', ':not(.foo)', '.bar')"))

data/test/sass/more_templates/more1.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

data/test/sass/more_templates/more_import.sass

@@ -6,6 +6,6 @@ $preconst: hello
 @import importee, basic, basic.css, ../results/complex.css, more_partial
 
 nonimported
-  :myconst $preconst
-  :otherconst $postconst
+  myconst: $preconst
+  otherconst: $postconst
   +postmixin

data/test/sass/plugin_test.rb

@@ -45,7 +45,7 @@ class SassPluginTest < MiniTest::Test
 
   @@templates.each do |name|
     define_method("test_template_renders_correctly (#{name})") do
-      assert_renders_correctly(name)
+      silence_warnings {assert_renders_correctly(name)}
     end
   end
 
@@ -117,7 +117,7 @@ Error: Undefined variable: "$bork".
         on line 2 of #{template_loc('bork1')}
 
 1: bork
-2:   :bork $bork
+2:   bork: $bork
 CSS
     end
     File.delete(tempfile_loc('bork1'))
@@ -134,7 +134,7 @@ Error: Undefined variable: "$bork".
 
 1: bork
 2:   /* foo *\\/
-3:   :bork $bork
+3:   bork: $bork
 CSS
     end
     File.delete(tempfile_loc('bork1'))

data/test/sass/script_test.rb

@@ -78,7 +78,7 @@ class SassScriptTest < MiniTest::Test
   def test_color_names
     assert_equal "white", resolve("white")
     assert_equal "#ffffff", resolve("#ffffff")
-    assert_equal "#fffffe", resolve("white - #000001")
+    silence_warnings {assert_equal "#fffffe", resolve("white - #000001")}
     assert_equal "transparent", resolve("transparent")
     assert_equal "transparent", resolve("rgba(0, 0, 0, 0)")
   end
@@ -97,23 +97,23 @@ class SassScriptTest < MiniTest::Test
   end
 
   def test_rgba_color_math
-    assert_equal "rgba(50, 50, 100, 0.35)", resolve("rgba(1, 1, 2, 0.35) * rgba(50, 50, 50, 0.35)")
-    assert_equal "rgba(52, 52, 52, 0.25)", resolve("rgba(2, 2, 2, 0.25) + rgba(50, 50, 50, 0.25)")
+    silence_warnings {assert_equal "rgba(50, 50, 100, 0.35)", resolve("rgba(1, 1, 2, 0.35) * rgba(50, 50, 50, 0.35)")}
+    silence_warnings {assert_equal "rgba(52, 52, 52, 0.25)", resolve("rgba(2, 2, 2, 0.25) + rgba(50, 50, 50, 0.25)")}
 
     assert_raise_message(Sass::SyntaxError, "Alpha channels must be equal: rgba(1, 2, 3, 0.15) + rgba(50, 50, 50, 0.75)") do
-      resolve("rgba(1, 2, 3, 0.15) + rgba(50, 50, 50, 0.75)")
+      silence_warnings {resolve("rgba(1, 2, 3, 0.15) + rgba(50, 50, 50, 0.75)")}
     end
     assert_raise_message(Sass::SyntaxError, "Alpha channels must be equal: #123456 * rgba(50, 50, 50, 0.75)") do
-      resolve("#123456 * rgba(50, 50, 50, 0.75)")
+      silence_warnings {resolve("#123456 * rgba(50, 50, 50, 0.75)")}
     end
     assert_raise_message(Sass::SyntaxError, "Alpha channels must be equal: rgba(50, 50, 50, 0.75) / #123456") do
-      resolve("rgba(50, 50, 50, 0.75) / #123456")
+      silence_warnings {resolve("rgba(50, 50, 50, 0.75) / #123456")}
     end
   end
 
   def test_rgba_number_math
-    assert_equal "rgba(49, 49, 49, 0.75)", resolve("rgba(50, 50, 50, 0.75) - 1")
-    assert_equal "rgba(100, 100, 100, 0.75)", resolve("rgba(50, 50, 50, 0.75) * 2")
+    silence_warnings {assert_equal "rgba(49, 49, 49, 0.75)", resolve("rgba(50, 50, 50, 0.75) - 1")}
+    silence_warnings {assert_equal "rgba(100, 100, 100, 0.75)", resolve("rgba(50, 50, 50, 0.75) * 2")}
   end
 
   def test_rgba_rounding
@@ -504,7 +504,7 @@ SASS
 
   def test_functions
     assert_equal "#80ff80", resolve("hsl(120, 100%, 75%)")
-    assert_equal "#81ff81", resolve("hsl(120, 100%, 75%) + #010001")
+    silence_warnings {assert_equal "#81ff81", resolve("hsl(120, 100%, 75%) + #010001")}
   end
 
   def test_operator_unit_conversion
@@ -518,17 +518,19 @@ SASS
     assert_equal "true", resolve("2mm == 8q")
     assert_equal "false", resolve("2px > 3q")
 
-    assert_warning(<<WARNING) {assert_equal "true", resolve("1 == 1cm")}
+    Sass::Deprecation.allow_double_warnings do
+      assert_warning(<<WARNING) {assert_equal "true", resolve("1 == 1cm")}
 DEPRECATION WARNING on line 1 of test_operator_unit_conversion_inline.sass:
 The result of `1 == 1cm` will be `false` in future releases of Sass.
 Unitless numbers will no longer be equal to the same numbers with units.
 WARNING
 
-    assert_warning(<<WARNING) {assert_equal "false", resolve("1 != 1cm")}
+      assert_warning(<<WARNING) {assert_equal "false", resolve("1 != 1cm")}
 DEPRECATION WARNING on line 1 of test_operator_unit_conversion_inline.sass:
 The result of `1 != 1cm` will be `true` in future releases of Sass.
 Unitless numbers will no longer be equal to the same numbers with units.
 WARNING
+    end
   end
 
   def test_length_units
@@ -988,7 +990,7 @@ SCSS
   end
 
   def test_color_format_isnt_preserved_when_modified
-    assert_equal "magenta", resolve("#f00 + #00f")
+    assert_equal "magenta", resolve("change-color(#f00, $blue: 255)")
   end
 
   def test_ids
@@ -1307,32 +1309,37 @@ SASS
   end
 
   def test_active_lazy_interpolation_deprecation_warning
-    assert_equal "1, 2, 3", resolve_with_lazy_interp_warning('quote((1, #{2}, 3))', '"1, 2, 3"')
-    assert_equal "1", resolve_with_lazy_interp_warning('length((1, #{2}, 3))', '"1, 2, 3"')
-    assert_equal "1, 2, 3", resolve_with_lazy_interp_warning('inspect((1, #{2}, 3))', '"1, 2, 3"')
-    assert_equal "string", resolve_with_lazy_interp_warning('type-of((1, #{2}, 3))', '"1, 2, 3"')
-
-    assert_equal "+1 2 3", resolve_with_lazy_interp_warning('quote((+#{1} 2 3))', '"+1 #{2 3}"')
-    assert_equal "/1 2 3", resolve_with_lazy_interp_warning('quote((/#{1} 2 3))', '"/1 #{2 3}"')
-    assert_equal "-1 2 3", resolve_with_lazy_interp_warning('quote((-#{1} 2 3))', '"-1 #{2 3}"')
+    Sass::Deprecation.allow_double_warnings do
+      assert_equal "1, 2, 3", resolve_with_lazy_interp_warning('quote((1, #{2}, 3))', '"1, 2, 3"')
+      assert_equal "1", resolve_with_lazy_interp_warning('length((1, #{2}, 3))', '"1, 2, 3"')
+      assert_equal "1, 2, 3", resolve_with_lazy_interp_warning('inspect((1, #{2}, 3))', '"1, 2, 3"')
+      assert_equal "string", resolve_with_lazy_interp_warning('type-of((1, #{2}, 3))', '"1, 2, 3"')
+
+      assert_equal "+1 2 3", resolve_with_lazy_interp_warning('quote((+#{1} 2 3))', '"+1 #{2 3}"')
+      assert_equal "/1 2 3", resolve_with_lazy_interp_warning('quote((/#{1} 2 3))', '"/1 #{2 3}"')
+      assert_equal "-1 2 3", resolve_with_lazy_interp_warning('quote((-#{1} 2 3))', '"-1 #{2 3}"')
+    end
   end
 
   def test_comparison_of_complex_units
     # Tests for issue #1960
-    assert_warning(<<WARNING) do
+    Sass::Deprecation.allow_double_warnings do
+      assert_warning(<<WARNING) do
 DEPRECATION WARNING on line 1 of test_comparison_of_complex_units_inline.sass:
 The result of `10 == 10px` will be `false` in future releases of Sass.
 Unitless numbers will no longer be equal to the same numbers with units.
 WARNING
-      assert_equal "true", resolve("10 == 2 * 5px")
-    end
-    assert_warning(<<WARNING) do
+        assert_equal "true", resolve("10 == 2 * 5px")
+      end
+      assert_warning(<<WARNING) do
 DEPRECATION WARNING on line 1 of test_comparison_of_complex_units_inline.sass:
 The result of `10 == 10px*px` will be `false` in future releases of Sass.
 Unitless numbers will no longer be equal to the same numbers with units.
 WARNING
-      assert_equal "true", resolve("10 == 2px * 5px")
+        assert_equal "true", resolve("10 == 2px * 5px")
+      end
     end
+
     assert_equal "true", resolve("10px * 1px == 2px * 5px")
     assert_equal "true", resolve("5px * 1px < 2px * 5px")
   end
@@ -1342,8 +1349,9 @@ WARNING
   def resolve_with_lazy_interp_warning(str, contents = nil, environment = env)
     contents ||= "\"#{str}\""
     result = assert_warning(<<WARNING) {resolve(str, {}, environment)}
-DEPRECATION WARNING on line 1 of #{filename_for_test}: \#{} interpolation near operators will be simplified
-in a future version of Sass. To preserve the current behavior, use quotes:
+DEPRECATION WARNING on line 1 of #{filename_for_test}:
+\#{} interpolation near operators will be simplified in a future version of Sass.
+To preserve the current behavior, use quotes:
 
   unquote(#{contents})
 WARNING
@@ -1354,8 +1362,9 @@ WARNING
   def resolve_with_interp_warning(str, contents = nil, environment = env)
     contents ||= "\"#{str}\""
     assert_warning(<<WARNING) {resolve(str, {}, environment)}
-DEPRECATION WARNING on line 1 of #{filename_for_test}: \#{} interpolation near operators will be simplified
-in a future version of Sass. To preserve the current behavior, use quotes:
+DEPRECATION WARNING on line 1 of #{filename_for_test}:
+\#{} interpolation near operators will be simplified in a future version of Sass.
+To preserve the current behavior, use quotes:
 
   unquote(#{contents})
 

data/test/sass/scss/css_test.rb

@@ -819,10 +819,10 @@ SCSS
     assert_selector_parses('E > F')
     assert_selector_parses('E + F')
     assert_selector_parses('E ~ F')
-    assert_selector_parses('E /foo/ F')
+    silence_warnings {assert_selector_parses('E /foo/ F')}
     silence_warnings {assert_selector_parses('E! > F')}
 
-    assert_selector_parses('E /ns|foo/ F')
+    silence_warnings {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,7 +1015,8 @@ SASS
   end
 
   def test_disallowed_function_names
-    assert_warning(<<WARNING) {render(<<SCSS)}
+    Sass::Deprecation.allow_double_warnings do
+      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.
@@ -1023,7 +1024,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.
@@ -1031,7 +1032,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.
@@ -1039,7 +1040,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.
@@ -1047,7 +1048,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.
@@ -1055,13 +1056,14 @@ 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
@@ -2172,7 +2174,7 @@ SCSS
   end
 
   def test_selector_interpolation_in_reference_combinator
-    assert_equal <<CSS, render(<<SCSS)
+    silence_warnings {assert_equal <<CSS, render(<<SCSS)}
 .foo /a/ .bar /b|c/ .baz {
   a: b; }
 CSS
@@ -3666,8 +3668,9 @@ 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")
 
@@ -3857,7 +3860,19 @@ SCSS
   end
 
   def test_reference_combinator_with_parent_ref
-    assert_equal <<CSS, render(<<SCSS)
+    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
 a /foo/ b {
   c: d; }
 CSS

data/test/sass/source_map_test.rb

@@ -37,7 +37,7 @@ JSON
   end
 
   def test_simple_mapping_sass
-    assert_parses_with_sourcemap <<SASS, <<CSS, <<JSON, :syntax => :sass
+    silence_warnings {assert_parses_with_sourcemap <<SASS, <<CSS, <<JSON, :syntax => :sass}
 a
   foo: bar
   /* SOME COMMENT */
@@ -114,7 +114,7 @@ JSON
 
   def test_mapping_with_directory_sass
     options = {:filename => "sass/style.sass", :output => "css/style.css", :syntax => :sass}
-    assert_parses_with_sourcemap <<SASS, <<CSS, <<JSON, options
+    silence_warnings {assert_parses_with_sourcemap <<SASS, <<CSS, <<JSON, options}
 a
   foo: bar
   /* SOME COMMENT */
@@ -362,8 +362,7 @@ $translucent-red: rgba(255, 0, 0, 0.5);
     }
   }
   {{22}}&:active {{/22}}{
-    {{23}}color{{/23}}: {{24}}#010203 + #040506{{/24}};
-    {{25}}border{{/25}}: {{26}}$width solid black{{/26}};
+    {{23}}border{{/23}}: {{24}}$width solid black{{/24}};
   }
 {{2}}/* SOME COMMENT */{{/2}}
   {{3}}font{{/3}}: {{4}}2px/3px {{/4}}{
@@ -386,8 +385,7 @@ SCSS
     {{19}}a .special:after{{/19}} {
       {{20}}content{{/20}}: {{21}}"I ate 15 pies 2px thick!"{{/21}}; }
   {{22}}a:active{{/22}} {
-    {{23}}color{{/23}}: {{24}}#050709{{/24}};
-    {{25}}border{{/25}}: {{26}}2px solid black{{/26}}; }
+    {{23}}border{{/23}}: {{24}}2px solid black{{/24}}; }
 
 /*# sourceMappingURL=test.css.map */
 CSS
@@ -407,8 +405,7 @@ $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}}color{{/23}}: {{24}}#010203 + #040506{{/24}}
-    {{25}}border{{/25}}: {{26}}$width solid black{{/26}}
+    {{23}}border{{/23}}: {{24}}$width solid black{{/24}}
 
   {{2}}/* SOME COMMENT */{{/2}}
   {{3}}font{{/3}}: {{4}}2px/3px{{/4}}
@@ -429,8 +426,7 @@ SASS
     {{19}}a .special:after{{/19}} {
       {{20}}content{{/20}}: {{21}}"I ate 15 pies 2px thick!"{{/21}}; }
   {{22}}a:active{{/22}} {
-    {{23}}color{{/23}}: {{24}}#050709{{/24}};
-    {{25}}border{{/25}}: {{26}}2px solid black{{/26}}; }
+    {{23}}border{{/23}}: {{24}}2px solid black{{/24}}; }
 
 /*# sourceMappingURL=test.css.map */
 CSS
@@ -667,7 +663,7 @@ CSS
   end
 
 def test_mixin_sourcemap_sass
-  assert_parses_with_mapping <<'SASS', <<'CSS', :syntax => :sass
+  silence_warnings {assert_parses_with_mapping <<'SASS', <<'CSS', :syntax => :sass}
 =large-text
   :font
     {{2}}size{{/2}}: {{3}}20px{{/3}}
@@ -761,7 +757,7 @@ CSS
   # Regression tests
 
   def test_properties_sass
-    assert_parses_with_mapping <<SASS, <<CSS, :syntax => :sass
+    silence_warnings {assert_parses_with_mapping <<SASS, <<CSS, :syntax => :sass}
 {{1}}.foo{{/1}}
   :{{2}}name{{/2}} {{3}}value{{/3}}
   {{4}}name{{/4}}: {{5}}value{{/5}}
@@ -988,7 +984,11 @@ 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")
-    assert_equal(expected.file, actual.file)
+    if expected.file.nil?
+      assert_nil(actual.file)
+    else
+      assert_equal(expected.file, actual.file)
+    end
   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