sass 3.2.0.alpha.64 → 3.2.0.alpha.70

data/test/sass/conversion_test.rb

@@ -10,7 +10,8 @@ foo bar
 SASS
 foo bar {
   baz: bang;
-  bip: bop; }
+  bip: bop;
+}
 SCSS
     assert_renders <<SASS, <<SCSS, :old => true
 foo bar
@@ -19,7 +20,8 @@ foo bar
 SASS
 foo bar {
   baz: bang;
-  bip: bop; }
+  bip: bop;
+}
 SCSS
   end
 
@@ -47,8 +49,10 @@ SASS
 foo bar {
   baz bang {
     baz: bang;
-    bip: bop; }
-  blat: boo; }
+    bip: bop;
+  }
+  blat: boo;
+}
 SCSS
   end
 
@@ -60,7 +64,9 @@ foo bar
 SASS
 foo bar {
   &:hover {
-    baz: bang; } }
+    baz: bang;
+  }
+}
 SCSS
   end
 
@@ -70,7 +76,8 @@ foo \#{$bar + "baz"}.bip
   baz: bang
 SASS
 foo \#{$bar + "baz"}.bip {
-  baz: bang; }
+  baz: bang;
+}
 SCSS
   end
 
@@ -82,7 +89,8 @@ baz bang
 SASS
 foo bar,
 baz bang {
-  baz: bang; }
+  baz: bang;
+}
 SCSS
 
     assert_renders <<SASS, <<SCSS
@@ -94,7 +102,9 @@ SASS
 blat {
   foo bar,
   baz bang {
-    baz: bang; } }
+    baz: bang;
+  }
+}
 SCSS
   end
 
@@ -105,13 +115,15 @@ foo bar baz bang
 SASS
 foo bar
 baz bang {
-  baz: bang; }
+  baz: bang;
+}
 SCSS
 
     assert_scss_to_scss <<SCSS
 foo bar
 baz bang {
-  baz: bang; }
+  baz: bang;
+}
 SCSS
   end
 
@@ -123,7 +135,9 @@ foo bar
 SASS
 foo bar {
   :hover {
-    baz: bang; } }
+    baz: bang;
+  }
+}
 SCSS
   end
 
@@ -133,7 +147,8 @@ foo bar
   baz\#{$bang}bip\#{$bop}: 12
 SASS
 foo bar {
-  baz\#{$bang}bip\#{$bop}: 12; }
+  baz\#{$bang}bip\#{$bop}: 12;
+}
 SCSS
   end
 
@@ -143,7 +158,8 @@ foo bar
   baz\#{$bang}bip\#{$bop}: 12
 SASS
 foo bar {
-  baz\#{$bang}bip\#{$bop}: 12; }
+  baz\#{$bang}bip\#{$bop}: 12;
+}
 SCSS
   end
 
@@ -153,7 +169,8 @@ foo bar
   baz: 12 \#{$bang} bip \#{"bop"} blat
 SASS
 foo bar {
-  baz: 12 \#{$bang} bip \#{"bop"} blat; }
+  baz: 12 \#{$bang} bip \#{"bop"} blat;
+}
 SCSS
   end
 
@@ -163,7 +180,8 @@ foo bar
   baz: 12 $bang "bip"
 SASS
 foo bar {
-  baz: 12 $bang "bip"; }
+  baz: 12 $bang "bip";
+}
 SCSS
   end
 
@@ -173,7 +191,8 @@ foo bar
   :baz 12 $bang "bip"
 SASS
 foo bar {
-  baz: 12 $bang "bip"; }
+  baz: 12 $bang "bip";
+}
 SCSS
   end
 
@@ -186,18 +205,21 @@ foo bar {
   baz:
     bip
   bam
-        boon; }
+        boon;
+}
 SCSS
 
     assert_scss_to_scss <<OUT, <<IN
 foo bar {
-  baz: bip bam boon; }
+  baz: bip bam boon;
+}
 OUT
 foo bar {
   baz:
     bip
   bam
-        boon; }
+        boon;
+}
 IN
   end
 
@@ -210,18 +232,21 @@ foo bar {
   baz:
     $bip
   "bam"
-        12px; }
+        12px;
+}
 SCSS
 
     assert_scss_to_scss <<OUT, <<IN
 foo bar {
-  baz: $bip "bam" 12px; }
+  baz: $bip "bam" 12px;
+}
 OUT
 foo bar {
   baz:
     $bip
   "bam"
-        12px; }
+        12px;
+}
 IN
   end
 
@@ -243,7 +268,8 @@ SASS
 // baz
 
 foo bar {
-  a: b; }
+  a: b;
+}
 SCSS
 
     assert_renders <<SASS, <<SCSS
@@ -261,7 +287,8 @@ SASS
 // bang
 
 foo bar {
-  a: b; }
+  a: b;
+}
 SCSS
 
     assert_sass_to_scss <<SCSS, <<SASS
@@ -271,7 +298,8 @@ SCSS
 // bang
 
 foo bar {
-  a: b; }
+  a: b;
+}
 SCSS
 // foo
 // bar
@@ -345,7 +373,8 @@ SASS
 /* baz */
 
 foo bar {
-  a: b; }
+  a: b;
+}
 SCSS
 
     assert_scss_to_sass <<SASS, <<SCSS
@@ -363,7 +392,8 @@ SASS
    bang */
 
 foo bar {
-  a: b; }
+  a: b;
+}
 SCSS
 
     assert_scss_to_scss <<SCSS
@@ -373,7 +403,8 @@ SCSS
    bang */
 
 foo bar {
-  a: b; }
+  a: b;
+}
 SCSS
 
     assert_renders <<SASS, <<SCSS
@@ -391,7 +422,8 @@ SASS
  * bang */
 
 foo bar {
-  a: b; }
+  a: b;
+}
 SCSS
   end
 
@@ -411,7 +443,8 @@ foo {
    * beep boop */
   bang: bizz;
   /* bubble bubble
-   * toil trouble */ }
+   * toil trouble */
+}
 SCSS
 
     assert_sass_to_scss <<SCSS, <<SASS
@@ -423,7 +456,8 @@ foo {
   bang: bizz;
   /* bubble bubble
    * toil trouble
-   *    gorp */ }
+   *    gorp */
+}
 SCSS
 foo
   bar: baz
@@ -449,7 +483,8 @@ foo {
   /* foo
 bar
     baz */
-  a: b; }
+  a: b;
+}
 SCSS
 
     assert_sass_to_scss <<SCSS, <<SASS
@@ -457,7 +492,8 @@ foo {
   /*      foo
    * bar
    *     baz */
-  a: b; }
+  a: b;
+}
 SCSS
 foo
   /*      foo
@@ -479,7 +515,8 @@ SASS
  * Bar
  * Baz */
 .foo#bar {
-  a: b; }
+  a: b;
+}
 SCSS
 
     assert_renders <<SASS, <<SCSS
@@ -493,7 +530,8 @@ SASS
 // Bar
 // Baz
 @mixin foo {
-  a: b; }
+  a: b;
+}
 SCSS
   end
 
@@ -505,7 +543,8 @@ foo
 SASS
 foo {
   @debug 12px;
-  bar: baz; }
+  bar: baz;
+}
 SCSS
   end
 
@@ -517,7 +556,8 @@ foo
 SASS
 foo {
   @foo #bar "baz";
-  bar: baz; }
+  bar: baz;
+}
 SCSS
   end
 
@@ -533,9 +573,11 @@ SASS
 foo {
   @foo #bar "baz" {
     a: b;
-    c: d; }
+    c: d;
+  }
 
-  bar: baz; }
+  bar: baz;
+}
 SCSS
   end
 
@@ -554,12 +596,16 @@ SASS
 foo {
   @foo #bar "baz" {
     #blat {
-      a: b; }
+      a: b;
+    }
     .bang {
       c: d;
-      e: f; } }
+      e: f;
+    }
+  }
 
-  bar: baz; }
+  bar: baz;
+}
 SCSS
   end
 
@@ -581,13 +627,17 @@ foo {
   @foo #bar "baz" {
     g: h;
     #blat {
-      a: b; }
+      a: b;
+    }
     .bang {
       c: d;
-      e: f; }
-    i: j; }
+      e: f;
+    }
+    i: j;
+  }
 
-  bar: baz; }
+  bar: baz;
+}
 SCSS
   end
 
@@ -610,10 +660,13 @@ foo
 SASS
 foo {
   @for $a from $b to $c {
-    a: b; }
+    a: b;
+  }
   @for $c from 1 to 16 {
     d: e;
-    f: g; } }
+    f: g;
+  }
+}
 SCSS
   end
 
@@ -628,10 +681,13 @@ foo
 SASS
 foo {
   @while flaz($a + $b) {
-    a: b; }
+    a: b;
+  }
   @while 1 {
     d: e;
-    f: g; } }
+    f: g;
+  }
+}
 SCSS
   end
 
@@ -649,13 +705,18 @@ foo
 SASS
 foo {
   @if $foo or $bar {
-    a: b; }
+    a: b;
+  }
   @if $baz {
-    d: e; }
+    d: e;
+  }
   @else if $bang {
-    f: g; }
+    f: g;
+  }
   @else {
-    h: i; } }
+    h: i;
+  }
+}
 SCSS
   end
 
@@ -671,11 +732,15 @@ c
 SASS
 a {
   @each $number in 1px 2px 3px 4px {
-    b: $number; } }
+    b: $number;
+  }
+}
 
 c {
   @each $str in foo, bar, baz, bang {
-    d: $str; } }
+    d: $str;
+  }
+}
 SCSS
   end
 
@@ -693,7 +758,8 @@ SASS
 @import url(bar.css);
 
 foo {
-  bar: baz; }
+  bar: baz;
+}
 SCSS
 
     assert_renders <<SASS, <<SCSS
@@ -709,7 +775,8 @@ SASS
 @import url(bar.css);
 
 foo {
-  bar: baz; }
+  bar: baz;
+}
 SCSS
   end
 
@@ -779,7 +846,19 @@ SCSS
 SASS
 .foo {
   @extend .bar;
-  @extend .baz:bang; }
+  @extend .baz:bang;
+}
+SCSS
+  end
+
+  def test_comma_extendee
+    assert_renders <<SASS, <<SCSS
+.baz
+  @extend .foo, .bar
+SASS
+.baz {
+  @extend .foo, .bar;
+}
 SCSS
   end
 
@@ -791,7 +870,9 @@ SCSS
 SASS
 @mixin foo-bar {
   baz {
-    a: b; } }
+    a: b;
+  }
+}
 SCSS
 
     assert_scss_to_sass <<SASS, <<SCSS
@@ -801,13 +882,17 @@ SCSS
 SASS
 @mixin foo-bar() {
   baz {
-    a: b; } }
+    a: b;
+  }
+}
 SCSS
 
     assert_sass_to_scss <<SCSS, <<SASS
 @mixin foo-bar {
   baz {
-    a: b; } }
+    a: b;
+  }
+}
 SCSS
 =foo-bar()
   baz
@@ -823,7 +908,9 @@ SASS
 SASS
 @mixin foo-bar($baz, $bang) {
   baz {
-    a: $baz $bang; } }
+    a: $baz $bang;
+  }
+}
 SCSS
   end
 
@@ -835,13 +922,17 @@ SCSS
 SASS
 @mixin foo-bar($baz, $bang: 12px) {
   baz {
-    a: $baz $bang; } }
+    a: $baz $bang;
+  }
+}
 SCSS
 
     assert_sass_to_scss <<SCSS, <<SASS
 @mixin foo-bar($baz, $bang: foo) {
   baz {
-    a: $baz $bang; } }
+    a: $baz $bang;
+  }
+}
 SCSS
 =foo-bar($baz, $bang: foo)
   baz
@@ -857,7 +948,8 @@ foo
 SASS
 foo {
   @include foo-bar;
-  a: blip; }
+  a: blip;
+}
 SCSS
   end
 
@@ -869,7 +961,8 @@ foo
 SASS
 foo {
   @include foo-bar(12px, "blaz");
-  a: blip; }
+  a: blip;
+}
 SCSS
   end
 
@@ -883,7 +976,8 @@ SASS
 foo {
   @include foo-bar(12px, "blaz", $blip: blap, $bloop: blop);
   @include foo-bar($blip: blap, $bloop: blop);
-  a: blip; }
+  a: blip;
+}
 SCSS
   end
 
@@ -895,7 +989,8 @@ SCSS
 SASS
 @function foo() {
   $var: 1 + 1;
-  @return $var; }
+  @return $var;
+}
 SCSS
   end
 
@@ -907,7 +1002,9 @@ SCSS
 SASS
 @function foo($var1, $var2) {
   @if $var1 {
-    @return $var1 + $var2; } }
+    @return $var1 + $var2;
+  }
+}
 SCSS
   end
 
@@ -919,7 +1016,9 @@ SCSS
 SASS
 @function foo($var1, $var2: foo) {
   @if $var1 {
-    @return $var1 + $var2; } }
+    @return $var1 + $var2;
+  }
+}
 SCSS
   end
 
@@ -935,7 +1034,8 @@ $var1: 12px + 15px;
 
 foo {
   $var2: flaz(#abcdef);
-  val: $var1 $var2; }
+  val: $var1 $var2;
+}
 SCSS
   end
 
@@ -951,7 +1051,8 @@ $var1: 12px + 15px !default;
 
 foo {
   $var2: flaz(#abcdef) !default;
-  val: $var1 $var2; }
+  val: $var1 $var2;
+}
 SCSS
   end
 
@@ -979,7 +1080,8 @@ foo
   a: (1px / 2px)
 SASS
 foo {
-  a: (1px / 2px); }
+  a: (1px / 2px);
+}
 SCSS
   end
 
@@ -993,7 +1095,8 @@ SASS
 $var: 1px / 2px;
 
 foo {
-  a: $var; }
+  a: $var;
+}
 SCSS
 
     assert_renders <<SASS, <<SCSS
@@ -1005,7 +1108,8 @@ SASS
 $var: 1px;
 
 foo {
-  a: $var / 2px; }
+  a: $var / 2px;
+}
 SCSS
 
     assert_renders <<SASS, <<SCSS
@@ -1013,7 +1117,8 @@ foo
   a: 1 + 1px / 2px
 SASS
 foo {
-  a: 1 + 1px / 2px; }
+  a: 1 + 1px / 2px;
+}
 SCSS
   end
 
@@ -1023,7 +1128,8 @@ foo
   a: 1px / 2px
 SASS
 foo {
-  a: 1px / 2px; }
+  a: 1px / 2px;
+}
 SCSS
   end
 
@@ -1037,7 +1143,8 @@ SASS
 $baz: 12;
 
 @foo bar\#{$baz} qux {
-  a: b; }
+  a: b;
+}
 SCSS
   end
 
@@ -1051,7 +1158,8 @@ SASS
 $baz: 12;
 
 @media bar\#{$baz} {
-  a: b; }
+  a: b;
+}
 SCSS
   end
 
@@ -1071,7 +1179,8 @@ $var: -webkit-min-device-pixel-ratio;
 $val: 20;
 
 @media $media1 and ($var: $val), only $media2 {
-  a: b; }
+  a: b;
+}
 SCSS
   end
 
@@ -1095,7 +1204,8 @@ foo {
   .name: val;
   name/**/: val;
   name/*\\**/: val;
-  name: val; }
+  name: val;
+}
 SCSS
   end
 
@@ -1113,7 +1223,8 @@ foo {
   *name: val;
   #name: val;
   .name: val;
-  name: val; }
+  name: val;
+}
 SCSS
   end
 
@@ -1124,7 +1235,8 @@ SCSS
   a: b
 SASS
 #{s} {
-  a: b; }
+  a: b;
+}
 SCSS
     end
 
@@ -1157,8 +1269,10 @@ div {
   before: before;
   background: {
     color: blue;
-    repeat: no-repeat; };
-  after: after; }
+    repeat: no-repeat;
+  };
+  after: after;
+}
 
 SCSS
   end
@@ -1166,17 +1280,22 @@ SCSS
   def test_dasherize
     assert_sass_to_scss(<<SCSS, <<SASS, :dasherize => true)
 @mixin under-scored-mixin($under-scored-arg: $under-scored-default) {
-  bar: $under-scored-arg; }
+  bar: $under-scored-arg;
+}
 
 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; }
+  selector-\#{$under-scored-interp}: bold;
+}
 
 @if $under-scored {
   @for $for-var from $from-var to $to-var {
     @while $while-var == true {
-      $while-var: false; } } }
+      $while-var: false;
+    }
+  }
+}
 SCSS
 =under_scored_mixin($under_scored_arg: $under_scored_default)
   bar: $under_scored_arg
@@ -1219,11 +1338,15 @@ $color: blue;
   .\#{$class} {
     background-color: $color;
     @content;
-    border-color: $color; } }
+    border-color: $color;
+  }
+}
 
 @include context(parent) {
   @include context(child, $color: yellow) {
-    color: $color; } }
+    color: $color;
+  }
+}
 SCSS
 
   end
@@ -1231,7 +1354,8 @@ SCSS
   def test_empty_content
     assert_scss_to_scss(<<SCSS)
 @mixin foo {
-  @content; }
+  @content;
+}
 
 @include foo {}
 SCSS
@@ -1243,7 +1367,8 @@ SCSS
   color: blue
 SASS
 #content a%foo.bar {
-  color: blue; }
+  color: blue;
+}
 SCSS
   end
 
@@ -1260,13 +1385,114 @@ SASS
 $foo: foo;
 
 %\#{$foo} {
-  color: blue; }
+  color: blue;
+}
 
 .bar {
-  @extend %foo; }
+  @extend %foo;
+}
 SCSS
   end
 
+  def test_indent
+    assert_renders <<SASS, <<SCSS, :indent => "    "
+foo bar
+    baz bang
+        baz: bang
+        bip: bop
+    blat: boo
+SASS
+foo bar {
+    baz bang {
+        baz: bang;
+        bip: bop;
+    }
+    blat: boo;
+}
+SCSS
+
+    assert_renders <<SASS, <<SCSS, :indent => "\t"
+foo bar
+	baz bang
+		baz: bang
+		bip: bop
+	blat: boo
+SASS
+foo bar {
+	baz bang {
+		baz: bang;
+		bip: bop;
+	}
+	blat: boo;
+}
+SCSS
+
+    assert_sass_to_scss <<SCSS, <<SASS, :indent => "    "
+foo bar {
+    baz bang {
+        baz: bang;
+        bip: bop;
+    }
+    blat: boo;
+}
+SCSS
+foo bar
+  baz bang
+    baz: bang
+    bip: bop
+  blat: boo
+SASS
+
+    assert_sass_to_scss <<SCSS, <<SASS, :indent => "\t"
+foo bar {
+	baz bang {
+		baz: bang;
+		bip: bop;
+	}
+	blat: boo;
+}
+SCSS
+foo bar
+  baz bang
+    baz: bang
+    bip: bop
+  blat: boo
+SASS
+
+    assert_scss_to_sass <<SASS, <<SCSS, :indent => "    "
+foo bar
+    baz bang
+        baz: bang
+        bip: bop
+    blat: boo
+SASS
+foo bar {
+  baz bang {
+    baz: bang;
+    bip: bop;
+  }
+  blat: boo;
+}
+SCSS
+
+    assert_scss_to_sass <<SASS, <<SCSS, :indent => "\t"
+foo bar
+	baz bang
+		baz: bang
+		bip: bop
+	blat: boo
+SASS
+foo bar {
+  baz bang {
+    baz: bang;
+    bip: bop;
+  }
+  blat: boo;
+}
+SCSS
+  end
+
+
   private
 
   def assert_sass_to_sass(sass, options = {})