sass 3.4.25 → 3.5.0

data/test/sass/extend_test.rb

@@ -1,4 +1,3 @@
-#!/usr/bin/env ruby
 require File.dirname(__FILE__) + '/../test_helper'
 
 class ExtendTest < MiniTest::Test
@@ -152,10 +151,7 @@ SCSS
   def test_id_unification
     assert_unification '.foo.bar', '#baz {@extend .foo}', '.foo.bar, .bar#baz'
     assert_unification '.foo#baz', '#baz {@extend .foo}', '#baz'
-
-    assert_extend_doesnt_match('#bar', '.foo', :failed_to_unify, 2) do
-      render_unification '.foo#baz', '#bar {@extend .foo}'
-    end
+    assert_unification '.foo#baz', '#bar {@extend .foo}', '.foo#baz'
   end
 
   def test_universal_unification_with_simple_target
@@ -167,10 +163,7 @@ SCSS
   end
 
   def test_universal_unification_with_namespaceless_universal_target
-    assert_extend_doesnt_match('ns|*', '.foo', :failed_to_unify, 2) do
-      render_unification '*.foo', 'ns|* {@extend .foo}'
-    end
-
+    assert_unification '*.foo', 'ns|* {@extend .foo}', '*.foo'
     assert_unification '*.foo', '* {@extend .foo}', '*'
     assert_unification '*.foo', '*|* {@extend .foo}', '*'
     assert_unification '*|*.foo', '* {@extend .foo}', '*|*.foo, *'
@@ -179,23 +172,14 @@ SCSS
   end
 
   def test_universal_unification_with_namespaced_universal_target
-    assert_extend_doesnt_match('*', '.foo', :failed_to_unify, 2) do
-      render_unification 'ns|*.foo', '* {@extend .foo}'
-    end
-
-    assert_extend_doesnt_match('ns2|*', '.foo', :failed_to_unify, 2) do
-      render_unification 'ns1|*.foo', 'ns2|* {@extend .foo}'
-    end
-
+    assert_unification 'ns|*.foo', '* {@extend .foo}', 'ns|*.foo'
+    assert_unification 'ns1|*.foo', 'ns2|* {@extend .foo}', 'ns1|*.foo'
     assert_unification 'ns|*.foo', '*|* {@extend .foo}', 'ns|*'
     assert_unification 'ns|*.foo', 'ns|* {@extend .foo}', 'ns|*'
   end
 
   def test_universal_unification_with_namespaceless_element_target
-    assert_extend_doesnt_match('ns|*', '.foo', :failed_to_unify, 2) do
-      render_unification 'a.foo', 'ns|* {@extend .foo}'
-    end
-
+    assert_unification 'a.foo', 'ns|* {@extend .foo}', 'a.foo'
     assert_unification 'a.foo', '* {@extend .foo}', 'a'
     assert_unification 'a.foo', '*|* {@extend .foo}', 'a'
     assert_unification '*|a.foo', '* {@extend .foo}', '*|a.foo, a'
@@ -204,14 +188,8 @@ SCSS
   end
 
   def test_universal_unification_with_namespaced_element_target
-    assert_extend_doesnt_match('*', '.foo', :failed_to_unify, 2) do
-      render_unification 'ns|a.foo', '* {@extend .foo}'
-    end
-
-    assert_extend_doesnt_match('ns2|*', '.foo', :failed_to_unify, 2) do
-      render_unification 'ns1|a.foo', 'ns2|* {@extend .foo}'
-    end
-
+    assert_unification 'ns|a.foo', '* {@extend .foo}', 'ns|a.foo'
+    assert_unification 'ns1|a.foo', 'ns2|* {@extend .foo}', 'ns1|a.foo'
     assert_unification 'ns|a.foo', '*|* {@extend .foo}', 'ns|a'
     assert_unification 'ns|a.foo', 'ns|* {@extend .foo}', 'ns|a'
   end
@@ -224,10 +202,7 @@ SCSS
   end
 
   def test_element_unification_with_namespaceless_universal_target
-    assert_extend_doesnt_match('ns|a', '.foo', :failed_to_unify, 2) do
-      render_unification '*.foo', 'ns|a {@extend .foo}'
-    end
-
+    assert_unification '*.foo', 'ns|a {@extend .foo}', '*.foo'
     assert_unification '*.foo', 'a {@extend .foo}', '*.foo, a'
     assert_unification '*.foo', '*|a {@extend .foo}', '*.foo, a'
     assert_unification '*|*.foo', 'a {@extend .foo}', '*|*.foo, a'
@@ -236,27 +211,15 @@ SCSS
   end
 
   def test_element_unification_with_namespaced_universal_target
-    assert_extend_doesnt_match('a', '.foo', :failed_to_unify, 2) do
-      render_unification 'ns|*.foo', 'a {@extend .foo}'
-    end
-
-    assert_extend_doesnt_match('ns2|a', '.foo', :failed_to_unify, 2) do
-      render_unification 'ns1|*.foo', 'ns2|a {@extend .foo}'
-    end
-
+    assert_unification 'ns|*.foo', 'a {@extend .foo}', 'ns|*.foo'
+    assert_unification 'ns1|*.foo', 'ns2|a {@extend .foo}', 'ns1|*.foo'
     assert_unification 'ns|*.foo', '*|a {@extend .foo}', 'ns|*.foo, ns|a'
     assert_unification 'ns|*.foo', 'ns|a {@extend .foo}', 'ns|*.foo, ns|a'
   end
 
   def test_element_unification_with_namespaceless_element_target
-    assert_extend_doesnt_match('ns|a', '.foo', :failed_to_unify, 2) do
-      render_unification 'a.foo', 'ns|a {@extend .foo}'
-    end
-
-    assert_extend_doesnt_match('h1', '.foo', :failed_to_unify, 2) do
-      render_unification 'a.foo', 'h1 {@extend .foo}'
-    end
-
+    assert_unification 'a.foo', 'ns|a {@extend .foo}', 'a.foo'
+    assert_unification 'a.foo', 'h1 {@extend .foo}', 'a.foo'
     assert_unification 'a.foo', 'a {@extend .foo}', 'a'
     assert_unification 'a.foo', '*|a {@extend .foo}', 'a'
     assert_unification '*|a.foo', 'a {@extend .foo}', '*|a.foo, a'
@@ -265,14 +228,8 @@ SCSS
   end
 
   def test_element_unification_with_namespaced_element_target
-    assert_extend_doesnt_match('a', '.foo', :failed_to_unify, 2) do
-      render_unification 'ns|a.foo', 'a {@extend .foo}'
-    end
-
-    assert_extend_doesnt_match('ns2|a', '.foo', :failed_to_unify, 2) do
-      render_unification 'ns1|a.foo', 'ns2|a {@extend .foo}'
-    end
-
+    assert_unification 'ns|a.foo', 'a {@extend .foo}', 'ns|a.foo'
+    assert_unification 'ns1|a.foo', 'ns2|a {@extend .foo}', 'ns1|a.foo'
     assert_unification 'ns|a.foo', '*|a {@extend .foo}', 'ns|a'
     assert_unification 'ns|a.foo', 'ns|a {@extend .foo}', 'ns|a'
   end
@@ -288,15 +245,8 @@ SCSS
   def test_pseudo_unification
     assert_unification ':foo.baz', ':foo(2n+1) {@extend .baz}', ':foo.baz, :foo:foo(2n+1)'
     assert_unification ':foo.baz', '::foo {@extend .baz}', ':foo.baz, :foo::foo'
-
-    assert_extend_doesnt_match('::bar', '.baz', :failed_to_unify, 2) do
-      render_unification '::foo.baz', '::bar {@extend .baz}'
-    end
-
-    assert_extend_doesnt_match('::foo(2n+1)', '.baz', :failed_to_unify, 2) do
-      render_unification '::foo.baz', '::foo(2n+1) {@extend .baz}'
-    end
-
+    assert_unification '::foo.baz', '::bar {@extend .baz}', '::foo.baz'
+    assert_unification '::foo.baz', '::foo(2n+1) {@extend .baz}', '::foo.baz'
     assert_unification '::foo.baz', '::foo {@extend .baz}', '::foo'
     assert_unification '::foo(2n+1).baz', '::foo(2n+1) {@extend .baz}', '::foo(2n+1)'
     assert_unification ':foo.baz', ':bar {@extend .baz}', ':foo.baz, :foo:bar'
@@ -315,6 +265,18 @@ SCSS
     assert_extends 'a.foo:bar', '.baz {@extend .foo}', 'a.foo:bar, a.baz:bar'
   end
 
+  def test_id_unification_again
+    assert_unification('#id.foo .bar', '#id.baz .qux {@extend .bar}',
+        '#id.foo .bar, #id.baz.foo .qux')
+  end
+
+  def test_root_unification
+    assert_extends(
+      ".foo:root .bar",
+      ".baz:root .qux {@extend .bar}",
+      ".foo:root .bar, .baz.foo:root .qux")
+  end
+
   def test_not_remains_at_end_of_selector
     assert_extends '.foo:not(.bar)', '.baz {@extend .foo}', '.foo:not(.bar), .baz:not(.bar)'
   end
@@ -606,14 +568,9 @@ WARNING
     assert_extends 'ns|*.foo.bar', '*|a.baz {@extend .foo}', 'ns|*.foo.bar, ns|a.bar.baz'
   end
 
-  def test_long_extender_aborts_unification
-    assert_extend_doesnt_match('h1.baz', '.foo', :failed_to_unify, 2) do
-      render_extends 'a.foo#bar', 'h1.baz {@extend .foo}'
-    end
-
-    assert_extend_doesnt_match('.bang#baz', '.foo', :failed_to_unify, 2) do
-      render_extends 'a.foo#bar', '.bang#baz {@extend .foo}'
-    end
+  def test_long_extender_doesnt_unify
+    assert_extends 'a.foo#bar', 'h1.baz {@extend .foo}', 'a.foo#bar'
+    assert_extends 'a.foo#bar', '.bang#baz {@extend .foo}', 'a.foo#bar'
   end
 
   ## Nested Extenders
@@ -626,10 +583,8 @@ WARNING
     assert_extends '.foo.bar', 'foo bar {@extend .foo}', '.foo.bar, foo bar.bar'
   end
 
-  def test_nested_extender_aborts_unification
-    assert_extend_doesnt_match('foo bar', '.foo', :failed_to_unify, 2) do
-      render_extends 'baz.foo', 'foo bar {@extend .foo}'
-    end
+  def test_nested_extender_doesnt_unify
+    assert_extends 'baz.foo', 'foo bar {@extend .foo}', 'baz.foo'
   end
 
   def test_nested_extender_alternates_parents
@@ -1057,13 +1012,14 @@ SCSS
   end
 
   def test_placeholder_selector_as_modifier
-    assert_extend_doesnt_match('div', '%foo', :failed_to_unify, 3) do
-      render(<<SCSS)
+    assert_equal <<CSS, render(<<SCSS)
+a.baz.bar {
+  color: blue; }
+CSS
 a%foo.baz {color: blue}
 .bar {@extend %foo}
 div {@extend %foo}
 SCSS
-    end
   end
 
   def test_placeholder_interpolation
@@ -1331,17 +1287,6 @@ ERR
 SCSS
   end
 
-  def test_extend_warns_when_extension_fails
-    assert_raise_message(Sass::SyntaxError, <<ERR) {render(<<SCSS)}
-"b.foo" failed to @extend ".bar".
-No selectors matching ".bar" could be unified with "b.foo".
-Use "@extend .bar !optional" if the extend should be able to fail.
-ERR
-a.bar {a: b}
-b.foo {@extend .bar}
-SCSS
-  end
-
   def test_extend_succeeds_when_one_extension_fails_but_others_dont
     assert_equal(<<CSS, render(<<SCSS))
 a.bar {

data/test/sass/functions_test.rb

@@ -1,4 +1,3 @@
-#!/usr/bin/env ruby
 require 'minitest/autorun'
 require File.dirname(__FILE__) + '/../test_helper'
 require File.dirname(__FILE__) + '/test_helper'
@@ -21,7 +20,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]
@@ -411,8 +412,8 @@ WARNING
     assert_equal("rgba(0, 0, 0, 0.3)", evaluate("transparentize(rgba(0, 0, 0, 0.5), 0.2)"))
     assert_equal("rgba(0, 0, 0, 0.1)", evaluate("transparentize(rgba(0, 0, 0, 0.2), 0.1)"))
     assert_equal("rgba(0, 0, 0, 0.2)", evaluate("fade-out(rgba(0, 0, 0, 0.5), 0.3px)"))
-    assert_equal("transparent", evaluate("fade_out(rgba(0, 0, 0, 0.2), 0.2)"))
-    assert_equal("transparent", evaluate("transparentize(rgba(0, 0, 0, 0.2), 1)"))
+    assert_equal("rgba(0, 0, 0, 0)", evaluate("fade_out(rgba(0, 0, 0, 0.2), 0.2)"))
+    assert_equal("rgba(0, 0, 0, 0)", evaluate("transparentize(rgba(0, 0, 0, 0.2), 1)"))
     assert_equal("rgba(0, 0, 0, 0.2)", evaluate("transparentize(rgba(0, 0, 0, 0.2), 0)"))
     assert_equal("rgba(0, 0, 0, 0.2)", evaluate("transparentize($color: rgba(0, 0, 0, 0.2), $amount: 0)"))
     assert_equal("rgba(0, 0, 0, 0.2)", evaluate("fade-out($color: rgba(0, 0, 0, 0.2), $amount: 0)"))
@@ -876,12 +877,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 +902,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 +1479,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 +1546,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
@@ -1637,7 +1681,7 @@ SCSS
 
   def test_random
     Sass::Script::Functions.random_seed = 1
-    assert_equal "0.41702", evaluate("random()")
+    assert_equal "0.4170220047", evaluate("random()")
     assert_equal "13", evaluate("random(100)")
   end
 
@@ -1958,7 +2002,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

@@ -1,4 +1,3 @@
-#!/usr/bin/env ruby
 require File.dirname(__FILE__) + '/../test_helper'
 require File.dirname(__FILE__) + '/test_helper'
 require 'mock_importer'
@@ -282,7 +281,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 +308,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/logger_test.rb

@@ -1,4 +1,3 @@
-#!/usr/bin/env ruby
 require File.dirname(__FILE__) + '/../test_helper'
 require 'pathname'
 

data/test/sass/plugin_test.rb

@@ -1,4 +1,3 @@
-#!/usr/bin/env ruby
 require File.dirname(__FILE__) + '/../test_helper'
 require File.dirname(__FILE__) + '/test_helper'
 require 'sass/plugin'
@@ -21,10 +20,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
 
@@ -396,15 +394,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 +419,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/results/script.css

@@ -7,7 +7,7 @@
 
 #times { num-num: 7; num-col: #7496b8; col-num: #092345; col-col: #243648; }
 
-#div { num-num: 3.33333; num-num2: 3.33333; col-num: #092345; col-col: #0b0e10; comp: 1px; }
+#div { num-num: 3.3333333333; num-num2: 3.3333333333; col-num: #092345; col-col: #0b0e10; comp: 1px; }
 
 #mod { num-num: 2; col-col: #0f0e05; col-num: #020001; }
 

data/test/sass/results/units.css

@@ -1,11 +1,11 @@
 b {
   foo: 5px;
   bar: 24px;
-  baz: 66.66667%;
+  baz: 66.6666666667%;
   many-units: 32em;
   mm: 15mm;
   pc: 2pc;
   pt: -72pt;
   inches: 2in;
   more-inches: 3.5in;
-  mixed: 2.04167in; }
+  mixed: 2.0416666667in; }

data/test/sass/script_conversion_test.rb

@@ -1,4 +1,3 @@
-#!/usr/bin/env ruby
 # -*- coding: utf-8 -*-
 require File.dirname(__FILE__) + '/../test_helper'
 require 'sass/engine'
@@ -23,7 +22,7 @@ class SassScriptConversionTest < MiniTest::Test
     assert_renders "12px"
     assert_renders "12.45px"
 
-    assert_equal "12.34568", render("12.345678901")
+    assert_equal "12.3456789013", render("12.34567890129")
   end
 
   def test_string
@@ -343,6 +342,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

@@ -1,4 +1,3 @@
-#!/usr/bin/env ruby
 # -*- coding: utf-8 -*-
 require File.dirname(__FILE__) + '/../test_helper'
 require 'sass/engine'
@@ -80,7 +79,7 @@ class SassScriptTest < MiniTest::Test
     assert_equal "#ffffff", resolve("#ffffff")
     silence_warnings {assert_equal "#fffffe", resolve("white - #000001")}
     assert_equal "transparent", resolve("transparent")
-    assert_equal "transparent", resolve("rgba(0, 0, 0, 0)")
+    assert_equal "rgba(0, 0, 0, 0)", resolve("rgba(0, 0, 0, 0)")
   end
 
   def test_rgba_color_literals
@@ -117,7 +116,7 @@ class SassScriptTest < MiniTest::Test
   end
 
   def test_rgba_rounding
-    assert_equal "rgba(10, 1, 0, 0.12346)", resolve("rgba(10.0, 1.23456789, 0.0, 0.1234567)")
+    assert_equal "rgba(10, 1, 0, 0.1234567892)", resolve("rgba(10.0, 1.23456789, 0.0, 0.12345678919)")
   end
 
   def test_rgb_calc
@@ -284,10 +283,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
@@ -535,19 +534,19 @@ WARNING
 
   def test_length_units
     assert_equal "2.54", resolve("(1in/1cm)")
-    assert_equal "2.3622", resolve("(1cm/1pc)")
-    assert_equal "4.23333", resolve("(1pc/1mm)")
-    assert_equal "2.83465", resolve("(1mm/1pt)")
-    assert_equal "1.33333", resolve("(1pt/1px)")
-    assert_equal "0.01042", resolve("(1px/1in)")
-    assert_equal "1.05833", resolve("(1px/1q)")
-    assert_equal "0.05906", resolve("(1q/1pc)")
+    assert_equal "2.3622047244", resolve("(1cm/1pc)")
+    assert_equal "4.2333333333", resolve("(1pc/1mm)")
+    assert_equal "2.8346456693", resolve("(1mm/1pt)")
+    assert_equal "1.3333333333", resolve("(1pt/1px)")
+    assert_equal "0.0104166667", resolve("(1px/1in)")
+    assert_equal "1.0583333333", resolve("(1px/1q)")
+    assert_equal "0.0590551181", resolve("(1q/1pc)")
   end
 
   def test_angle_units
-    assert_equal "1.11111", resolve("(1deg/1grad)")
-    assert_equal "0.01571", resolve("(1grad/1rad)")
-    assert_equal "0.15915", resolve("(1rad/1turn)")
+    assert_equal "1.1111111111", resolve("(1deg/1grad)")
+    assert_equal "0.0157079633", resolve("(1grad/1rad)")
+    assert_equal "0.1591549431", resolve("(1rad/1turn)")
     assert_equal "360", resolve("(1turn/1deg)")
   end
 
@@ -560,8 +559,8 @@ WARNING
   end
 
   def test_resolution_units
-    assert_equal "0.3937", resolve("(1dpi/1dpcm)")
-    assert_equal "0.02646", resolve("(1dpcm/1dppx)")
+    assert_equal "0.3937007874", resolve("(1dpi/1dpcm)")
+    assert_equal "0.0264583333", resolve("(1dpcm/1dppx)")
     assert_equal "96", resolve("(1dppx/1dpi)")
   end
 
@@ -1134,9 +1133,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
@@ -1178,8 +1176,8 @@ SASS
     assert_equal "1", resolve("1.0")
     assert_equal "1000000000", resolve("1000000000")
     assert_equal "0.00001", resolve("0.00001")
-    assert_equal "1.12121", resolve("1.121214")
-    assert_equal "1.12122", resolve("1.121215")
+    assert_equal "1.1212121212", resolve("1.12121212124")
+    assert_equal "1.1212121213", resolve("1.12121212125")
     assert_equal "Infinity", resolve("(1.0/0.0)")
     assert_equal "-Infinity", resolve("(-1.0/0.0)")
     assert_equal "NaN", resolve("(0.0/0.0)")

data/test/sass/scss/css_test.rb

@@ -1,4 +1,3 @@
-#!/usr/bin/env ruby
 # -*- coding: utf-8 -*-
 require File.dirname(__FILE__) + '/test_helper'
 require 'sass/scss/css_parser'
@@ -49,26 +48,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 +62,6 @@ CSS
 foo {
   bar: föö bâr; }
 SCSS
-    end
   end
 
   def test_invisible_comments