sass 3.3.0 → 3.4.25

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
@@ -395,8 +405,17 @@ MESSAGE
     File.join(fixture_dir, path)
   end
 
+  def test_filesystem_importer_eql
+    importer = Sass::Importers::Filesystem.new('.')
+    assert importer.eql?(Sass::Importers::Filesystem.new('.'))
+    assert importer.eql?(ReversedExtImporter.new('.'))
+    assert !importer.eql?(Sass::Importers::Filesystem.new('foo'))
+    assert !importer.eql?(nil)
+    assert !importer.eql?('foo')
+  end
+
   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/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

@@ -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
@@ -29,8 +29,8 @@ class SassPluginTest < Test::Unit::TestCase
   @@cache_store = Sass::CacheStores::Memory.new
 
   def setup
-    FileUtils.mkdir_p tempfile_loc
-    FileUtils.mkdir_p tempfile_loc(nil,"more_")
+    Sass::Util.retry_on_windows {FileUtils.mkdir_p tempfile_loc}
+    Sass::Util.retry_on_windows {FileUtils.mkdir_p tempfile_loc(nil,"more_")}
     set_plugin_opts
     check_for_updates!
     reset_mtimes
@@ -39,13 +39,13 @@ class SassPluginTest < Test::Unit::TestCase
   def teardown
     clean_up_sassc
     Sass::Plugin.reset!
-    FileUtils.rm_r tempfile_loc
-    FileUtils.rm_r tempfile_loc(nil,"more_")
+    Sass::Util.retry_on_windows {FileUtils.rm_r tempfile_loc}
+    Sass::Util.retry_on_windows {FileUtils.rm_r tempfile_loc(nil,"more_")}
   end
 
   @@templates.each do |name|
     define_method("test_template_renders_correctly (#{name})") do
-      assert_renders_correctly(name)
+      silence_warnings {assert_renders_correctly(name)}
     end
   end
 
@@ -113,11 +113,11 @@ 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
-2:   :bork $bork
+2:   bork: $bork
 CSS
     end
     File.delete(tempfile_loc('bork1'))
@@ -129,12 +129,12 @@ 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
 2:   /* foo *\\/
-3:   :bork $bork
+3:   bork: $bork
 CSS
     end
     File.delete(tempfile_loc('bork1'))
@@ -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
@@ -209,7 +209,7 @@ CSS
   end
 
   def test_doesnt_render_partials
-    assert !File.exists?(tempfile_loc('_partial'))
+    assert !File.exist?(tempfile_loc('_partial'))
   end
 
   def test_template_location_array
@@ -501,13 +501,15 @@ WARNING
     Sass::Plugin::StalenessChecker.dependencies_cache = {}
     atime = Time.now
     mtime = Time.now - 5
-    Dir["{#{template_loc},#{tempfile_loc}}/**/*.{css,sass,scss}"].each {|f| File.utime(atime, mtime, f)}
+    Dir["{#{template_loc},#{tempfile_loc}}/**/*.{css,sass,scss}"].each do |f|
+      Sass::Util.retry_on_windows {File.utime(atime, mtime, f)}
+    end
   end
 
   def template_loc(name = nil, prefix = nil)
     if name
       scss = absolutize "#{prefix}templates/#{name}.scss"
-      File.exists?(scss) ? scss : absolutize("#{prefix}templates/#{name}.sass")
+      File.exist?(scss) ? scss : absolutize("#{prefix}templates/#{name}.sass")
     else
       absolutize "#{prefix}templates"
     end
@@ -537,7 +539,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,13 +1,13 @@
-#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: #ff7c9e; 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; }
+#minus { num-num: 900; col-num: #fafaf5; col-col: #000035; unary-num: -1; unary-const: 10; unary-paren: -11; unary-two: 12; unary-many: 12; unary-crazy: -15; }
 
 #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: #0b0d0f; comp: 1px; }
+#div { num-num: 3.33333; num-num2: 3.33333; col-num: #092345; col-col: #0b0e10; comp: 1px; }
 
 #mod { num-num: 2; col-col: #0f0e05; col-num: #020001; }
 

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; }