sass 3.4.0 → 3.4.25

data/test/sass/engine_test.rb

@@ -78,7 +78,6 @@ MSG
     "& a\n  :b c" => ["Base-level rules cannot contain the parent-selector-referencing character '&'.", 1],
     "a\n  :b\n    c" => "Illegal nesting: Only properties may be nested beneath properties.",
     "$a: b\n  :c d\n" => "Illegal nesting: Nothing may be nested beneath variable declarations.",
-    "$a: b\n  :c d\n" => "Illegal nesting: Nothing may be nested beneath variable declarations.",
     "@import templates/basic\n  foo" => "Illegal nesting: Nothing may be nested beneath import directives.",
     "foo\n  @import foo.css" => "CSS import directives may only be used at the root of a document.",
     "@if true\n  @import foo" => "Import directives may not be used within control directives or mixins.",
@@ -178,6 +177,8 @@ MSG
     "& foo\n  bar: baz\n  blat: bang" => ["Base-level rules cannot contain the parent-selector-referencing character '&'.", 1],
     "a\n  b: c\n& foo\n  bar: baz\n  blat: bang" => ["Base-level rules cannot contain the parent-selector-referencing character '&'.", 3],
     "@" => "Invalid directive: '@'.",
+    "$r: 20em * #ccc" => ["Cannot multiply a number with units (20em) to a color (#ccc).", 1],
+    "$r: #ccc / 1em" => ["Cannot divide a number with units (1em) to a color (#ccc).", 1],
   }
 
   def teardown
@@ -287,10 +288,10 @@ ERROR
   def test_exception_line
     to_render = <<SASS
 rule
-  :prop val
+  prop: val
   // comment!
 
-  :broken
+  broken:
 SASS
     begin
       Sass::Engine.new(to_render).render
@@ -304,10 +305,10 @@ SASS
   def test_exception_location
     to_render = <<SASS
 rule
-  :prop val
+  prop: val
   // comment!
 
-  :broken
+  broken:
 SASS
     begin
       Sass::Engine.new(to_render, :filename => FAKE_FILE_NAME, :line => (__LINE__-7)).render
@@ -680,7 +681,6 @@ SASS
   def test_nonexistent_import
     assert_raise_message(Sass::SyntaxError, <<ERR.rstrip) do
 File to import not found or unreadable: nonexistent.sass.
-Load path: #{Dir.pwd}
 ERR
       render("@import nonexistent.sass")
     end
@@ -689,7 +689,6 @@ ERR
   def test_nonexistent_extensionless_import
     assert_raise_message(Sass::SyntaxError, <<ERR.rstrip) do
 File to import not found or unreadable: nonexistent.
-Load path: #{Dir.pwd}
 ERR
       render("@import nonexistent")
     end
@@ -750,22 +749,22 @@ SASS
 
   def test_basic_multiline_selector
     assert_equal("#foo #bar,\n#baz #boom {\n  foo: bar; }\n",
-                 render("#foo #bar,\n#baz #boom\n  :foo bar"))
+                 render("#foo #bar,\n#baz #boom\n  foo: bar"))
     assert_equal("#foo #bar,\n#foo #baz {\n  foo: bar; }\n",
-                 render("#foo\n  #bar,\n  #baz\n    :foo bar"))
+                 render("#foo\n  #bar,\n  #baz\n    foo: bar"))
     assert_equal("#foo,\n#bar {\n  foo: bar; }\n  #foo #baz,\n  #bar #baz {\n    foo: bar; }\n",
-                 render("#foo,\n#bar\n  :foo bar\n  #baz\n    :foo bar"))
+                 render("#foo,\n#bar\n  foo: bar\n  #baz\n    foo: bar"))
     assert_equal("#foo #bar, #baz #boom { foo: bar; }\n",
-                 render("#foo #bar,\n#baz #boom\n  :foo bar", :style => :compact))
+                 render("#foo #bar,\n#baz #boom\n  foo: bar", :style => :compact))
                  
     assert_equal("#foo #bar,#baz #boom{foo:bar}\n",
-                 render("#foo #bar,\n#baz #boom\n  :foo bar", :style => :compressed))
+                 render("#foo #bar,\n#baz #boom\n  foo: bar", :style => :compressed))
 
     assert_equal("#foo #bar,\n#baz #boom {\n  foo: bar; }\n",
-                 render("#foo #bar,,\n,#baz #boom,\n  :foo bar"))
+                 render("#foo #bar,,\n,#baz #boom,\n  foo: bar"))
 
     assert_equal("#bip #bop {\n  foo: bar; }\n",
-                 render("#bip #bop,, ,\n  :foo bar"))
+                 render("#bip #bop,, ,\n  foo: bar"))
   end
 
   def test_complex_multiline_selector
@@ -784,7 +783,7 @@ SASS
     end
 
     begin
-      render("a\n  :b c", :property_syntax => :new)
+      silence_warnings {render("a\n  :b c", :property_syntax => :new)}
       assert_equal(2, e.sass_line)
     rescue Sass::SyntaxError => e
       assert_equal("Illegal property syntax: can't use old syntax when :property_syntax => :new is set.",
@@ -807,53 +806,53 @@ SASS
   def test_directive
     assert_equal("@a b;\n", render("@a b"))
 
-    assert_equal("@a {\n  b: c; }\n", render("@a\n  :b c"))
-    assert_equal("@a { b: c; }\n", render("@a\n  :b c", :style => :compact))
-    assert_equal("@a {\n  b: c;\n}\n", render("@a\n  :b c", :style => :expanded))
-    assert_equal("@a{b:c}\n", render("@a\n  :b c", :style => :compressed))
+    assert_equal("@a {\n  b: c; }\n", render("@a\n  b: c"))
+    assert_equal("@a { b: c; }\n", render("@a\n  b: c", :style => :compact))
+    assert_equal("@a {\n  b: c;\n}\n", render("@a\n  b: c", :style => :expanded))
+    assert_equal("@a{b:c}\n", render("@a\n  b: c", :style => :compressed))
 
     assert_equal("@a {\n  b: c;\n  d: e; }\n",
-                 render("@a\n  :b c\n  :d e"))
+                 render("@a\n  b: c\n  d: e"))
     assert_equal("@a { b: c; d: e; }\n",
-                 render("@a\n  :b c\n  :d e", :style => :compact))
+                 render("@a\n  b: c\n  d: e", :style => :compact))
     assert_equal("@a {\n  b: c;\n  d: e;\n}\n",
-                 render("@a\n  :b c\n  :d e", :style => :expanded))
+                 render("@a\n  b: c\n  d: e", :style => :expanded))
     assert_equal("@a{b:c;d:e}\n",
-                 render("@a\n  :b c\n  :d e", :style => :compressed))
+                 render("@a\n  b: c\n  d: e", :style => :compressed))
 
     assert_equal("@a {\n  #b {\n    c: d; } }\n",
-                 render("@a\n  #b\n    :c d"))
+                 render("@a\n  #b\n    c: d"))
     assert_equal("@a { #b { c: d; } }\n",
-                 render("@a\n  #b\n    :c d", :style => :compact))
+                 render("@a\n  #b\n    c: d", :style => :compact))
     assert_equal("@a {\n  #b {\n    c: d;\n  }\n}\n",
-                 render("@a\n  #b\n    :c d", :style => :expanded))
+                 render("@a\n  #b\n    c: d", :style => :expanded))
     assert_equal("@a{#b{c:d}}\n",
-                 render("@a\n  #b\n    :c d", :style => :compressed))
+                 render("@a\n  #b\n    c: d", :style => :compressed))
 
     assert_equal("@a {\n  #b {\n    a: b; }\n    #b #c {\n      d: e; } }\n",
-                 render("@a\n  #b\n    :a b\n    #c\n      :d e"))
+                 render("@a\n  #b\n    a: b\n    #c\n      d: e"))
     assert_equal("@a { #b { a: b; }\n  #b #c { d: e; } }\n",
-                 render("@a\n  #b\n    :a b\n    #c\n      :d e", :style => :compact))
+                 render("@a\n  #b\n    a: b\n    #c\n      d: e", :style => :compact))
     assert_equal("@a {\n  #b {\n    a: b;\n  }\n  #b #c {\n    d: e;\n  }\n}\n",
-                 render("@a\n  #b\n    :a b\n    #c\n      :d e", :style => :expanded))
+                 render("@a\n  #b\n    a: b\n    #c\n      d: e", :style => :expanded))
     assert_equal("@a{#b{a:b}#b #c{d:e}}\n",
-                 render("@a\n  #b\n    :a b\n    #c\n      :d e", :style => :compressed))
+                 render("@a\n  #b\n    a: b\n    #c\n      d: e", :style => :compressed))
                  
     assert_equal("@a {\n  #foo,\n  #bar {\n    b: c; } }\n",
-                 render("@a\n  #foo, \n  #bar\n    :b c"))
+                 render("@a\n  #foo, \n  #bar\n    b: c"))
     assert_equal("@a { #foo, #bar { b: c; } }\n",
-                 render("@a\n  #foo, \n  #bar\n    :b c", :style => :compact))
+                 render("@a\n  #foo, \n  #bar\n    b: c", :style => :compact))
     assert_equal("@a {\n  #foo,\n  #bar {\n    b: c;\n  }\n}\n",
-                 render("@a\n  #foo, \n  #bar\n    :b c", :style => :expanded))
+                 render("@a\n  #foo, \n  #bar\n    b: c", :style => :expanded))
     assert_equal("@a{#foo,#bar{b:c}}\n",
-                 render("@a\n  #foo, \n  #bar\n    :b c", :style => :compressed))
+                 render("@a\n  #foo, \n  #bar\n    b: c", :style => :compressed))
 
     to_render = <<END
 @a
-  :b c
+  b: c
   #d
-    :e f
-  :g h
+    e: f
+  g: h
 END
     rendered = <<END
 @a { b: c;
@@ -1142,7 +1141,7 @@ black {
   color: #000; }
 CSS
 =foo($a: #FFF)
-  :color $a
+  color: $a
 white
   +foo
 black
@@ -1166,9 +1165,9 @@ three {
 CSS
 $a: 5px
 =foo($a, $b: 1px, $c: 3px + $b)
-  :color $a
-  :padding $b
-  :margin $c
+  color: $a
+  padding: $b
+  margin: $c
 one
   +foo(#fff)
 two
@@ -2059,20 +2058,21 @@ SASS
   end
 
   def test_warn_with_imports
+    prefix = Sass::Util.cleanpath(File.dirname(__FILE__)).to_s
     expected_warning = <<WARN
 WARNING: In the main file
-         on line 1 of #{File.dirname(__FILE__)}/templates/warn.sass
+         on line 1 of #{prefix}/templates/warn.sass
 
 WARNING: Imported
-         on line 1 of #{File.dirname(__FILE__)}/templates/warn_imported.sass
-         from line 2 of #{File.dirname(__FILE__)}/templates/warn.sass
+         on line 1 of #{prefix}/templates/warn_imported.sass
+         from line 2 of #{prefix}/templates/warn.sass
 
 WARNING: In an imported mixin
-         on line 4 of #{File.dirname(__FILE__)}/templates/warn_imported.sass, in `emits-a-warning'
-         from line 3 of #{File.dirname(__FILE__)}/templates/warn.sass
+         on line 4 of #{prefix}/templates/warn_imported.sass, in `emits-a-warning'
+         from line 3 of #{prefix}/templates/warn.sass
 WARN
     assert_warning expected_warning do
-      renders_correctly "warn", :style => :compact, :load_paths => [File.dirname(__FILE__) + "/templates"]
+      renders_correctly "warn", :style => :compact, :load_paths => ["#{prefix}/templates"]
     end
   end
 
@@ -2457,6 +2457,18 @@ SASS
 
   # Regression tests
 
+  def test_interpolation_in_multiline_selector
+    assert_equal(<<CSS, render(<<SASS))
+.foo,
+.bar {
+  a: b; }
+CSS
+.foo,
+\#{".bar"}
+  a: b
+SASS
+  end
+
   def test_list_separator_with_arg_list
     assert_equal(<<CSS, render(<<SASS))
 .test {
@@ -2586,29 +2598,29 @@ SASS
   border-style: solid; }
 RESULT
 .box
-  :border
-    //:color black
-    :style solid
+  border:
+    //color: black
+    style: solid
 SOURCE
 
     assert_equal(<<RESULT, render(<<SOURCE))
 .box {
-  /* :color black */
+  /* color: black */
   border-style: solid; }
 RESULT
 .box
-  :border
-    /* :color black
-    :style solid
+  border:
+    /* color: black
+    style: solid
 SOURCE
 
     assert_equal(<<RESULT, render(<<SOURCE, :style => :compressed))
 .box{border-style:solid}
 RESULT
 .box
-  :border
-    /*:color black
-    :style solid
+  border:
+    /*color: black
+    style: solid
 SOURCE
   end
 
@@ -2903,7 +2915,7 @@ SASS
       assert_equal <<CSS, render(<<SASS)
 div {
   maximum: 1.00000001;
-  too-much: 1.0; }
+  too-much: 1; }
 CSS
 div
   maximum : 1.00000001
@@ -3252,10 +3264,143 @@ CSS
 SASS
   end
 
+  def test_compressed_unknown_directive
+    assert_equal(<<CSS, render(<<SASS, :style => :compressed))
+x{@foo;a:b;@bar}
+CSS
+x
+  @foo
+  a: b
+  @bar
+SASS
+  end
+
+  def test_compressed_unknown_directive_in_directive
+    assert_equal(<<CSS, render(<<SASS, :style => :compressed))
+@x{@foo;a:b;@bar}
+CSS
+@x
+  @foo
+  a: b
+  @bar
+SASS
+  end
+
+  def test_compressed_unknown_directive_with_children_in_directive
+    assert_equal(<<CSS, render(<<SASS, :style => :compressed))
+@x{@foo{a:b}c:d;@bar{e:f}}
+CSS
+@x
+  @foo
+    a: b
+  c: d
+  @bar
+    e: f
+SASS
+  end
+
+  def test_compressed_rule_in_directive
+    assert_equal(<<CSS, render(<<SASS, :style => :compressed))
+@x{foo{a:b}c:d;bar{e:f}}
+CSS
+@x
+  foo
+    a: b
+  c: d
+  bar
+    e: f
+SASS
+  end
+
+  def test_import_two_css_files_issue_1806
+    assert_equal(<<CSS, render(<<SASS, :syntax => :scss, :style => :compressed))
+@import url(\"foo.css\");@import url(\"bar.css\");@import url(\"baz.css\")
+CSS
+@import url("foo.css");
+@import url("bar.css");
+@import url("baz.css");
+SASS
+  end
+
+  def test_numeric_formatting_of_integers
+    assert_equal(<<CSS, render(<<SASS, :syntax => :scss, :style => :compressed))
+a{near:3.00001;plus:3;minus:3;negative:-3}
+CSS
+a {
+  near: (3 + 0.00001);
+  plus: (3 + 0.0000001);
+  minus: (3 - 0.0000001);
+  negative: (-3 + 0.0000001);
+}
+SASS
+  end
+
+  def test_escaped_semicolons_are_not_compressed
+    assert_equal(<<'CSS', render(<<'SASS', :syntax => :scss, :style => :compressed))
+div{color:#f00000\9\0\;}
+CSS
+div {
+ color: #f00000\9\0\;
+}
+SASS
+  end
+
+  def test_compressed_output_of_nth_selectors
+    assert_equal(<<CSS, render(<<SASS, :syntax => :scss, :style => :compressed))
+:nth-of-type(2n-1),:nth-child(2n-1),:nth(2n-1),:nth-of-type(2n-1),:nth-of-type(2n-1){color:red}:nth-of-type(2n+1),:nth-child(2n+1),:nth(2n+1),:nth-of-type(2n+1),:nth-of-type(2n+1){color:red}
+CSS
+:nth-of-type(2n-1), :nth-child(2n-  1), :nth(2n  -1), :nth-of-type(2n  -  1), :nth-of-type( 2n  -  1 ) {
+  color: red }
+:nth-of-type(2n+1), :nth-child(2n+  1), :nth(2n  +1), :nth-of-type(2n  +  1), :nth-of-type( 2n  +  1 ) {
+  color: red }
+SASS
+  end
+
+  def test_descendant_selectors_with_leading_dash
+    assert_equal(<<CSS, render(<<SASS, :syntax => :scss, :style => :compressed))
+a -b{color:red}
+CSS
+a -b {
+  color: red }
+SASS
+  end
+
+  def test_import_with_supports_clause_interp
+    assert_equal(<<CSS, render(<<'SASS', :style => :compressed))
+@import url("fallback-layout.css") supports(not (display: flex))
+CSS
+$display-type: flex
+@import url("fallback-layout.css") supports(not (display: #{$display-type}))
+SASS
+  end
+
+  def test_import_with_supports_clause
+    assert_equal(<<CSS, render(<<SASS, :style => :compressed))
+@import url("fallback-layout.css") supports(not (display: flex))
+CSS
+@import url("fallback-layout.css") supports(not (display: flex))
+SASS
+  end
+
+  def test_compressed_commas_in_attribute_selectors
+    assert_equal(<<CSS, render(<<SASS, :style => :compressed))
+.classname[a="1, 2, 3"],.another[b="4, 5, 6"]{color:red}
+CSS
+.classname[a="1, 2, 3"], .another[b="4, 5, 6"]
+  color: red
+SASS
+  end
+
   private
 
   def assert_hash_has(hash, expected)
-    expected.each {|k, v| assert_equal(v, hash[k])}
+    expected.each do |k, v|
+      if v.nil?
+        assert_nil(hash[k])
+      else
+        assert_equal(v, hash[k])
+      end
+    end
   end
 
   def assert_renders_encoded(css, sass)
@@ -3287,7 +3432,8 @@ SASS
   end
 
   def filename(name, type)
-    File.dirname(__FILE__) + "/#{type == 'sass' ? 'templates' : 'results'}/#{name}.#{type}"
+    path = File.dirname(__FILE__) + "/#{type == 'sass' ? 'templates' : 'results'}/#{name}.#{type}"
+    Sass::Util.cleanpath(path).to_s
   end
 
   def sassc_path(template)

data/test/sass/exec_test.rb

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
 require File.dirname(__FILE__) + '/../test_helper'
+require 'fileutils'
 require 'sass/util/test'
 require 'tmpdir'
 
@@ -64,6 +65,14 @@ class ExecTest < MiniTest::Test
     assert_equal(".ruleset\r\n  margin: 0\r\n", read(src))
   end
 
+  def test_sass_convert_R
+    Dir.chdir(@dir) do
+      src = get_path("styles/src.css")
+      write(src, ".ruleset { margin: 0 }")
+      assert(exec(*%w[sass-convert -Rq --from css --to scss --trace styles]))
+    end
+  end
+
   private
 
   def get_path(name)
@@ -75,6 +84,7 @@ class ExecTest < MiniTest::Test
   end
 
   def write(file, content)
+    FileUtils.mkdir_p(File.dirname(file))
     open(file, 'wb') {|f| f.write(content)}
   end