sass 3.3.14 → 3.4.0.rc.1

data/test/sass/importer_test.rb

@@ -4,7 +4,7 @@ require File.dirname(__FILE__) + '/test_helper'
 require 'mock_importer'
 require 'sass/plugin'
 
-class ImporterTest < Test::Unit::TestCase
+class ImporterTest < MiniTest::Test
 
   class FruitImporter < Sass::Importers::Base
     def find(name, context = nil)
@@ -225,11 +225,11 @@ SCSS
 JSON
   end
 
-  def test_source_map_with_only_css_uri_can_have_no_public_url_without_warning
+  def test_source_map_with_only_css_uri_can_have_no_public_url
     ephemeral_importer = NoPublicUrlImporter.new
     mock_importer = MockImporter.new
     def mock_importer.public_url(name, sourcemap_directory = nil)
-      "css_uri"
+      "source_uri"
     end
 
     options = {
@@ -248,28 +248,26 @@ JSON
 }
 SCSS
 
-    assert_warning("") do
-      css_output, sourcemap = engine.render_with_sourcemap('sourcemap_uri')
-      assert_equal <<CSS.strip, css_output.strip
+    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
+    map = sourcemap.to_json(:css_uri => 'css_uri')
+    assert_equal <<JSON.strip, map
 {
 "version": 3,
 "mappings": "AACA,OAAQ",
-"sources": ["css_uri"],
+"sources": ["source_uri"],
 "names": [],
 "file": "css_uri"
 }
 JSON
-    end
   end
 
-  def test_source_map_with_only_css_uri_doesnt_support_filesystem_importer
+  def test_source_map_with_only_css_uri_falls_back_to_file_uris
     file_system_importer = Sass::Importers::Filesystem.new('.')
     options = {
       :filename => filename_for_test(:scss),
@@ -284,13 +282,19 @@ SCSS
 
     _, sourcemap = engine.render_with_sourcemap('http://1.example.com/style.map')
 
-    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.
-WARNING
+    uri = Sass::Util.file_uri_from_path(Sass::Util.absolute_path(filename_for_test(:scss)))
+    assert_equal <<JSON.strip, sourcemap.to_json(:css_uri => 'css_uri')
+{
+"version": 3,
+"mappings": "AAAA,IAAK;EAAC,CAAC,EAAE,CAAC",
+"sources": ["#{uri}"],
+"names": [],
+"file": "css_uri"
+}
+JSON
   end
 
-  def test_source_map_with_css_uri_and_css_path_doesnt_support_filesystem_importer
+  def test_source_map_with_css_uri_and_css_path_falls_back_to_file_uris
     file_system_importer = Sass::Importers::Filesystem.new('.')
     options = {
       :filename => filename_for_test(:scss),
@@ -305,10 +309,16 @@ SCSS
 
     _, sourcemap = engine.render_with_sourcemap('http://1.example.com/style.map')
 
-    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.
-WARNING
+    uri = Sass::Util.file_uri_from_path(Sass::Util.absolute_path(filename_for_test(:scss)))
+    assert_equal <<JSON.strip, sourcemap.to_json(:css_uri => 'css_uri', :css_path => 'css_path')
+{
+"version": 3,
+"mappings": "AAAA,IAAK;EAAC,CAAC,EAAE,CAAC",
+"sources": ["#{uri}"],
+"names": [],
+"file": "css_uri"
+}
+JSON
   end
 
   def test_source_map_with_css_uri_and_sourcemap_path_supports_filesystem_importer
@@ -397,6 +407,6 @@ MESSAGE
 
   def test_absolute_files_across_template_locations
     importer = Sass::Importers::Filesystem.new(absolutize 'templates')
-    assert_not_nil importer.mtime(absolutize('more_templates/more1.sass'), {})
+    refute_nil importer.mtime(absolutize('more_templates/more1.sass'), {})
   end
 end

data/test/sass/logger_test.rb

@@ -2,7 +2,7 @@
 require File.dirname(__FILE__) + '/../test_helper'
 require 'pathname'
 
-class LoggerTest < Test::Unit::TestCase
+class LoggerTest < MiniTest::Test
 
   class InterceptedLogger < Sass::Logger::Base
 

data/test/sass/more_results/more_import.css

@@ -24,6 +24,6 @@ body { font: Arial; background: blue; }
 #content.user.show #container.top #column.right { width: 600px; }
 #content.user.show #container.bottom { background: brown; }
 
-#foo { background-color: #bbaaff; }
+#foo { background-color: #baf; }
 
 nonimported { myconst: hello; otherconst: goodbye; post-mixin: here; }

data/test/sass/plugin_test.rb

@@ -17,7 +17,7 @@ module Sass::Script::Functions
   end
 end
 
-class SassPluginTest < Test::Unit::TestCase
+class SassPluginTest < MiniTest::Test
   @@templates = %w{
     complex script parent_ref import scss_import alt
     subdir/subdir subdir/nested_subdir/nested_subdir
@@ -113,7 +113,7 @@ class SassPluginTest < Test::Unit::TestCase
     File.open(tempfile_loc('bork1')) do |file|
       assert_equal(<<CSS.strip, file.read.split("\n")[0...6].join("\n"))
 /*
-Syntax error: Undefined variable: "$bork".
+Error: Undefined variable: "$bork".
         on line 2 of #{template_loc('bork1')}
 
 1: bork
@@ -129,7 +129,7 @@ CSS
     File.open(tempfile_loc('bork5')) do |file|
       assert_equal(<<CSS.strip, file.read.split("\n")[0...7].join("\n"))
 /*
-Syntax error: Undefined variable: "$bork".
+Error: Undefined variable: "$bork".
         on line 3 of #{template_loc('bork5')}
 
 1: bork
@@ -146,7 +146,7 @@ CSS
     File.open(tempfile_loc('single_import_loop')) do |file|
       assert_equal(<<CSS.strip, file.read.split("\n")[0...2].join("\n"))
 /*
-Syntax error: An @import loop has been found: #{template_loc('single_import_loop')} imports itself
+Error: An @import loop has been found: #{template_loc('single_import_loop')} imports itself
 CSS
     end
   end
@@ -157,9 +157,9 @@ CSS
     File.open(tempfile_loc('double_import_loop1')) do |file|
       assert_equal(<<CSS.strip, file.read.split("\n")[0...4].join("\n"))
 /*
-Syntax error: An @import loop has been found:
-                  #{template_loc('double_import_loop1')} imports #{template_loc('_double_import_loop2')}
-                  #{template_loc('_double_import_loop2')} imports #{template_loc('double_import_loop1')}
+Error: An @import loop has been found:
+           #{template_loc('double_import_loop1')} imports #{template_loc('_double_import_loop2')}
+           #{template_loc('_double_import_loop2')} imports #{template_loc('double_import_loop1')}
 CSS
     end
   end
@@ -170,8 +170,8 @@ CSS
     File.open(tempfile_loc('subdir/import_up1')) do |file|
       assert_equal(<<CSS.strip, file.read.split("\n")[0...5].join("\n"))
 /*
-Syntax error: File to import not found or unreadable: ../subdir/import_up3.scss.
-              Load path: #{template_loc}
+Error: File to import not found or unreadable: ../subdir/import_up3.scss.
+       Load path: #{template_loc}
         on line 1 of #{template_loc 'subdir/import_up2'}
         from line 1 of #{template_loc 'subdir/import_up1'}
 CSS
@@ -183,7 +183,7 @@ CSS
     Sass::Plugin.options[:full_exception] = false
 
     File.delete(tempfile_loc('bork1'))
-    assert_raise(Sass::SyntaxError) {check_for_updates!}
+    assert_raises(Sass::SyntaxError) {check_for_updates!}
   ensure
     Sass::Plugin.options[:full_exception] = old_full_exception
   end
@@ -537,7 +537,8 @@ WARNING
       :always_update => true,
       :never_update => false,
       :full_exception => true,
-      :cache_store => @@cache_store
+      :cache_store => @@cache_store,
+      :sourcemap => :none
     )
     Sass::Plugin.options.merge!(overrides)
   end

data/test/sass/results/compact.css

@@ -1,4 +1,4 @@
-#main { width: 15em; color: blue; }
+#main { width: 15em; color: #0000ff; }
 #main p { border-style: dotted; /* Nested comment More nested stuff */ border-width: 2px; }
 #main .cool { width: 100px; }
 

data/test/sass/results/complex.css

@@ -1,4 +1,4 @@
-body { margin: 0; font: 0.85em "Lucida Grande", "Trebuchet MS", Verdana, sans-serif; color: white; background: url(/images/global_bg.gif); }
+body { margin: 0; font: 0.85em "Lucida Grande", "Trebuchet MS", Verdana, sans-serif; color: #fff; background: url(/images/global_bg.gif); }
 
 #page { width: 900px; margin: 0 auto; background: #440008; border-top-width: 5px; border-top-style: solid; border-top-color: #ff8500; }
 
@@ -16,8 +16,8 @@ body { margin: 0; font: 0.85em "Lucida Grande", "Trebuchet MS", Verdana, sans-se
 
 #menu { clear: both; text-align: right; height: 20px; border-bottom: 5px solid #006b95; background: #00a4e4; }
 #menu .contests ul { margin: 0 5px 0 0; padding: 0; }
-#menu .contests ul li { list-style-type: none; margin: 0 5px; padding: 5px 5px 0 5px; display: inline; font-size: 1.1em; color: white; background: #00a4e4; }
-#menu .contests a:link, #menu .contests a:visited { color: white; text-decoration: none; font-weight: bold; }
+#menu .contests ul li { list-style-type: none; margin: 0 5px; padding: 5px 5px 0 5px; display: inline; font-size: 1.1em; color: #fff; background: #00a4e4; }
+#menu .contests a:link, #menu .contests a:visited { color: #fff; text-decoration: none; font-weight: bold; }
 #menu .contests a:hover { text-decoration: underline; }
 
 #content { clear: both; }
@@ -81,6 +81,6 @@ body { margin: 0; font: 0.85em "Lucida Grande", "Trebuchet MS", Verdana, sans-se
 
 img { border: none; }
 
-button.short { width: 60px; height: 22px; padding: 0 0 2px 0; color: white; border: none; background: url(/images/btn_short.gif) no-repeat; }
+button.short { width: 60px; height: 22px; padding: 0 0 2px 0; color: #fff; border: none; background: url(/images/btn_short.gif) no-repeat; }
 
 table { border-collapse: collapse; }

data/test/sass/results/expanded.css

@@ -1,6 +1,6 @@
 #main {
   width: 15em;
-  color: blue;
+  color: #0000ff;
 }
 #main p {
   border-style: dotted;

data/test/sass/results/import.css

@@ -26,6 +26,6 @@ body { font: Arial; background: blue; }
 #content.user.show #container.top #column.right { width: 600px; }
 #content.user.show #container.bottom { background: brown; }
 
-#foo { background-color: #bbaaff; }
+#foo { background-color: #baf; }
 
 nonimported { myconst: hello; otherconst: goodbye; post-mixin: here; }

data/test/sass/results/import_charset_ibm866.css

@@ -1,5 +1,5 @@
-@charset "IBM866";
+@charset "UTF-8";
 @import url(foo.css);
 .foo { a: b; }
 
-.bar { a: �; }
+.bar { a: щ; }

data/test/sass/results/mixins.css

@@ -1,12 +1,12 @@
 #main {
   width: 15em;
-  color: blue;
+  color: #0000ff;
 }
 #main p {
   border-top-width: 2px;
-  border-top-color: #ffcc00;
+  border-top-color: #fc0;
   border-left-width: 1px;
-  border-left-color: black;
+  border-left-color: #000;
   -moz-border-radius: 10px;
   border-style: dotted;
   border-width: 2px;
@@ -17,9 +17,9 @@
 
 #left {
   border-top-width: 2px;
-  border-top-color: #ffcc00;
+  border-top-color: #fc0;
   border-left-width: 1px;
-  border-left-color: black;
+  border-left-color: #000;
   -moz-border-radius: 10px;
   font-size: 2em;
   font-weight: bold;
@@ -28,25 +28,25 @@
 
 #right {
   border-top-width: 2px;
-  border-top-color: #ffcc00;
+  border-top-color: #fc0;
   border-left-width: 1px;
-  border-left-color: black;
+  border-left-color: #000;
   -moz-border-radius: 10px;
-  color: red;
+  color: #f00;
   font-size: 20px;
   float: right;
 }
 
 .bordered {
   border-top-width: 2px;
-  border-top-color: #ffcc00;
+  border-top-color: #fc0;
   border-left-width: 1px;
-  border-left-color: black;
+  border-left-color: #000;
   -moz-border-radius: 10px;
 }
 
 .complex {
-  color: red;
+  color: #f00;
   font-size: 20px;
   text-decoration: none;
 }
@@ -59,12 +59,12 @@
 }
 * html .complex {
   height: 1px;
-  color: red;
+  color: #f00;
   font-size: 20px;
 }
 
 .more-complex {
-  color: red;
+  color: #f00;
   font-size: 20px;
   text-decoration: none;
   display: inline;
@@ -80,16 +80,16 @@
 }
 * html .more-complex {
   height: 1px;
-  color: red;
+  color: #f00;
   font-size: 20px;
 }
 .more-complex a:hover {
   text-decoration: underline;
-  color: red;
+  color: #f00;
   font-size: 20px;
   border-top-width: 2px;
-  border-top-color: #ffcc00;
+  border-top-color: #fc0;
   border-left-width: 1px;
-  border-left-color: black;
+  border-left-color: #000;
   -moz-border-radius: 10px;
 }

data/test/sass/results/nested.css

@@ -1,6 +1,6 @@
 #main {
   width: 15em;
-  color: blue; }
+  color: #0000ff; }
   #main p {
     border-style: dotted;
     /* Nested comment

data/test/sass/results/parent_ref.css

@@ -1,5 +1,5 @@
-a { color: black; }
-a:hover { color: red; }
+a { color: #000; }
+a:hover { color: #f00; }
 
 p, div { width: 100em; }
 p foo, div foo { width: 10em; }

data/test/sass/results/script.css

@@ -1,7 +1,7 @@
-#main { content: Hello\!; qstr: 'Quo"ted"!'; hstr: Hyph-en\!; width: 30em; background-color: black; color: #ffffaa; short-color: #112233; named-color: olive; con: "foo" bar 9 hi there "boom"; con2: "noquo" quo; }
-#main #sidebar { background-color: #00ff98; num-normal: 10; num-dec: 10.2; num-dec0: 99; num-neg: -10; esc: 10 \+12; many: 6; order: 7; complex: #4c9db1hi16; }
+#main { content: Hello\!; qstr: 'Quo"ted"!'; hstr: Hyph-en\!; width: 30em; background-color: #000; color: #ffa; short-color: #123; named-color: olive; con: "foo" bar 9 hi there "boom"; con2: "noquo" quo; }
+#main #sidebar { background-color: #00ff98; num-normal: 10; num-dec: 10.2; num-dec0: 99; num-neg: -10; esc: 10\+12; many: 6; order: 7; complex: #4c9db1hi16; }
 
-#plus { num-num: 7; num-num-un: 25em; num-num-un2: 23em; num-num-neg: 9.87; num-str: 100px; num-col: #b7b7b7; num-perc: 31%; str-str: "hi\ there"; str-str2: "hi there"; str-col: "14em solid #112233"; str-num: "times: 13"; col-num: #ff7b9d; col-col: #5173ff; }
+#plus { num-num: 7; num-num-un: 25em; num-num-un2: 23em; num-num-neg: 9.87; num-str: 100px; num-col: #b7b7b7; num-perc: 31%; str-str: "hi there"; str-str2: "hi there"; str-col: "14em solid #123"; str-num: "times: 13"; col-num: #ff7b9d; col-col: #5173ff; }
 
 #minus { num-num: 900; col-num: #f9f9f4; col-col: #000035; unary-num: -1; unary-const: 10; unary-paren: -11; unary-two: 12; unary-many: 12; unary-crazy: -15; }
 

data/test/sass/results/scss_import.css

@@ -26,6 +26,6 @@ body { font: Arial; background: blue; }
 #content.user.show #container.top #column.right { width: 600px; }
 #content.user.show #container.bottom { background: brown; }
 
-#foo { background-color: #bbaaff; }
+#foo { background-color: #baf; }
 
 nonimported { myconst: hello; otherconst: goodbye; post-mixin: here; }

data/test/sass/script_conversion_test.rb

@@ -3,7 +3,7 @@
 require File.dirname(__FILE__) + '/../test_helper'
 require 'sass/engine'
 
-class SassScriptConversionTest < Test::Unit::TestCase
+class SassScriptConversionTest < MiniTest::Test
   def test_bool
     assert_renders "true"
     assert_renders "false"
@@ -13,9 +13,8 @@ class SassScriptConversionTest < Test::Unit::TestCase
     assert_renders "#abcdef"
     assert_renders "blue"
     assert_renders "rgba(0, 1, 2, 0.2)"
-
-    assert_equal "#aabbcc", render("#abc")
-    assert_equal "blue", render("#0000ff")
+    assert_renders "#abc"
+    assert_renders "#0000ff"
   end
 
   def test_number
@@ -109,6 +108,10 @@ class SassScriptConversionTest < Test::Unit::TestCase
     assert_renders "(foo: (bar, baz), bip: bop)"
   end
 
+  def test_selector
+    assert_renders "&"
+  end
+
   def self.test_precedence(outer, inner)
     op_outer = Sass::Script::Lexer::OPERATORS_REVERSE[outer]
     op_inner = Sass::Script::Lexer::OPERATORS_REVERSE[inner]

data/test/sass/script_test.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- coding: utf-8 -*-
 require File.dirname(__FILE__) + '/../test_helper'
 require 'sass/engine'
 
@@ -17,7 +18,7 @@ module Sass::Script::Functions
   include Sass::Script::Functions::UserFunctions
 end
 
-class SassScriptTest < Test::Unit::TestCase
+class SassScriptTest < MiniTest::Test
   include Sass::Script
 
   def test_color_checks_input
@@ -33,18 +34,43 @@ class SassScriptTest < Test::Unit::TestCase
   def test_string_escapes
     assert_equal "'", resolve("\"'\"")
     assert_equal '"', resolve("\"\\\"\"")
-    assert_equal "\\\\", resolve("\"\\\\\"")
-    assert_equal "\\02fa", resolve("\"\\02fa\"")
-
-    assert_equal "'", resolve("'\\''")
-    assert_equal '"', resolve("'\"'")
-    assert_equal "\\\\", resolve("'\\\\'")
-    assert_equal "\\02fa", resolve("'\\02fa'")
+    assert_equal "\\", resolve("\"\\\\\"")
+    assert_equal "☃", resolve("\"\\2603\"")
+    assert_equal "☃f", resolve("\"\\2603 f\"")
+    assert_equal "☃x", resolve("\"\\2603x\"")
+    assert_equal "\\2603", resolve("\"\\\\2603\"")
+
+    # U+FFFD is the replacement character, "�".
+    assert_equal [0xFFFD].pack("U"), resolve("\"\\0\"")
+    assert_equal [0xFFFD].pack("U"), resolve("\"\\FFFFFF\"")
+    assert_equal [0xFFFD].pack("U"), resolve("\"\\D800\"")
+    assert_equal [0xD7FF].pack("U"), resolve("\"\\D7FF\"")
+    assert_equal [0xFFFD].pack("U"), resolve("\"\\DFFF\"")
+    assert_equal [0xE000].pack("U"), resolve("\"\\E000\"")
+  end
+
+  def test_string_escapes_are_resolved_before_operators
+    assert_equal "true", resolve('"abc" == "\61\62\63"')
+  end
+
+  def test_string_quote
+    assert_equal '"foo"', resolve_quoted('"foo"')
+    assert_equal "'f\"oo'", resolve_quoted('"f\"oo"')
+    assert_equal "\"f'oo\"", resolve_quoted("'f\\'oo'")
+    assert_equal "\"f'o\\\"o\"", resolve_quoted("'f\\'o\"o'")
+    assert_equal '"foo bar"', resolve_quoted('"foo\20 bar"')
+    assert_equal '"foo\a bar"', resolve_quoted('"foo\a bar"')
+    assert_equal '"x\ay"', resolve_quoted('"x\a y"')
+    assert_equal '"\a  "', resolve_quoted('"\a\20"')
+    assert_equal '"\a abcdef"', resolve_quoted('"\a abcdef"')
+    assert_equal '"☃abcdef"', resolve_quoted('"\2603 abcdef"')
+    assert_equal '"\\\\"', resolve_quoted('"\\\\"')
+    assert_equal '"foobar"', resolve_quoted("\"foo\\\nbar\"")
   end
 
   def test_color_names
     assert_equal "white", resolve("white")
-    assert_equal "white", resolve("#ffffff")
+    assert_equal "#ffffff", resolve("#ffffff")
     assert_equal "#fffffe", resolve("white - #000001")
     assert_equal "transparent", resolve("transparent")
     assert_equal "transparent", resolve("rgba(0, 0, 0, 0)")
@@ -93,7 +119,7 @@ class SassScriptTest < Test::Unit::TestCase
     assert_equal "#123", resolve("#112233", :style => :compressed)
     assert_equal "#000", resolve("black", :style => :compressed)
     assert_equal "red", resolve("#f00", :style => :compressed)
-    assert_equal "blue", resolve("#00f", :style => :compressed)
+    assert_equal "blue", resolve("blue", :style => :compressed)
     assert_equal "navy", resolve("#000080", :style => :compressed)
     assert_equal "navy #fff", resolve("#000080 white", :style => :compressed)
     assert_equal "This color is #fff", resolve('"This color is #{ white }"', :style => :compressed)
@@ -255,8 +281,8 @@ SASS
     assert_equal eval('1 2 3.0'), eval('1 2 3')
     assert_equal eval('1, 2, 3.0'), eval('1, 2, 3')
     assert_equal eval('(1 2), (3, 4), (5 6)'), eval('(1 2), (3, 4), (5 6)')
-    assert_not_equal eval('1, 2, 3'), eval('1 2 3')
-    assert_not_equal eval('1'), eval('"1"')
+    refute_equal eval('1, 2, 3'), eval('1 2 3')
+    refute_equal eval('1'), eval('"1"')
   end
 
   def test_booleans
@@ -430,6 +456,36 @@ SASS
     assert_equal "true", resolve("1.1cm == 11mm")
   end
 
+  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)")
+  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 "360", resolve("(1turn/1deg)")
+  end
+
+  def test_time_units
+    assert_equal "1000", resolve("(1s/1ms)")
+  end
+
+  def test_frequency_units
+    assert_equal "0.001", resolve("(1Hz/1kHz)")
+  end
+
+  def test_resolution_units
+    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
     assert_equal "Options defined!", resolve("assert_options(1 + 1)")
     assert_equal "Options defined!", resolve("assert_options('bar' + 'baz')")
@@ -462,22 +518,22 @@ SASS
     assert_equal "0.5", resolve("$var", {}, env("var" => eval("1px/2px")))
   end
 
-  def test_colors_with_wrong_number_of_digits
-    assert_raise_message(Sass::SyntaxError,
-      "Colors must have either three or six digits: '#0'") {eval("#0")}
+  def test_non_ident_colors_with_wrong_number_of_digits
     assert_raise_message(Sass::SyntaxError,
-      "Colors must have either three or six digits: '#12'") {eval("#12")}
+      'Invalid CSS after "": expected expression (e.g. 1px, bold), was "#1"') {eval("#1")}
     assert_raise_message(Sass::SyntaxError,
-      "Colors must have either three or six digits: '#abcd'") {eval("#abcd")}
+      'Invalid CSS after "": expected expression (e.g. 1px, bold), was "#12"') {eval("#12")}
     assert_raise_message(Sass::SyntaxError,
-      "Colors must have either three or six digits: '#abcdE'") {eval("#abcdE")}
+      'Invalid CSS after "": expected expression (e.g. 1px, bold), was "#1234"') {eval("#1234")}
     assert_raise_message(Sass::SyntaxError,
-      "Colors must have either three or six digits: '#abcdEFA'") {eval("#abcdEFA")}
+      'Invalid CSS after "": expected expression (e.g. 1px, bold), was "#12345"') {eval("#12345")}
+    assert_raise_message(Sass::SyntaxError, 'Invalid CSS after "": expected expression (e.g. ' \
+      '1px, bold), was "#1234567"') {eval("#1234567")}
   end
 
   def test_case_insensitive_color_names
-    assert_equal "blue", resolve("BLUE")
-    assert_equal "red", resolve("rEd")
+    assert_equal "BLUE", resolve("BLUE")
+    assert_equal "rEd", resolve("rEd")
     assert_equal "#7f4000", resolve("mix(GrEeN, ReD)")
   end
 
@@ -523,7 +579,7 @@ SASS
     assert_raise_message(Sass::SyntaxError, 'Duplicate key 2px in map (2px: bar, 1px + 1px: baz).') do
       eval("(2px: bar, 1px + 1px: baz)")
     end
-    assert_raise_message(Sass::SyntaxError, 'Duplicate key #0000ff in map (blue: bar, blue: baz).') do
+    assert_raise_message(Sass::SyntaxError, 'Duplicate key #0000ff in map (blue: bar, #00f: baz).') do
       eval("(blue: bar, #00f: baz)")
     end
   end
@@ -558,7 +614,7 @@ SASS
     return if RUBY_PLATFORM =~ /java/
 
     # Don't validate the message; it's different on Rubinius.
-    assert_raise(ArgumentError) {resolve("arg-error()")}
+    assert_raises(ArgumentError) {resolve("arg-error()")}
   end
 
   def test_shallow_argument_error_unwrapped
@@ -570,49 +626,25 @@ SASS
     assert_equal "true", resolve("$ie or $undef", {}, env('ie' => Sass::Script::Value::Bool.new(true)))
   end
 
-  def test_setting_global_variable_locally_warns
-    assert_warning(<<WARNING) {assert_equal(<<CSS, render(<<SCSS, :syntax => :scss))}
-DEPRECATION WARNING on line 4 of test_setting_global_variable_locally_warns_inline.scss:
-Assigning to global variable "$var" by default is deprecated.
-In future versions of Sass, this will create a new local variable.
-If you want to assign to the global variable, use "$var: x !global" instead.
-Note that this will be incompatible with Sass 3.2.
-WARNING
-.foo {
-  a: x; }
-
-.bar {
-  b: x; }
-CSS
-$var: 1;
-
-.foo {
-  $var: x;
-  a: $var;
-}
-
-.bar {
-  b: $var;
-}
-SCSS
-  end
+  def test_selector
+    env = Sass::Environment.new
+    assert_equal "true", resolve("& == null", {}, env)
 
-  def test_setting_global_variable_locally_warns_only_once
-    assert_warning(<<WARNING) {assert_equal(<<CSS, render(<<SCSS, :syntax => :scss))}
-DEPRECATION WARNING on line 3 of test_setting_global_variable_locally_warns_only_once_inline.scss:
-Assigning to global variable "$var" by default is deprecated.
-In future versions of Sass, this will create a new local variable.
-If you want to assign to the global variable, use "$var: x !global" instead.
-Note that this will be incompatible with Sass 3.2.
-WARNING
-CSS
-$var: 1;
+    env.selector = selector('.foo.bar .baz.bang, .bip.bop')
+    assert_equal ".foo.bar .baz.bang, .bip.bop", resolve("&", {}, env)
+    assert_equal ".foo.bar .baz.bang", resolve("nth(&, 1)", {}, env)
+    assert_equal ".bip.bop", resolve("nth(&, 2)", {}, env)
+    assert_equal ".foo.bar", resolve("nth(nth(&, 1), 1)", {}, env)
+    assert_equal ".baz.bang", resolve("nth(nth(&, 1), 2)", {}, env)
+    assert_equal ".bip.bop", resolve("nth(nth(&, 2), 1)", {}, env)
+    assert_equal "string", resolve("type-of(nth(nth(&, 1), 1))", {}, env)
 
-@mixin foo {$var: x}
-@include foo;
-@include foo;
-@include foo;
-SCSS
+    env.selector = selector('.foo > .bar')
+    assert_equal ".foo > .bar", resolve("&", {}, env)
+    assert_equal ".foo > .bar", resolve("nth(&, 1)", {}, env)
+    assert_equal ".foo", resolve("nth(nth(&, 1), 1)", {}, env)
+    assert_equal ">", resolve("nth(nth(&, 1), 2)", {}, env)
+    assert_equal ".bar", resolve("nth(nth(&, 1), 3)", {}, env)
   end
 
   def test_setting_global_variable_globally
@@ -637,7 +669,7 @@ $var: 2;
 SCSS
   end
 
-  def test_setting_global_variable_with_flag
+  def test_setting_global_variable_locally
     assert_no_warning {assert_equal(<<CSS, render(<<SCSS, :syntax => :scss))}
 .bar {
   a: x;
@@ -663,7 +695,7 @@ $var3: 3;
 SCSS
   end
 
-  def test_setting_global_variable_with_flag_and_default
+  def test_setting_global_variable_locally_with_default
     assert_equal(<<CSS, render(<<SCSS, :syntax => :scss))
 .bar {
   a: 1;
@@ -688,21 +720,104 @@ $var1: 1;
 SCSS
   end
 
-  def test_unclosed_special_fun
-    assert_raise_message(Sass::SyntaxError, 'Invalid CSS after "calc(foo()": expected ")", was ""') do
-      resolve("calc(foo()")
-    end
-    assert_raise_message(Sass::SyntaxError, 'Invalid CSS after "calc(#{\')\'}": expected ")", was ""') do
-      resolve("calc(\#{')'}")
-    end
-    assert_raise_message(Sass::SyntaxError, 'Invalid CSS after "calc(#{foo": expected "}", was ""') do
-      resolve("calc(\#{foo")
-    end
+  def test_setting_local_variable
+    assert_equal(<<CSS, render(<<SCSS, :syntax => :scss))
+.a {
+  value: inside; }
+
+.b {
+  value: outside; }
+CSS
+$var: outside;
+
+.a {
+  $var: inside;
+  value: $var;
+}
+
+.b {
+  value: $var;
+}
+SCSS
+  end
+
+  def test_setting_local_variable_from_inner_scope
+    assert_equal(<<CSS, render(<<SCSS, :syntax => :scss))
+.a .b {
+  value: inside; }
+.a .c {
+  value: inside; }
+CSS
+.a {
+  $var: outside;
+
+  .b {
+    $var: inside;
+    value: $var;
+  }
+
+  .c {
+    value: $var;
+  }
+}
+SCSS
+  end
+
+  def test_color_format_is_preserved_by_default
+    assert_equal "blue", resolve("blue")
+    assert_equal "bLuE", resolve("bLuE")
+    assert_equal "#00f", resolve("#00f")
+    assert_equal "blue #00F", resolve("blue #00F")
+    assert_equal "blue", resolve("nth(blue #00F, 1)")
+    assert_equal "#00F", resolve("nth(blue #00F, 2)")
   end
 
-  def test_special_fun_with_interpolation
-    assert_equal "calc())", resolve("calc(\#{')'})")
-    assert_equal "calc(# {foo})", resolve("calc(# {foo})")
+  def test_color_format_isnt_always_preserved_in_compressed_style
+    assert_equal "red", resolve("red", :style => :compressed)
+    assert_equal "red", resolve("#f00", :style => :compressed)
+    assert_equal "red red", resolve("red #f00", :style => :compressed)
+    assert_equal "red", resolve("nth(red #f00, 2)", :style => :compressed)
+  end
+
+  def test_color_format_is_sometimes_preserved_in_compressed_style
+    assert_equal "ReD", resolve("ReD", :style => :compressed)
+    assert_equal "blue", resolve("blue", :style => :compressed)
+    assert_equal "#00f", resolve("#00f", :style => :compressed)
+  end
+
+  def test_color_format_isnt_preserved_when_modified
+    assert_equal "magenta", resolve("#f00 + #00f")
+  end
+
+  def test_ids
+    assert_equal "#foo", resolve("#foo")
+    assert_equal "#abcd", resolve("#abcd")
+    assert_equal "#abc-def", resolve("#abc-def")
+    assert_equal "#abc_def", resolve("#abc_def")
+    assert_equal "#uvw-xyz", resolve("#uvw-xyz")
+    assert_equal "#uvw_xyz", resolve("#uvw_xyz")
+    assert_equal "#uvwxyz", resolve("#uvw + xyz")
+  end
+
+  def test_scientific_notation
+    assert_equal "2000", resolve("2e3")
+    assert_equal "2000", resolve("2E3")
+    assert_equal "2000", resolve("2e+3")
+    assert_equal "2000em", resolve("2e3em")
+    assert_equal "25000000000", resolve("2.5e10")
+    assert_equal "0.1234", resolve("1234e-4")
+    assert_equal "12.34", resolve("1.234e1")
+  end
+
+  def test_identifier_units
+    assert_equal "5-foo", resolve("2-foo + 3-foo")
+    assert_equal "5-foo-", resolve("2-foo- + 3-foo-")
+    assert_equal "5-\\u2603", resolve("2-\\u2603 + 3-\\u2603")
+  end
+
+  def test_backslash_newline_in_string
+    assert_equal 'foobar', resolve("\"foo\\\nbar\"")
+    assert_equal 'foobar', resolve("'foo\\\nbar'")
   end
 
   # Regression Tests
@@ -714,6 +829,7 @@ SCSS
 
   def test_minus_without_whitespace
     assert_equal "5px", resolve("15px-10px")
+    assert_equal "5px-", resolve("15px--10px-")
   end
 
   def test_minus_preceded_by_comment
@@ -833,6 +949,13 @@ SASS
     val.is_a?(Sass::Script::Value::String) ? val.value : val.to_s
   end
 
+  def resolve_quoted(str, opts = {}, environment = env)
+    munge_filename opts
+    val = eval(str, opts, environment)
+    assert_kind_of Sass::Script::Value::Base, val
+    val.to_s
+  end
+
   def assert_unquoted(str, opts = {}, environment = env)
     munge_filename opts
     val = eval(str, opts, environment)