sass 3.4.25 → 3.5.0.pre.rc.1

data/test/sass/functions_test.rb

@@ -21,7 +21,9 @@ module Sass::Script::Functions
   declare :only_kw_args, [], :var_kwargs => true
 
   def deprecated_arg_fn(arg1, arg2, arg3 = nil)
-    Sass::Script::Value::List.new([arg1, arg2, arg3 || Sass::Script::Value::Null.new], :space)
+    Sass::Script::Value::List.new(
+      [arg1, arg2, arg3 || Sass::Script::Value::Null.new],
+      separator: :space)
   end
   declare :deprecated_arg_fn, [:arg1, :arg2, :arg3], :deprecated => [:arg_1, :arg_2, :arg3]
   declare :deprecated_arg_fn, [:arg1, :arg2], :deprecated => [:arg_1, :arg_2]
@@ -876,12 +878,22 @@ WARNING
 
   def test_invert
     assert_equal("#112233", evaluate("invert(#edc)"))
+    assert_equal("#d8cabd", evaluate("invert(#edc, 10%)"))
     assert_equal("rgba(245, 235, 225, 0.5)", evaluate("invert(rgba(10, 20, 30, 0.5))"))
+    assert_equal("rgba(34, 42, 50, 0.5)", evaluate("invert(rgba(10, 20, 30, 0.5), 10%)"))
     assert_equal("invert(20%)", evaluate("invert(20%)"))
   end
 
   def test_invert_tests_types
     assert_error_message("$color: \"foo\" is not a color for `invert'", "invert(\"foo\")")
+    assert_error_message("$weight: \"foo\" is not a number for `invert'", "invert(#edc, \"foo\")")
+  end
+
+  def test_invert_tests_bounds
+    assert_error_message("Weight -0.001 must be between 0% and 100% for `invert'",
+      "invert(#edc, -0.001)")
+    assert_error_message("Weight 100.001 must be between 0% and 100% for `invert'",
+      "invert(#edc, 100.001)")
   end
 
   def test_unquote
@@ -891,6 +903,7 @@ WARNING
     assert_warning <<MESSAGE do
 DEPRECATION WARNING: Passing blue, a non-string value, to unquote()
 will be an error in future versions of Sass.
+        on line 1 of test_unquote_inline.scss
 MESSAGE
       assert_equal('blue', evaluate('unquote(blue)'))
     end
@@ -1467,30 +1480,56 @@ SCSS
   end
 
   def test_call_with_positional_arguments
-    assert_equal evaluate("lighten(blue, 5%)"), evaluate("call(lighten, blue, 5%)")
+    # TODO: Remove this block in 4.0
+    Sass::Util.silence_sass_warnings do
+      assert_equal evaluate("lighten(blue, 5%)"), evaluate("call(lighten, blue, 5%)")
+    end
+    assert_equal evaluate("lighten(blue, 5%)"), evaluate("call(get-function(lighten), blue, 5%)")
   end
 
   def test_call_with_keyword_arguments
+    # TODO: Remove this block in 4.0
+    Sass::Util.silence_sass_warnings do
+      assert_equal(
+        evaluate("lighten($color: blue, $amount: 5%)"),
+        evaluate("call(lighten, $color: blue, $amount: 5%)"))
+    end
     assert_equal(
       evaluate("lighten($color: blue, $amount: 5%)"),
-      evaluate("call(lighten, $color: blue, $amount: 5%)"))
+      evaluate("call(get-function(lighten), $color: blue, $amount: 5%)"))
   end
 
   def test_call_with_keyword_and_positional_arguments
+    # TODO: Remove this block in 4.0
+    Sass::Util.silence_sass_warnings do
+      assert_equal(
+        evaluate("lighten(blue, $amount: 5%)"),
+        evaluate("call(lighten, blue, $amount: 5%)"))
+    end
     assert_equal(
       evaluate("lighten(blue, $amount: 5%)"),
-      evaluate("call(lighten, blue, $amount: 5%)"))
+      evaluate("call(get-function(lighten), blue, $amount: 5%)"))
   end
 
   def test_call_with_dynamic_name
+    # TODO: Remove this block in 4.0
+    Sass::Util.silence_sass_warnings do
+      assert_equal(
+        evaluate("lighten($color: blue, $amount: 5%)"),
+        evaluate("call($fn, $color: blue, $amount: 5%)",
+          env("fn" => Sass::Script::Value::String.new("lighten"))))
+    end
     assert_equal(
       evaluate("lighten($color: blue, $amount: 5%)"),
       evaluate("call($fn, $color: blue, $amount: 5%)",
-        env("fn" => Sass::Script::String.new("lighten"))))
+        env("fn" => Sass::Script::Value::Function.new(
+          Sass::Callable.new("lighten", nil, nil, nil, nil, nil, "function", :builtin)))))
   end
 
+  # TODO: Remove this test in 4.0
   def test_call_uses_local_scope
-    assert_equal <<CSS, render(<<SCSS)
+    Sass::Util.silence_sass_warnings do
+      assert_equal <<CSS, render(<<SCSS)
 .first-scope {
   a: local; }
 
@@ -1508,18 +1547,24 @@ CSS
   a: call(foo);
 }
 SCSS
+    end
   end
 
   def test_call_unknown_function
-    assert_equal evaluate("unknown(red, blue)"), evaluate("call(unknown, red, blue)")
+    # TODO: Remove this block in 4.0
+    Sass::Util.silence_sass_warnings do
+      assert_equal evaluate("unknown(red, blue)"), evaluate("call(unknown, red, blue)")
+    end
+    assert_equal evaluate("unknown(red, blue)"), evaluate("call(get-function(unknown, $css: true), red, blue)")
   end
 
   def test_call_with_non_string_argument
-    assert_error_message "$name: 3px is not a string for `call'", "call(3px)"
+    assert_error_message "$function: 3px is not a function for `call'", "call(3px)"
   end
 
   def test_errors_in_called_function
-    assert_error_message "$color: 3px is not a color for `lighten'", "call(lighten, 3px, 5%)"
+    assert_error_message "$color: 3px is not a color for `lighten'",
+      "call(get-function(lighten), 3px, 5%)"
   end
 
   def test_variable_exists
@@ -1841,11 +1886,8 @@ 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')"))
-
-    # 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(".foo.bar", evaluate("selector-replace('.foo.bar', '.baz.bar', '.qux')"))
+    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')"))
@@ -1958,7 +2000,7 @@ WARNING
   end
 
   def perform(value, environment = env)
-    Sass::Script::Parser.parse(value, 0, 0).perform(environment)
+    Sass::Script::Parser.parse(value, 1, 0, {:filename => "#{test_name}_inline.scss"}).perform(environment)
   end
 
   def render(sass, options = {})

data/test/sass/importer_test.rb

@@ -282,7 +282,7 @@ SCSS
 
     _, sourcemap = engine.render_with_sourcemap('http://1.example.com/style.map')
 
-    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_equal <<JSON.strip, sourcemap.to_json(:css_uri => 'css_uri')
 {
 "version": 3,
@@ -309,7 +309,7 @@ SCSS
 
     _, sourcemap = engine.render_with_sourcemap('http://1.example.com/style.map')
 
-    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_equal <<JSON.strip, sourcemap.to_json(:css_uri => 'css_uri', :css_path => 'css_path')
 {
 "version": 3,

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

@@ -21,10 +21,9 @@ class SassPluginTest < MiniTest::Test
   @@templates = %w{
     complex script parent_ref import scss_import alt
     subdir/subdir subdir/nested_subdir/nested_subdir
-    options import_content filename_fn
+    options import_content filename_fn import_charset
+    import_charset_ibm866
   }
-  @@templates += %w[import_charset import_charset_ibm866] unless Sass::Util.ruby1_8?
-  @@templates << 'import_charset_1_8' if Sass::Util.ruby1_8?
 
   @@cache_store = Sass::CacheStores::Memory.new
 
@@ -45,7 +44,7 @@ class SassPluginTest < MiniTest::Test
 
   @@templates.each do |name|
     define_method("test_template_renders_correctly (#{name})") do
-      silence_warnings {assert_renders_correctly(name)}
+      assert_renders_correctly(name)
     end
   end
 
@@ -117,7 +116,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 +133,7 @@ Error: Undefined variable: "$bork".
 
 1: bork
 2:   /* foo *\\/
-3:   bork: $bork
+3:   :bork $bork
 CSS
     end
     File.delete(tempfile_loc('bork1'))
@@ -396,15 +395,13 @@ WARNING
 
     expected_str = File.read(result_loc(result_name, prefix))
     actual_str = File.read(tempfile_loc(tempfile_name, prefix))
-    unless Sass::Util.ruby1_8?
-      expected_str = expected_str.force_encoding('IBM866') if result_name == 'import_charset_ibm866'
-      actual_str = actual_str.force_encoding('IBM866') if tempfile_name == 'import_charset_ibm866'
-    end
+    expected_str = expected_str.force_encoding('IBM866') if result_name == 'import_charset_ibm866'
+    actual_str = actual_str.force_encoding('IBM866') if tempfile_name == 'import_charset_ibm866'
     expected_lines = expected_str.split("\n")
     actual_lines = actual_str.split("\n")
 
     if actual_lines.first == "/*" && expected_lines.first != "/*"
-      assert(false, actual_lines[0..Sass::Util.enum_with_index(actual_lines).find {|l, i| l == "*/"}.last].join("\n"))
+      assert(false, actual_lines[0..actual_lines.each_with_index.find {|l, i| l == "*/"}.last].join("\n"))
     end
 
     expected_lines.zip(actual_lines).each_with_index do |pair, line|
@@ -423,7 +420,7 @@ WARNING
     expected_lines = File.read(result_loc(name)).split("\n")
     actual_lines = File.read(tempfile_loc(name)).split("\n")
     if actual_lines.first == "/*" && expected_lines.first != "/*"
-      assert(false, actual_lines[0..actual_lines.enum_with_index.find {|l, i| l == "*/"}.last].join("\n"))
+      assert(false, actual_lines[0..actual_lines.each_with_index.find {|l, i| l == "*/"}.last].join("\n"))
     end
   end
 

data/test/sass/script_conversion_test.rb

@@ -343,6 +343,15 @@ RUBY
     assert_equal '"foo#{$bar}baz"', render("'foo\#{$bar}baz'")
   end
 
+  def test_bracketed_lists
+    assert_renders("[]")
+    assert_renders("[foo, bar]")
+    assert_renders("[[foo]]")
+    assert_renders("[(foo bar)]")
+    assert_renders("[foo bar,]")
+    assert_renders("[(foo,)]")
+  end
+
   private
 
   def assert_renders(script, options = {})

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")
-    silence_warnings {assert_equal "#fffffe", resolve("white - #000001")}
+    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
-    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_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)")
 
     assert_raise_message(Sass::SyntaxError, "Alpha channels must be equal: rgba(1, 2, 3, 0.15) + rgba(50, 50, 50, 0.75)") do
-      silence_warnings {resolve("rgba(1, 2, 3, 0.15) + rgba(50, 50, 50, 0.75)")}
+      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
-      silence_warnings {resolve("#123456 * rgba(50, 50, 50, 0.75)")}
+      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
-      silence_warnings {resolve("rgba(50, 50, 50, 0.75) / #123456")}
+      resolve("rgba(50, 50, 50, 0.75) / #123456")
     end
   end
 
   def test_rgba_number_math
-    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")}
+    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")
   end
 
   def test_rgba_rounding
@@ -284,10 +284,10 @@ SASS
   end
 
   def test_adding_functions_directly_to_functions_module
-    assert !Functions.callable?('nonexistant')
-    Functions.class_eval { def nonexistant; end }
-    assert Functions.callable?('nonexistant')
-    Functions.send :remove_method, :nonexistant
+    assert !Functions.callable?('nonexistent')
+    Functions.class_eval { def nonexistent; end }
+    assert Functions.callable?('nonexistent')
+    Functions.send :remove_method, :nonexistent
   end
 
   def test_default_functions
@@ -504,7 +504,7 @@ SASS
 
   def test_functions
     assert_equal "#80ff80", resolve("hsl(120, 100%, 75%)")
-    silence_warnings {assert_equal "#81ff81", resolve("hsl(120, 100%, 75%) + #010001")}
+    assert_equal "#81ff81", resolve("hsl(120, 100%, 75%) + #010001")
   end
 
   def test_operator_unit_conversion
@@ -518,19 +518,17 @@ SASS
     assert_equal "true", resolve("2mm == 8q")
     assert_equal "false", resolve("2px > 3q")
 
-    Sass::Deprecation.allow_double_warnings do
-      assert_warning(<<WARNING) {assert_equal "true", resolve("1 == 1cm")}
+    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
@@ -560,9 +558,9 @@ WARNING
   end
 
   def test_resolution_units
-    assert_equal "0.3937", resolve("(1dpi/1dpcm)")
-    assert_equal "0.02646", resolve("(1dpcm/1dppx)")
-    assert_equal "96", resolve("(1dppx/1dpi)")
+    assert_equal "2.54", resolve("(1dpi/1dpcm)")
+    assert_equal "37.79528", resolve("(1dpcm/1dppx)")
+    assert_equal "0.01042", resolve("(1dppx/1dpi)")
   end
 
   def test_operations_have_options
@@ -990,7 +988,7 @@ SCSS
   end
 
   def test_color_format_isnt_preserved_when_modified
-    assert_equal "magenta", resolve("change-color(#f00, $blue: 255)")
+    assert_equal "magenta", resolve("#f00 + #00f")
   end
 
   def test_ids
@@ -1134,9 +1132,8 @@ SASS
     assert_equal "#2", resolve('"##{1 + 1}"')
   end
 
-  def test_misplaced_comma_in_funcall
-    assert_raise_message(Sass::SyntaxError,
-      'Invalid CSS after "foo(bar, ": expected function argument, was ")"') {eval('foo(bar, )')}
+  def test_func_call_arglist_trailing_comma
+    assert_equal eval('foo(bar)'), eval('foo(bar, )')
   end
 
   def test_color_prefixed_identifier
@@ -1309,37 +1306,32 @@ SASS
   end
 
   def test_active_lazy_interpolation_deprecation_warning
-    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
+    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
 
   def test_comparison_of_complex_units
     # Tests for issue #1960
-    Sass::Deprecation.allow_double_warnings do
-      assert_warning(<<WARNING) 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")
-      end
+      assert_equal "true", resolve("10 == 2px * 5px")
     end
-
     assert_equal "true", resolve("10px * 1px == 2px * 5px")
     assert_equal "true", resolve("5px * 1px < 2px * 5px")
   end
@@ -1349,9 +1341,8 @@ 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
@@ -1362,9 +1353,8 @@ 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})