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

data/test/sass/functions_test.rb

@@ -120,37 +120,67 @@ class SassFunctionTest < Test::Unit::TestCase
     assert_equal("50%",  evaluate("percentage(.5)"))
     assert_equal("100%", evaluate("percentage(1)"))
     assert_equal("25%",  evaluate("percentage(25px / 100px)"))
-    assert_equal("50%",  evaluate("percentage($value: 0.5)"))
+    assert_equal("50%",  evaluate("percentage($number: 0.5)"))
+  end
+
+  def test_percentage_deprecated_arg_name
+    assert_warning(<<WARNING) {assert_equal("50%", evaluate("percentage($value: 0.5)"))}
+DEPRECATION WARNING: The `$value' argument for `percentage()' has been renamed to `$number'.
+WARNING
   end
 
   def test_percentage_checks_types
-    assert_error_message("$value: 25px is not a unitless number for `percentage'", "percentage(25px)")
-    assert_error_message("$value: #cccccc is not a unitless number for `percentage'", "percentage(#ccc)")
-    assert_error_message("$value: \"string\" is not a unitless number for `percentage'", %Q{percentage("string")})
+    assert_error_message("$number: 25px is not a unitless number for `percentage'", "percentage(25px)")
+    assert_error_message("$number: #cccccc is not a unitless number for `percentage'", "percentage(#ccc)")
+    assert_error_message("$number: \"string\" is not a unitless number for `percentage'", %Q{percentage("string")})
   end
 
   def test_round
     assert_equal("5",   evaluate("round(4.8)"))
     assert_equal("5px", evaluate("round(4.8px)"))
     assert_equal("5px", evaluate("round(5.49px)"))
-    assert_equal("5px", evaluate("round($value: 5.49px)"))
+    assert_equal("5px", evaluate("round($number: 5.49px)"))
+  end
+
+  def test_round_deprecated_arg_name
+    assert_warning(<<WARNING) {assert_equal("5px", evaluate("round($value: 5.49px)"))}
+DEPRECATION WARNING: The `$value' argument for `round()' has been renamed to `$number'.
+WARNING
+  end
 
+  def test_round_checks_types
     assert_error_message("$value: #cccccc is not a number for `round'", "round(#ccc)")
   end
 
   def test_floor
     assert_equal("4",   evaluate("floor(4.8)"))
     assert_equal("4px", evaluate("floor(4.8px)"))
-    assert_equal("4px", evaluate("floor($value: 4.8px)"))
+    assert_equal("4px", evaluate("floor($number: 4.8px)"))
+  end
+
+  def test_floor_deprecated_arg_name
+    assert_warning(<<WARNING) {assert_equal("4px", evaluate("floor($value: 4.8px)"))}
+DEPRECATION WARNING: The `$value' argument for `floor()' has been renamed to `$number'.
+WARNING
+  end
 
+  def test_floor_checks_types
     assert_error_message("$value: \"foo\" is not a number for `floor'", "floor(\"foo\")")
   end
 
   def test_ceil
     assert_equal("5",   evaluate("ceil(4.1)"))
     assert_equal("5px", evaluate("ceil(4.8px)"))
-    assert_equal("5px", evaluate("ceil($value: 4.8px)"))
+    assert_equal("5px", evaluate("ceil($number: 4.8px)"))
+  end
 
+  def test_ceil_deprecated_arg_name
+    assert_warning(<<WARNING) {assert_equal("5px", evaluate("ceil($value: 4.8px)"))}
+DEPRECATION WARNING: The `$value' argument for `ceil()' has been renamed to `$number'.
+WARNING
+  end
+
+  def test_ceil_checks_types
     assert_error_message("$value: \"a\" is not a number for `ceil'", "ceil(\"a\")")
   end
 
@@ -159,8 +189,16 @@ class SassFunctionTest < Test::Unit::TestCase
     assert_equal("5px", evaluate("abs(-5px)"))
     assert_equal("5",   evaluate("abs(5)"))
     assert_equal("5px", evaluate("abs(5px)"))
-    assert_equal("5px", evaluate("abs($value: 5px)"))
+    assert_equal("5px", evaluate("abs($number: 5px)"))
+  end
+
+  def test_abs_deprecated_arg_name
+    assert_warning(<<WARNING) {assert_equal("5px", evaluate("abs($value: 5px)"))}
+DEPRECATION WARNING: The `$value' argument for `abs()' has been renamed to `$number'.
+WARNING
+  end
 
+  def test_abs_checks_types
     assert_error_message("$value: #aaaaaa is not a number for `abs'", "abs(#aaa)")
   end
 
@@ -799,12 +837,38 @@ class SassFunctionTest < Test::Unit::TestCase
     assert_equal("blue", evaluate("mix(transparentize(#f00, 1), #00f, 0%)"))
     assert_equal("rgba(0, 0, 255, 0)", evaluate("mix(#f00, transparentize(#00f, 1), 0%)"))
     assert_equal("rgba(255, 0, 0, 0)", evaluate("mix(transparentize(#f00, 1), #00f, 100%)"))
-    assert_equal("rgba(255, 0, 0, 0)", evaluate("mix($color-1: transparentize(#f00, 1), $color-2: #00f, $weight: 100%)"))
+    assert_equal("rgba(255, 0, 0, 0)", evaluate("mix($color1: transparentize(#f00, 1), $color2: #00f, $weight: 100%)"))
+  end
+
+  def test_mix_deprecated_arg_name
+    assert_warning <<WARNING do
+DEPRECATION WARNING: The `$color-1' argument for `mix()' has been renamed to `$color1'.
+DEPRECATION WARNING: The `$color-2' argument for `mix()' has been renamed to `$color2'.
+WARNING
+      assert_equal("rgba(255, 0, 0, 0)",
+        evaluate("mix($color-1: transparentize(#f00, 1), $color-2: #00f, $weight: 100%)"))
+    end
+
+    assert_warning <<WARNING do
+DEPRECATION WARNING: The `$color-1' argument for `mix()' has been renamed to `$color1'.
+DEPRECATION WARNING: The `$color-2' argument for `mix()' has been renamed to `$color2'.
+WARNING
+      assert_equal("rgba(0, 0, 255, 0.5)",
+        evaluate("mix($color-1: transparentize(#f00, 1), $color-2: #00f)"))
+    end
+
+    assert_warning <<WARNING do
+DEPRECATION WARNING: The `$color_1' argument for `mix()' has been renamed to `$color1'.
+DEPRECATION WARNING: The `$color_2' argument for `mix()' has been renamed to `$color2'.
+WARNING
+      assert_equal("rgba(0, 0, 255, 0.5)",
+        evaluate("mix($color_1: transparentize(#f00, 1), $color_2: #00f)"))
+    end
   end
 
   def test_mix_tests_types
-    assert_error_message("$color-1: \"foo\" is not a color for `mix'", "mix(\"foo\", #f00, 10%)")
-    assert_error_message("$color-2: \"foo\" is not a color for `mix'", "mix(#f00, \"foo\", 10%)")
+    assert_error_message("$color1: \"foo\" is not a color for `mix'", "mix(\"foo\", #f00, 10%)")
+    assert_error_message("$color2: \"foo\" is not a color for `mix'", "mix(#f00, \"foo\", 10%)")
     assert_error_message("$weight: \"foo\" is not a number for `mix'", "mix(#f00, #baf, \"foo\")")
   end
 
@@ -904,7 +968,7 @@ class SassFunctionTest < Test::Unit::TestCase
   def test_str_index
     assert_equal('1', evaluate('str-index(abcd, a)'))
     assert_equal('1', evaluate('str-index(abcd, ab)'))
-    assert_equal('0', evaluate('str-index(abcd, X)'))
+    assert_equal(Sass::Script::Value::Null.new, perform('str-index(abcd, X)'))
     assert_equal('3', evaluate('str-index(abcd, c)'))
   end
 
@@ -1017,9 +1081,28 @@ MSG
     assert_equal(%Q{true}, evaluate("comparable(2px, 1px)"))
     assert_equal(%Q{true}, evaluate("comparable(10cm, 3mm)"))
     assert_equal(%Q{false}, evaluate("comparable(100px, 3em)"))
-    assert_equal(%Q{false}, evaluate("comparable($number-1: 100px, $number-2: 3em)"))
-    assert_error_message("$number-1: #ff0000 is not a number for `comparable'", "comparable(#f00, 1px)")
-    assert_error_message("$number-2: #ff0000 is not a number for `comparable'", "comparable(1px, #f00)")
+    assert_equal(%Q{false}, evaluate("comparable($number1: 100px, $number2: 3em)"))
+  end
+
+  def test_comparable_deprecated_arg_name
+    assert_warning <<WARNING do
+DEPRECATION WARNING: The `$number-1' argument for `comparable()' has been renamed to `$number1'.
+DEPRECATION WARNING: The `$number-2' argument for `comparable()' has been renamed to `$number2'.
+WARNING
+      assert_equal("false", evaluate("comparable($number-1: 100px, $number-2: 3em)"))
+    end
+
+    assert_warning <<WARNING do
+DEPRECATION WARNING: The `$number_1' argument for `comparable()' has been renamed to `$number1'.
+DEPRECATION WARNING: The `$number_2' argument for `comparable()' has been renamed to `$number2'.
+WARNING
+      assert_equal("false", evaluate("comparable($number_1: 100px, $number_2: 3em)"))
+    end
+  end
+
+  def test_comparable_checks_types
+    assert_error_message("$number1: #ff0000 is not a number for `comparable'", "comparable(#f00, 1px)")
+    assert_error_message("$number2: #ff0000 is not a number for `comparable'", "comparable(1px, #f00)")
   end
 
   def test_length
@@ -1174,16 +1257,17 @@ MSG
   end
 
   def test_index
+    null = Sass::Script::Value::Null.new
     assert_equal("1", evaluate("index(1px solid blue, 1px)"))
     assert_equal("2", evaluate("index(1px solid blue, solid)"))
     assert_equal("3", evaluate("index(1px solid blue, #00f)"))
     assert_equal("1", evaluate("index(1px, 1px)"))
-    assert_equal("false", evaluate("index(1px solid blue, 1em)"))
-    assert_equal("false", evaluate("index(1px solid blue, notfound)"))
-    assert_equal("false", evaluate("index(1px, #00f)"))
+    assert_equal(null, perform("index(1px solid blue, 1em)"))
+    assert_equal(null, perform("index(1px solid blue, notfound)"))
+    assert_equal(null, perform("index(1px, #00f)"))
 
     assert_equal("1", evaluate("index((foo: bar, bar: baz), (foo bar))"))
-    assert_equal("false", evaluate("index((foo: bar, bar: baz), (foo: bar))"))
+    assert_equal(null, perform("index((foo: bar, bar: baz), (foo: bar))"))
   end
 
   def test_list_separator
@@ -1312,7 +1396,9 @@ SCSS
     assert_equal "2", evaluate("map-get((foo: 1, bar: 2), bar)")
     assert_equal "null", perform("map-get((foo: 1, bar: 2), baz)").to_sass
     assert_equal "null", perform("map-get((), foo)").to_sass
+  end
 
+  def test_map_get_deprecation_warning
     assert_warning(<<WARNING) do
 DEPRECATION WARNING: Passing lists of pairs to map-get is deprecated and will
 be removed in future versions of Sass. Use Sass maps instead. For details, see
@@ -1322,6 +1408,10 @@ WARNING
     end
   end
 
+  def test_map_get_checks_type
+    assert_error_message("$map: 12 is not a map for `map-get'", "map-get(12, bar)")
+  end
+
   def test_map_merge
     assert_equal("(foo: 1, bar: 2, baz: 3)",
       perform("map-merge((foo: 1, bar: 2), (baz: 3))").to_sass)
@@ -1329,7 +1419,9 @@ WARNING
       perform("map-merge((), (foo: 1, bar: 2))").to_sass)
     assert_equal("(foo: 1, bar: 2)",
       perform("map-merge((foo: 1, bar: 2), ())").to_sass)
+  end
 
+  def test_map_merge_deprecation_warning
     assert_warning(<<WARNING) do
 DEPRECATION WARNING: Passing lists of pairs to map-merge is deprecated and will
 be removed in future versions of Sass. Use Sass maps instead. For details, see
@@ -1349,11 +1441,39 @@ WARNING
     end
   end
 
+  def test_map_merge_checks_type
+    assert_error_message("$map1: 12 is not a map for `map-merge'", "map-merge(12, (foo: 1))")
+    assert_error_message("$map2: 12 is not a map for `map-merge'", "map-merge((foo: 1), 12)")
+  end
+
+  def test_map_remove
+    assert_equal("(foo: 1, baz: 3)",
+      perform("map-remove((foo: 1, bar: 2, baz: 3), bar)").to_sass)
+    assert_equal("()", perform("map-remove((), foo)").to_sass)
+  end
+
+  def test_map_remove_deprecation_warning
+    assert_warning(<<WARNING) do
+DEPRECATION WARNING: Passing lists of pairs to map-remove is deprecated and will
+be removed in future versions of Sass. Use Sass maps instead. For details, see
+http://sass-lang.com/docs/yardoc/file.SASS_REFERENCE.html#maps.
+WARNING
+      assert_equal("(foo: 1, baz: 3)",
+        perform("map-remove((foo 1, bar 2, baz 3), bar)").to_sass)
+    end
+  end
+
+  def test_map_remove_checks_type
+    assert_error_message("$map: 12 is not a map for `map-remove'", "map-remove(12, foo)")
+  end
+
   def test_map_keys
     assert_equal("foo, bar",
       perform("map-keys((foo: 1, bar: 2))").to_sass)
     assert_equal("()", perform("map-keys(())").to_sass)
+  end
 
+  def test_map_keys_deprecation_warning
     assert_warning(<<WARNING) do
 DEPRECATION WARNING: Passing lists of pairs to map-keys is deprecated and will
 be removed in future versions of Sass. Use Sass maps instead. For details, see
@@ -1364,12 +1484,18 @@ WARNING
     end
   end
 
+  def test_map_keys_checks_type
+    assert_error_message("$map: 12 is not a map for `map-keys'", "map-keys(12)")
+  end
+
   def test_map_values
     assert_equal("1, 2", perform("map-values((foo: 1, bar: 2))").to_sass)
     assert_equal("1, 2, 2",
       perform("map-values((foo: 1, bar: 2, baz: 2))").to_sass)
     assert_equal("()", perform("map-values(())").to_sass)
+  end
 
+  def test_map_values_deprecation_warning
     assert_warning(<<WARNING) do
 DEPRECATION WARNING: Passing lists of pairs to map-values is deprecated and will
 be removed in future versions of Sass. Use Sass maps instead. For details, see
@@ -1379,11 +1505,17 @@ WARNING
     end
   end
 
+  def test_map_values_checks_type
+    assert_error_message("$map: 12 is not a map for `map-values'", "map-values(12)")
+  end
+
   def test_map_has_key
     assert_equal "true", evaluate("map-has-key((foo: 1, bar: 1), foo)")
     assert_equal "false", evaluate("map-has-key((foo: 1, bar: 1), baz)")
     assert_equal "false", evaluate("map-has-key((), foo)")
+  end
 
+  def test_map_has_key_deprecation_warning
     assert_warning(<<WARNING) do
 DEPRECATION WARNING: Passing lists of pairs to map-has-key is deprecated and will
 be removed in future versions of Sass. Use Sass maps instead. For details, see
@@ -1393,10 +1525,15 @@ WARNING
     end
   end
 
+  def test_map_has_key_checks_type
+    assert_error_message("$map: 12 is not a map for `map-has-key'", "map-has-key(12, foo)")
+  end
+
   def test_keywords
     # The actual functionality is tested in tests where real arglists are passed.
-    assert_error_message("12 is not a variable argument list for `keywords'", "keywords(12)")
-    assert_error_message("(1 2 3) is not a variable argument list for `keywords'", "keywords(1 2 3)")
+    assert_error_message("$args: 12 is not a variable argument list for `keywords'", "keywords(12)")
+    assert_error_message(
+      "$args: (1 2 3) is not a variable argument list for `keywords'", "keywords(1 2 3)")
   end
 
   def test_partial_list_of_pairs_doesnt_work_as_a_map
@@ -1462,6 +1599,27 @@ WARNING
         env("fn" => Sass::Script::String.new("lighten"))))
   end
 
+  def test_call_uses_local_scope
+    assert_equal <<CSS, render(<<SCSS)
+.first-scope {
+  a: local; }
+
+.second-scope {
+  a: global; }
+CSS
+@function foo() {@return global}
+
+.first-scope {
+  @function foo() {@return local}
+  a: call(foo);
+}
+
+.second-scope {
+  a: call(foo);
+}
+SCSS
+  end
+
   def test_call_unknown_function
     assert_equal evaluate("unknown(red, blue)"), evaluate("call(unknown, red, blue)")
   end
@@ -1495,6 +1653,10 @@ $global-var: has-value;
 SCSS
   end
 
+  def test_variable_exists_checks_type
+    assert_error_message("$name: 1 is not a string for `variable-exists'", "variable-exists(1)")
+  end
+
   def test_global_variable_exists
     assert_equal <<CSS, render(<<SCSS)
 .test {
@@ -1524,6 +1686,11 @@ $named: global-variable-exists($name: g);
 SCSS
   end
 
+  def test_global_variable_exists_checks_type
+    assert_error_message("$name: 1 is not a string for `global-variable-exists'",
+      "global-variable-exists(1)")
+  end
+
   def test_function_exists
     # built-ins
     assert_equal "true", evaluate("function-exists(lighten)")
@@ -1543,6 +1710,10 @@ CSS
 SCSS
   end
 
+  def test_function_exists_checks_type
+    assert_error_message("$name: 1 is not a string for `function-exists'", "function-exists(1)")
+  end
+
   def test_mixin_exists
     assert_equal "false", evaluate("mixin-exists(foo)")
     # with named argument
@@ -1560,11 +1731,8 @@ CSS
 SCSS
   end
 
-  def test_existence_functions_check_argument_type
-    assert_error_message("2px is not a string for `function-exists'", "function-exists(2px)")
-    assert_error_message("2px is not a string for `mixin-exists'", "mixin-exists(2px)")
-    assert_error_message("2px is not a string for `global-variable-exists'", "global-variable-exists(2px)")
-    assert_error_message("2px is not a string for `variable-exists'", "variable-exists(2px)")
+  def test_mixin_exists_checks_type
+    assert_error_message("$name: 1 is not a string for `mixin-exists'", "mixin-exists(1)")
   end
 
   def test_inspect
@@ -1574,6 +1742,45 @@ SCSS
     assert_equal "(a: 1, b: 2)", evaluate("inspect((a: 1, b: 2))")
   end
 
+  def test_random
+    Sass::Script::Functions.random_seed = 1
+    assert_equal "0.41702", evaluate("random()")
+    assert_equal "13", evaluate("random(100)")
+  end
+
+  def test_random_works_without_a_seed
+    if Sass::Script::Functions.instance_variable_defined?("@random_number_generator")
+      Sass::Script::Functions.send(:remove_instance_variable, "@random_number_generator")
+    end
+
+    result = perform("random()")
+    assert_kind_of Sass::Script::Number, result
+    assert result.value >= 0, "Random number was below 0"
+    assert result.value <= 1, "Random number was above 1"
+  end
+
+  def test_random_with_limit_one
+    # Passing 1 as the limit should always return 1, since limit calls return
+    # integers from 1 to the argument, so when the argument is 1, its a predicatble
+    # outcome
+    assert "1", evaluate("random(1)")
+  end
+
+  def test_random_with_limit_too_low
+    assert_error_message("$limit 0 must be greater than or equal to 1 for `random'", "random(0)")
+  end
+
+  def test_random_with_non_integer_limit
+    assert_error_message("Expected $limit to be an integer but got 1.5 for `random'", "random(1.5)")
+  end
+
+  # This could *possibly* fail, but exceedingly unlikely
+  def test_random_is_semi_unique
+    if Sass::Script::Functions.instance_variable_defined?("@random_number_generator")
+      Sass::Script::Functions.send(:remove_instance_variable, "@random_number_generator")
+    end
+    assert_not_equal evaluate("random()"), evaluate("random()")
+  end
 
   ## Regression Tests
 

data/test/sass/importer_test.rb

@@ -1,11 +1,11 @@
 #!/usr/bin/env ruby
 require File.dirname(__FILE__) + '/../test_helper'
 require File.dirname(__FILE__) + '/test_helper'
-
+require 'mock_importer'
 require 'sass/plugin'
 
 class ImporterTest < Test::Unit::TestCase
-  
+
   class FruitImporter < Sass::Importers::Base
     def find(name, context = nil)
       fruit = parse(name)
@@ -31,7 +31,7 @@ class ImporterTest < Test::Unit::TestCase
       [self.class.name, name]
     end
 
-    def public_url(name)
+    def public_url(name, sourcemap_directory = nil)
       "http://#{parse(name)}.example.com/style.scss"
     end
 
@@ -42,6 +42,18 @@ class ImporterTest < Test::Unit::TestCase
     end
   end
 
+  class NoPublicUrlImporter < FruitImporter
+    def public_url(name, sourcemap_directory = nil)
+      nil
+    end
+
+    private
+
+    def parse(name)
+      name[%r{ephemeral/(\w+)(\.s[ac]ss)?}, 1]
+    end
+  end
+
   # This class proves that you can override the extension scheme for importers
   class ReversedExtImporter < Sass::Importers::Filesystem
     def extensions
@@ -207,15 +219,61 @@ SCSS
 "version": 3,
 "mappings": "AAAA,QAAS;EACP,KAAK,EAAE,IAAI",
 "sources": ["http://orange.example.com/style.scss"],
+"names": [],
 "file": "css_uri"
 }
 JSON
   end
 
+  def test_source_map_with_only_css_uri_can_have_no_public_url_without_warning
+    ephemeral_importer = NoPublicUrlImporter.new
+    mock_importer = MockImporter.new
+    def mock_importer.public_url(name, sourcemap_directory = nil)
+      "css_uri"
+    end
+
+    options = {
+      :filename => filename_for_test,
+      :sourcemap_filename => sourcemap_filename_for_test,
+      :importer => mock_importer,
+      :syntax => :scss,
+      :load_paths => [ephemeral_importer],
+      :cache => false
+    }
+
+    engine = Sass::Engine.new(<<SCSS, options)
+@import "ephemeral/orange";
+.orange {
+  @include orange;
+}
+SCSS
+
+    assert_warning("") do
+      css_output, sourcemap = engine.render_with_sourcemap('sourcemap_uri')
+      assert_equal <<CSS.strip, css_output.strip
+.orange {
+  color: orange; }
+
+/*# sourceMappingURL=sourcemap_uri */
+CSS
+      map = sourcemap.to_json(:css_uri => 'css_uri')
+      assert_equal <<JSON.strip, map
+{
+"version": 3,
+"mappings": "AACA,OAAQ",
+"sources": ["css_uri"],
+"names": [],
+"file": "css_uri"
+}
+JSON
+    end
+  end
+
   def test_source_map_with_only_css_uri_doesnt_support_filesystem_importer
     file_system_importer = Sass::Importers::Filesystem.new('.')
     options = {
       :filename => filename_for_test(:scss),
+      :sourcemap_filename => sourcemap_filename_for_test,
       :importer => file_system_importer,
       :syntax => :scss
     }
@@ -229,7 +287,6 @@ SCSS
     assert_warning(<<WARNING) {sourcemap.to_json(:css_uri => 'css_uri')}
 WARNING: Couldn't determine public URL for "#{filename_for_test(:scss)}" while generating sourcemap.
   Without a public URL, there's nothing for the source map to link to.
-  Custom importers should define the #public_url method.
 WARNING
   end
 
@@ -237,6 +294,7 @@ WARNING
     file_system_importer = Sass::Importers::Filesystem.new('.')
     options = {
       :filename => filename_for_test(:scss),
+      :sourcemap_filename => sourcemap_filename_for_test,
       :importer => file_system_importer,
       :syntax => :scss
     }
@@ -250,14 +308,16 @@ SCSS
     assert_warning(<<WARNING) {sourcemap.to_json(:css_uri => 'css_uri', :css_path => 'css_path')}
 WARNING: Couldn't determine public URL for "#{filename_for_test(:scss)}" while generating sourcemap.
   Without a public URL, there's nothing for the source map to link to.
-  Custom importers should define the #public_url method.
 WARNING
   end
 
   def test_source_map_with_css_uri_and_sourcemap_path_supports_filesystem_importer
     file_system_importer = Sass::Importers::Filesystem.new('.')
+    css_uri = 'css_uri'
+    sourcemap_path = 'map/style.map'
     options = {
       :filename => 'sass/style.scss',
+      :sourcemap_filename => sourcemap_path,
       :importer => file_system_importer,
       :syntax => :scss
     }
@@ -270,13 +330,12 @@ SCSS
 
 
     rendered, sourcemap = engine.render_with_sourcemap('http://map.example.com/map/style.map')
-    css_uri = 'css_uri'
-    sourcemap_path = 'map/style.map'
     assert_equal <<JSON.strip, sourcemap.to_json(:css_uri => css_uri, :sourcemap_path => sourcemap_path)
 {
 "version": 3,
 "mappings": "AAAA,IAAK;EAAC,CAAC,EAAE,CAAC",
 "sources": ["../sass/style.scss"],
+"names": [],
 "file": "css_uri"
 }
 JSON
@@ -284,8 +343,12 @@ JSON
 
   def test_source_map_with_css_path_and_sourcemap_path_supports_file_system_importer
     file_system_importer = Sass::Importers::Filesystem.new('.')
+    sass_path = 'sass/style.scss'
+    css_path = 'static/style.css'
+    sourcemap_path = 'map/style.map'
     options = {
-      :filename => 'sass/style.scss',
+      :filename => sass_path,
+      :sourcemap_filename => sourcemap_path,
       :importer => file_system_importer,
       :syntax => :scss
     }
@@ -295,13 +358,12 @@ JSON
 SCSS
 
     _, sourcemap = engine.render_with_sourcemap('http://map.example.com/map/style.map')
-    css_path = 'static/style.css'
-    sourcemap_path = 'map/style.map'
     assert_equal <<JSON.strip, sourcemap.to_json(:css_path => css_path, :sourcemap_path => sourcemap_path)
 {
 "version": 3,
 "mappings": "AAAA,IAAK;EAAC,CAAC,EAAE,CAAC",
 "sources": ["../sass/style.scss"],
+"names": [],
 "file": "../static/style.css"
 }
 JSON