sass 3.4.0 → 3.4.25

data/test/sass/conversion_test.rb

@@ -13,7 +13,7 @@ foo bar {
   bip: bop;
 }
 SCSS
-    assert_renders <<SASS, <<SCSS, :old => true
+    silence_warnings {assert_renders <<SASS, <<SCSS, :old => true}
 foo bar
   :baz bang
   :bip bop
@@ -30,8 +30,7 @@ SCSS
   end
 
   def test_empty_directive
-    assert_scss_to_sass "@media screen", "@media screen {}"
-    assert_scss_to_scss "@media screen {}"
+    assert_renders "@media screen", "@media screen {}"
   end
 
   def test_empty_control_directive
@@ -44,6 +43,7 @@ foo bar
   baz bang
     baz: bang
     bip: bop
+
   blat: boo
 SASS
 foo bar {
@@ -51,6 +51,7 @@ foo bar {
     baz: bang;
     bip: bop;
   }
+
   blat: boo;
 }
 SCSS
@@ -182,7 +183,7 @@ SCSS
   end
 
   def test_dynamic_properties_with_old
-    assert_renders <<SASS, <<SCSS, :old => true
+    silence_warnings {assert_renders <<SASS, <<SCSS, :old => true}
 foo bar
   :baz 12 $bang "bip"
 SASS
@@ -287,41 +288,45 @@ foo bar {
 }
 SCSS
 
-    assert_sass_to_scss <<SCSS, <<SASS
+    assert_renders <<SASS, <<SCSS
 // foo
 // bar
 //   baz
 // bang
 
-foo bar {
-  a: b;
-}
-SCSS
+foo bar
+  a: b
+SASS
 // foo
 // bar
 //   baz
 // bang
 
-foo bar
-  a: b
-SASS
+foo bar {
+  a: b;
+}
+SCSS
   end
 
   def test_nested_silent_comments
     assert_renders <<SASS, <<SCSS
 foo
   bar: baz
+
   // bip bop
   // beep boop
   bang: bizz
+
   // bubble bubble
   // toil trouble
 SASS
 foo {
   bar: baz;
+
   // bip bop
   // beep boop
   bang: bizz;
+
   // bubble bubble
   // toil trouble
 }
@@ -330,10 +335,12 @@ SCSS
     assert_sass_to_scss <<SCSS, <<SASS
 foo {
   bar: baz;
+
   // bip bop
   // beep boop
   //   bap blimp
   bang: bizz;
+
   // bubble bubble
   // toil trouble
   //    gorp
@@ -341,16 +348,35 @@ foo {
 SCSS
 foo
   bar: baz
+
   // bip bop
      beep boop
        bap blimp
   bang: bizz
+
   // bubble bubble
     toil trouble
        gorp
 SASS
   end
 
+  def test_preserves_triple_slash_comments
+    assert_renders <<SASS, <<SCSS
+/// foo
+/// bar
+foo
+  /// bip bop
+  /// beep boop
+SASS
+/// foo
+/// bar
+foo {
+  /// bip bop
+  /// beep boop
+}
+SCSS
+  end
+
   def test_loud_comments
     assert_renders <<SASS, <<SCSS
 /* foo
@@ -427,17 +453,21 @@ SCSS
     assert_renders <<SASS, <<SCSS
 foo
   bar: baz
+
   /* bip bop
    * beep boop
   bang: bizz
+
   /* bubble bubble
    * toil trouble
 SASS
 foo {
   bar: baz;
+
   /* bip bop
    * beep boop */
   bang: bizz;
+
   /* bubble bubble
    * toil trouble */
 }
@@ -446,10 +476,12 @@ SCSS
     assert_sass_to_scss <<SCSS, <<SASS
 foo {
   bar: baz;
+
   /* bip bop
    * beep boop
    *   bap blimp */
   bang: bizz;
+
   /* bubble bubble
    * toil trouble
    *    gorp */
@@ -457,16 +489,35 @@ foo {
 SCSS
 foo
   bar: baz
+
   /* bip bop
      beep boop
        bap blimp
   bang: bizz
+
   /* bubble bubble
     toil trouble
        gorp
 SASS
   end
 
+  def test_preserves_double_star_comments
+    assert_renders <<SASS, <<SCSS
+/** foo
+ *  bar
+foo
+  /** bip bop
+   *  beep boop
+SASS
+/** foo
+ *  bar */
+foo {
+  /** bip bop
+   *  beep boop */
+}
+SCSS
+  end
+
   def test_loud_comments_with_weird_indentation
     assert_scss_to_sass <<SASS, <<SCSS
 foo
@@ -580,10 +631,12 @@ SASS
     assert_renders <<SASS, <<SCSS
 foo
   @debug 12px
+
   bar: baz
 SASS
 foo {
   @debug 12px;
+
   bar: baz;
 }
 SCSS
@@ -593,10 +646,12 @@ SCSS
     assert_renders <<SASS, <<SCSS
 foo
   @error "oh no!"
+
   bar: baz
 SASS
 foo {
   @error "oh no!";
+
   bar: baz;
 }
 SCSS
@@ -606,10 +661,12 @@ SCSS
     assert_renders <<SASS, <<SCSS
 foo
   @foo #bar "baz"
+
   bar: baz
 SASS
 foo {
   @foo #bar "baz";
+
   bar: baz;
 }
 SCSS
@@ -641,6 +698,7 @@ foo
   @foo #bar "baz"
     #blat
       a: b
+
     .bang
       c: d
       e: f
@@ -652,6 +710,7 @@ foo {
     #blat {
       a: b;
     }
+
     .bang {
       c: d;
       e: f;
@@ -668,11 +727,14 @@ SCSS
 foo
   @foo #bar "baz"
     g: h
+
     #blat
       a: b
+
     .bang
       c: d
       e: f
+
     i: j
 
   bar: baz
@@ -680,13 +742,16 @@ SASS
 foo {
   @foo #bar "baz" {
     g: h;
+
     #blat {
       a: b;
     }
+
     .bang {
       c: d;
       e: f;
     }
+
     i: j;
   }
 
@@ -708,6 +773,7 @@ SCSS
 foo
   @for $a from $b to $c
     a: b
+
   @for $c from 1 to 16
     d: e
     f: g
@@ -716,6 +782,7 @@ foo {
   @for $a from $b to $c {
     a: b;
   }
+
   @for $c from 1 to 16 {
     d: e;
     f: g;
@@ -729,6 +796,7 @@ SCSS
 foo
   @while flaz($a + $b)
     a: b
+
   @while 1
     d: e
     f: g
@@ -737,6 +805,7 @@ foo {
   @while flaz($a + $b) {
     a: b;
   }
+
   @while 1 {
     d: e;
     f: g;
@@ -750,6 +819,7 @@ SCSS
 foo
   @if $foo or $bar
     a: b
+
   @if $baz
     d: e
   @else if $bang
@@ -761,6 +831,7 @@ foo {
   @if $foo or $bar {
     a: b;
   }
+
   @if $baz {
     d: e;
   }
@@ -906,10 +977,12 @@ SCSS
     assert_renders <<SASS, <<SCSS
 .foo
   @extend .bar
+
   @extend .baz:bang
 SASS
 .foo {
   @extend .bar;
+
   @extend .baz:bang;
 }
 SCSS
@@ -1008,10 +1081,12 @@ SASS
     assert_renders <<SASS, <<SCSS
 foo
   +foo-bar
+
   a: blip
 SASS
 foo {
   @include foo-bar;
+
   a: blip;
 }
 SCSS
@@ -1021,10 +1096,12 @@ SCSS
     assert_renders <<SASS, <<SCSS
 foo
   +foo-bar(12px, "blaz")
+
   a: blip
 SASS
 foo {
   @include foo-bar(12px, "blaz");
+
   a: blip;
 }
 SCSS
@@ -1034,12 +1111,33 @@ SCSS
     assert_renders <<SASS, <<SCSS
 foo
   +foo-bar(12px, "blaz", $blip: blap, $bloop: blop)
+
   +foo-bar($blip: blap, $bloop: blop)
+
   a: blip
 SASS
 foo {
   @include foo-bar(12px, "blaz", $blip: blap, $bloop: blop);
+
   @include foo-bar($blip: blap, $bloop: blop);
+
+  a: blip;
+}
+SCSS
+  end
+
+  def test_consecutive_mixin_includes
+    assert_renders <<SASS, <<SCSS
+foo
+  +foo-bar
+  +foo-bar
+
+  a: blip
+SASS
+foo {
+  @include foo-bar;
+  @include foo-bar;
+
   a: blip;
 }
 SCSS
@@ -1049,10 +1147,12 @@ SCSS
     assert_renders <<SASS, <<SCSS
 foo
   +foo-bar($a-b_c: val)
+
   a: blip
 SASS
 foo {
   @include foo-bar($a-b_c: val);
+
   a: blip;
 }
 SCSS
@@ -1062,10 +1162,12 @@ SCSS
     assert_renders <<SASS, <<SCSS
 @function foo()
   $var: 1 + 1
+
   @return $var
 SASS
 @function foo() {
   $var: 1 + 1;
+
   @return $var;
 }
 SCSS
@@ -1105,12 +1207,14 @@ $var1: 12px + 15px
 
 foo
   $var2: flaz(#abcdef)
+
   val: $var1 $var2
 SASS
 $var1: 12px + 15px;
 
 foo {
   $var2: flaz(#abcdef);
+
   val: $var1 $var2;
 }
 SCSS
@@ -1122,12 +1226,14 @@ $var1: 12px + 15px !default
 
 foo
   $var2: flaz(#abcdef) !default
+
   val: $var1 $var2
 SASS
 $var1: 12px + 15px !default;
 
 foo {
   $var2: flaz(#abcdef) !default;
+
   val: $var1 $var2;
 }
 SCSS
@@ -1207,6 +1313,16 @@ SASS
 foo {
   a: 1px / 2px;
 }
+SCSS
+
+    # Regression test for issue 1787
+    assert_renders <<SASS, <<SCSS
+foo
+  a: 1px / 2px 3px
+SASS
+foo {
+  a: 1px / 2px 3px;
+}
 SCSS
   end
 
@@ -1241,26 +1357,7 @@ SCSS
   end
 
   def test_media_with_expressions
-    assert_sass_to_scss <<SCSS, <<SASS
-$media1: screen;
-$media2: print;
-$var: -webkit-min-device-pixel-ratio;
-$val: 20;
-
-@media \#{$media1} and ($var + "-foo": $val + 5), only \#{$media2} {
-  a: b;
-}
-SCSS
-$media1: screen
-$media2: print
-$var: -webkit-min-device-pixel-ratio
-$val: 20
-
-@media \#{$media1} and ($var + "-foo": $val + 5), only \#{$media2}
-  a: b
-SASS
-
-    assert_scss_to_sass <<SASS, <<SCSS
+    assert_renders <<SASS, <<SCSS
 $media1: screen
 $media2: print
 $var: -webkit-min-device-pixel-ratio
@@ -1281,14 +1378,14 @@ SCSS
   end
 
   def test_media_with_feature
-    assert_sass_to_scss <<SCSS, <<SASS
+    assert_renders <<SASS, <<SCSS
+@media screen and (-webkit-transform-3d)
+  a: b
+SASS
 @media screen and (-webkit-transform-3d) {
   a: b;
 }
 SCSS
-@media screen and (-webkit-transform-3d)
-  a: b
-SASS
   end
 
   def test_supports_with_expressions
@@ -1297,7 +1394,7 @@ $query: "(feature1: val)"
 $feature: feature2
 $val: val
 
-@supports \#{$query} and ($feature: $val) or (not ($feature + 3: $val + 4))
+@supports (\#{$query} and ($feature: $val)) or (not ($feature + 3: $val + 4))
   foo
     a: b
 SASS
@@ -1305,7 +1402,7 @@ $query: "(feature1: val)";
 $feature: feature2;
 $val: val;
 
-@supports \#{$query} and ($feature: $val) or (not ($feature + 3: $val + 4)) {
+@supports (\#{$query} and ($feature: $val)) or (not ($feature + 3: $val + 4)) {
   foo {
     a: b;
   }
@@ -1339,7 +1436,7 @@ SCSS
   end
 
   def test_old_declaration_hacks
-    assert_renders <<SASS, <<SCSS, :old => true
+    silence_warnings {assert_renders <<SASS, <<SCSS, :old => true}
 foo
   :_name val
   :*name val
@@ -1414,7 +1511,9 @@ SCSS
 
 div {
   foo: under-scored-fn($under-scored-var + "before\#{$another-under-scored-var}after");
+
   @include under-scored-mixin($passed-arg);
+
   selector-\#{$under-scored-interp}: bold;
 }
 
@@ -1454,7 +1553,9 @@ $color: blue
 =context($class, $color: red)
   .\#{$class}
     background-color: $color
+
     @content
+
     border-color: $color
 
 +context(parent)
@@ -1466,7 +1567,9 @@ $color: blue;
 @mixin context($class, $color: red) {
   .\#{$class} {
     background-color: $color;
+
     @content;
+
     border-color: $color;
   }
 }
@@ -1551,6 +1654,7 @@ foo bar
     baz bang
         baz: bang
         bip: bop
+
     blat: boo
 SASS
 foo bar {
@@ -1558,6 +1662,7 @@ foo bar {
         baz: bang;
         bip: bop;
     }
+
     blat: boo;
 }
 SCSS
@@ -1567,6 +1672,7 @@ foo bar
 	baz bang
 		baz: bang
 		bip: bop
+
 	blat: boo
 SASS
 foo bar {
@@ -1574,6 +1680,7 @@ foo bar {
 		baz: bang;
 		bip: bop;
 	}
+
 	blat: boo;
 }
 SCSS
@@ -1584,6 +1691,7 @@ foo bar {
         baz: bang;
         bip: bop;
     }
+
     blat: boo;
 }
 SCSS
@@ -1591,6 +1699,7 @@ foo bar
   baz bang
     baz: bang
     bip: bop
+
   blat: boo
 SASS
 
@@ -1600,6 +1709,7 @@ foo bar {
 		baz: bang;
 		bip: bop;
 	}
+
 	blat: boo;
 }
 SCSS
@@ -1607,6 +1717,7 @@ foo bar
   baz bang
     baz: bang
     bip: bop
+
   blat: boo
 SASS
 
@@ -1615,6 +1726,7 @@ foo bar
     baz bang
         baz: bang
         bip: bop
+
     blat: boo
 SASS
 foo bar {
@@ -1622,6 +1734,7 @@ foo bar {
     baz: bang;
     bip: bop;
   }
+
   blat: boo;
 }
 SCSS
@@ -1631,6 +1744,7 @@ foo bar
 	baz bang
 		baz: bang
 		bip: bop
+
 	blat: boo
 SASS
 foo bar {
@@ -1638,13 +1752,14 @@ foo bar {
     baz: bang;
     bip: bop;
   }
+
   blat: boo;
 }
 SCSS
   end
 
   def test_extend_with_optional
-    assert_scss_to_sass <<SASS, <<SCSS
+    assert_renders <<SASS, <<SCSS
 foo
   @extend .bar !optional
 SASS
@@ -1655,7 +1770,7 @@ SCSS
   end
 
   def test_mixin_var_args
-    assert_scss_to_sass <<SASS, <<SCSS
+    assert_renders <<SASS, <<SCSS
 =foo($args...)
   a: b
 
@@ -1664,6 +1779,7 @@ SCSS
 
 .foo
   +foo($list...)
+
   +bar(1, $list...)
 SASS
 @mixin foo($args...) {
@@ -1676,19 +1792,21 @@ SASS
 
 .foo {
   @include foo($list...);
+
   @include bar(1, $list...);
 }
 SCSS
   end
 
   def test_mixin_var_kwargs
-    assert_scss_to_sass <<SASS, <<SCSS
+    assert_renders <<SASS, <<SCSS
 =foo($a: b, $c: d)
   a: $a
   c: $c
 
 .foo
   +foo($list..., $map...)
+
   +foo(pos, $list..., $kwd: val, $map...)
 SASS
 @mixin foo($a: b, $c: d) {
@@ -1698,13 +1816,14 @@ SASS
 
 .foo {
   @include foo($list..., $map...);
+
   @include foo(pos, $list..., $kwd: val, $map...);
 }
 SCSS
   end
 
   def test_function_var_args
-    assert_scss_to_sass <<SASS, <<SCSS
+    assert_renders <<SASS, <<SCSS
 @function foo($args...)
   @return foo
 
@@ -1731,7 +1850,7 @@ SCSS
   end
 
   def test_function_var_kwargs
-    assert_scss_to_sass <<SASS, <<SCSS
+    assert_renders <<SASS, <<SCSS
 @function foo($a: b, $c: d)
   @return foo
 
@@ -1751,11 +1870,12 @@ SCSS
   end
 
   def test_at_root
-    assert_scss_to_sass <<SASS, <<SCSS
+    assert_renders <<SASS, <<SCSS
 .foo
   @at-root
     .bar
       a: b
+
     .baz
       c: d
 SASS
@@ -1764,6 +1884,7 @@ SASS
     .bar {
       a: b;
     }
+
     .baz {
       c: d;
     }
@@ -1773,7 +1894,7 @@ SCSS
   end
 
   def test_at_root_with_selector
-    assert_scss_to_sass <<SASS, <<SCSS
+    assert_renders <<SASS, <<SCSS
 .foo
   @at-root .bar
     a: b
@@ -1787,7 +1908,7 @@ SCSS
   end
 
   def test_at_root_without
-    assert_scss_to_sass <<SASS, <<SCSS
+    assert_renders <<SASS, <<SCSS
 .foo
   @at-root (without: media rule)
     a: b
@@ -1801,7 +1922,7 @@ SCSS
   end
 
   def test_at_root_with
-    assert_scss_to_sass <<SASS, <<SCSS
+    assert_renders <<SASS, <<SCSS
 .foo
   @at-root (with: media rule)
     a: b
@@ -1815,7 +1936,7 @@ SCSS
   end
 
   def test_function_var_kwargs_with_list
-    assert_scss_to_sass <<SASS, <<SCSS
+    assert_renders <<SASS, <<SCSS
 @function foo($a: b, $c: d)
   @return $a, $c
 
@@ -1838,10 +1959,13 @@ SCSS
   0%
     top: 0
     left: 0
+
   30%
     top: 50px
+
   68%, 72%
     left: 50px
+
   100%
     top: 100px
     left: 100%
@@ -1851,12 +1975,15 @@ SASS
     top: 0;
     left: 0;
   }
+
   30% {
     top: 50px;
   }
+
   68%, 72% {
     left: 50px;
   }
+
   100% {
     top: 100px;
     left: 100%;
@@ -1884,12 +2011,13 @@ SCSS
   end
 
   def test_media_query_with_expr
-    assert_scss_to_sass <<SASS, <<SCSS
+    assert_renders <<SASS, <<SCSS
 @media foo and (bar: baz)
   a: b
 SASS
 @media foo and (bar: baz) {
-  a: b; }
+  a: b;
+}
 SCSS
   end
 
@@ -1975,13 +2103,11 @@ foo
     ok: -$foo
     comma: 10px, -$foo
     needs-parens: 10px (-$foo)
-    no-parens: a 50px + 60px b
 SASS
 foo {
     ok: -$foo;
     comma: 10px, -$foo;
     needs-parens: 10px (-$foo);
-    no-parens: a 50px + 60px b;
 }
 SCSS
   end
@@ -2003,6 +2129,14 @@ foo {
 SCSS
   end
 
+  def test_import_with_supports_clause
+    assert_renders(<<'SASS', <<'SCSS')
+@import url("fallback-layout.css") supports(not (display: #{$display-type}))
+SASS
+@import url("fallback-layout.css") supports(not (display: #{$display-type}));
+SCSS
+  end
+
   private
 
   def assert_sass_to_sass(sass, options = {})