Merge pull request #669 from mgreter/nuka-cola-3.4.21

Nuked with sass 3.4.21

Author: mgreter

Gemfile.lock

@@ -2,7 +2,7 @@ GEM
   remote: https://rubygems.org/
   specs:
     minitest (5.2.0)
-    sass (3.4.16)
+    sass (3.4.21)
 
 PLATFORMS
   ruby

lib/sass_spec/test_case.rb

@@ -114,26 +114,17 @@ def _norm_output(css)
     # but make sure we do not remove single cariage returns
     css = css.gsub(/(?:\r?\n)+/, "\n")
   end
-  def _norm_error(err)
-    # we dont want to test for linux or windows line-feeds
-    # but make sure we do not remove single cariage returns
-    err = err.gsub(/(?:\r?\n)+/, "\n")
-    # remove all newlines at the end of the file
-    err = err.sub(/(?:\r?\n)+\z/, "")
-  end
 
   # cleaning only happens when requested for test
   # done by creating `expected.type.clean` flag file
   def _clean_output(css)
-    css.gsub(/ *\{/, " {\n")
-       .gsub(/([;,]) */, "\\1\n")
-       .gsub(/ *\} */, " }\n")
-       .gsub(/;(?:\s*;)+/m, ";")
-       .gsub(/;\r?\n }/m, " }")
-       .gsub(/\r?\n/, "\n")
-       .sub(/(?:\r?\n)+\z/, "")
-       .strip
+    _norm_output(css)
+       .gsub(/[\r\n\s	]+/, " ")
+       .gsub(/, /, ",")
   end
+
+  # errors are always cleaned
+  # we also write them cleaned
   def _clean_error(err)
     err.gsub(/(?:\/todo_|_todo\/)/, "/") # hide todo pre/suffix
        .gsub(/\/libsass\-[a-z]+\-tests\//, "/") # hide test directory

spec/basic/15_arithmetic_and_lists/expected.compact.css

@@ -1 +1 @@
-div{a:3;b:3.75;c:1;d:300;e:10.5 2 3;f:123 4 5 6;g:112 8 9 6;h:15 / 3 / 5;i:1;j:1;k:5;l:1;m:1/2,1 2 3 url("www.foo.com/blah.png") blah blah;n:1 2 3,1 2 3 4 5 6,7 8 9;o:9px;p:5px;q:2;r:64em;s:2.5em;t:120.750.8 6/7}
+div{a:3;b:3.75;c:1;d:300;e:15/10 2 3;f:123 4 5 6;g:1114/7 8 9 6;h:15 / 3 / 5;i:1;j:1;k:5;l:1;m:1/2,1 2 3 url("www.foo.com/blah.png") blah blah;n:1 2 3,1 2 3 4 5 6,7 8 9;o:9px;p:5px;q:2;r:64em;s:2.5em;t:12.754/5 6/7}

spec/basic/15_arithmetic_and_lists/expected.compressed.css

@@ -5,9 +5,9 @@ div {
   /* shouldn't eval the following "300" */
   d: 300;
   /* increasingly jacked-up edge cases that combine arithmetic with lists */
-  e: 10.5 2 3;
+  e: 15/10 2 3;
   f: 123 4 5 6;
-  g: 112 8 9 6;
+  g: 1114/7 8 9 6;
   /* shouldn't perform the following division */
   h: 15 / 3 / 5;
   /* should perform the following division now */
@@ -24,5 +24,5 @@ div {
   q: 2;
   r: 64em;
   s: 2.5em;
-  t: 120.750.8 6/7;
+  t: 120.754/5 6/7;
 }

spec/basic/15_arithmetic_and_lists/expected.expanded.css

@@ -5,9 +5,9 @@ div {
   /* shouldn't eval the following "300" */
   d: 300;
   /* increasingly jacked-up edge cases that combine arithmetic with lists */
-  e: 10.5 2 3;
+  e: 15/10 2 3;
   f: 123 4 5 6;
-  g: 112 8 9 6;
+  g: 1114/7 8 9 6;
   /* shouldn't perform the following division */
   h: 15 / 3 / 5;
   /* should perform the following division now */
@@ -24,4 +24,4 @@ div {
   q: 2;
   r: 64em;
   s: 2.5em;
-  t: 120.750.8 6/7; }
+  t: 120.754/5 6/7; }

spec/basic/15_arithmetic_and_lists/expected_output.css

@@ -1 +1 @@
-@import url("http://fonts.googleapis.com/css?family=Open+Sans:400italic,700italic,400,700|Oswald");
+@import url("http://fonts.googleapis.com/css?family=Open+Sans:400italic,700italic,400,700|Oswald")

spec/basic/49_interpolants_in_css_imports/expected.compressed.css

@@ -1 +1 @@
-@foo "bar";
+@foo "bar"

spec/css/blockless_directive_without_semicolon/expected.compressed.css

@@ -1 +1 @@
-@foo "bar";
+@foo "bar"

spec/css/directive_with_lots_of_whitespace/expected.compressed.css

@@ -1 +1 @@
-@foo {}
+@foo{}