sass 3.1.0 → 3.3.0

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
 
@@ -68,9 +74,17 @@ SCSS
     assert_renders <<SASS, <<SCSS
 foo \#{$bar + "baz"}.bip
   baz: bang
+
+foo /\#{$bar + "baz"}/ .bip
+  baz: bang
 SASS
 foo \#{$bar + "baz"}.bip {
-  baz: bang; }
+  baz: bang;
+}
+
+foo /\#{$bar + "baz"}/ .bip {
+  baz: bang;
+}
 SCSS
   end
 
@@ -82,7 +96,8 @@ baz bang
 SASS
 foo bar,
 baz bang {
-  baz: bang; }
+  baz: bang;
+}
 SCSS
 
     assert_renders <<SASS, <<SCSS
@@ -94,7 +109,9 @@ SASS
 blat {
   foo bar,
   baz bang {
-    baz: bang; } }
+    baz: bang;
+  }
+}
 SCSS
   end
 
@@ -105,13 +122,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,17 +142,9 @@ foo bar
 SASS
 foo bar {
   :hover {
-    baz: bang; } }
-SCSS
-  end
-
-  def test_property_name_interpolation
-    assert_renders <<SASS, <<SCSS
-foo bar
-  baz\#{$bang}bip\#{$bop}: 12
-SASS
-foo bar {
-  baz\#{$bang}bip\#{$bop}: 12; }
+    baz: bang;
+  }
+}
 SCSS
   end
 
@@ -143,7 +154,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 +165,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 +176,8 @@ foo bar
   baz: 12 $bang "bip"
 SASS
 foo bar {
-  baz: 12 $bang "bip"; }
+  baz: 12 $bang "bip";
+}
 SCSS
   end
 
@@ -173,31 +187,35 @@ foo bar
   :baz 12 $bang "bip"
 SASS
 foo bar {
-  baz: 12 $bang "bip"; }
+  baz: 12 $bang "bip";
+}
 SCSS
   end
 
   def test_multiline_properties
     assert_scss_to_sass <<SASS, <<SCSS
 foo bar
-  baz: bip   bam         boon
+  baz: bip bam boon
 SASS
 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 +228,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 +264,8 @@ SASS
 // baz
 
 foo bar {
-  a: b; }
+  a: b;
+}
 SCSS
 
     assert_renders <<SASS, <<SCSS
@@ -261,7 +283,8 @@ SASS
 // bang
 
 foo bar {
-  a: b; }
+  a: b;
+}
 SCSS
 
     assert_sass_to_scss <<SCSS, <<SASS
@@ -271,7 +294,8 @@ SCSS
 // bang
 
 foo bar {
-  a: b; }
+  a: b;
+}
 SCSS
 // foo
 // bar
@@ -345,7 +369,8 @@ SASS
 /* baz */
 
 foo bar {
-  a: b; }
+  a: b;
+}
 SCSS
 
     assert_scss_to_sass <<SASS, <<SCSS
@@ -363,7 +388,8 @@ SASS
    bang */
 
 foo bar {
-  a: b; }
+  a: b;
+}
 SCSS
 
     assert_scss_to_scss <<SCSS
@@ -373,7 +399,8 @@ SCSS
    bang */
 
 foo bar {
-  a: b; }
+  a: b;
+}
 SCSS
 
     assert_renders <<SASS, <<SCSS
@@ -391,7 +418,8 @@ SASS
  * bang */
 
 foo bar {
-  a: b; }
+  a: b;
+}
 SCSS
   end
 
@@ -411,7 +439,8 @@ foo {
    * beep boop */
   bang: bizz;
   /* bubble bubble
-   * toil trouble */ }
+   * toil trouble */
+}
 SCSS
 
     assert_sass_to_scss <<SCSS, <<SASS
@@ -423,7 +452,8 @@ foo {
   bang: bizz;
   /* bubble bubble
    * toil trouble
-   *    gorp */ }
+   *    gorp */
+}
 SCSS
 foo
   bar: baz
@@ -449,7 +479,8 @@ foo {
   /* foo
 bar
     baz */
-  a: b; }
+  a: b;
+}
 SCSS
 
     assert_sass_to_scss <<SCSS, <<SASS
@@ -457,7 +488,8 @@ foo {
   /*      foo
    * bar
    *     baz */
-  a: b; }
+  a: b;
+}
 SCSS
 foo
   /*      foo
@@ -467,6 +499,29 @@ foo
 SASS
   end
 
+  def test_loud_comment_containing_silent_comment
+    assert_scss_to_sass <<SASS, <<SCSS
+/*
+ *// foo bar
+SASS
+/*
+// foo bar
+*/
+SCSS
+  end
+
+  def test_silent_comment_containing_loud_comment
+    assert_scss_to_sass <<SASS, <<SCSS
+// /*
+//  * foo bar
+//  */
+SASS
+// /*
+//  * foo bar
+//  */
+SCSS
+  end
+
   def test_immediately_preceding_comments
     assert_renders <<SASS, <<SCSS
 /* Foo
@@ -479,7 +534,8 @@ SASS
  * Bar
  * Baz */
 .foo#bar {
-  a: b; }
+  a: b;
+}
 SCSS
 
     assert_renders <<SASS, <<SCSS
@@ -493,10 +549,33 @@ SASS
 // Bar
 // Baz
 @mixin foo {
-  a: b; }
+  a: b;
+}
 SCSS
   end
 
+  def test_immediately_following_comments
+    assert_sass_to_scss <<SCSS, <<SASS
+.foobar {
+  // trailing comment
+  a: 1px;
+}
+SCSS
+.foobar // trailing comment
+  a: 1px
+SASS
+
+    assert_sass_to_scss <<SCSS, <<SASS
+.foobar {
+  // trailing comment
+  a: 1px;
+}
+SCSS
+.foobar  /* trailing comment */
+  a: 1px
+SASS
+  end
+
   def test_debug
     assert_renders <<SASS, <<SCSS
 foo
@@ -505,7 +584,8 @@ foo
 SASS
 foo {
   @debug 12px;
-  bar: baz; }
+  bar: baz;
+}
 SCSS
   end
 
@@ -517,7 +597,8 @@ foo
 SASS
 foo {
   @foo #bar "baz";
-  bar: baz; }
+  bar: baz;
+}
 SCSS
   end
 
@@ -533,9 +614,11 @@ SASS
 foo {
   @foo #bar "baz" {
     a: b;
-    c: d; }
+    c: d;
+  }
 
-  bar: baz; }
+  bar: baz;
+}
 SCSS
   end
 
@@ -554,12 +637,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 +668,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 +701,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 +722,13 @@ foo
 SASS
 foo {
   @while flaz($a + $b) {
-    a: b; }
+    a: b;
+  }
   @while 1 {
     d: e;
-    f: g; } }
+    f: g;
+  }
+}
 SCSS
   end
 
@@ -649,13 +746,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
 
@@ -668,14 +770,28 @@ a
 c
   @each $str in foo, bar, baz, bang
     d: $str
+
+c
+  @each $key, $value in (foo: 1, bar: 2, baz: 3)
+    \#{$key}: $value
 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;
+  }
+}
+
+c {
+  @each $key, $value in (foo: 1, bar: 2, baz: 3) {
+    \#{$key}: $value;
+  }
+}
 SCSS
   end
 
@@ -693,7 +809,8 @@ SASS
 @import url(bar.css);
 
 foo {
-  bar: baz; }
+  bar: baz;
+}
 SCSS
 
     assert_renders <<SASS, <<SCSS
@@ -709,7 +826,8 @@ SASS
 @import url(bar.css);
 
 foo {
-  bar: baz; }
+  bar: baz;
+}
 SCSS
   end
 
@@ -759,6 +877,18 @@ SASS
 SCSS
   end
 
+  def test_import_with_interpolation
+    assert_renders <<SASS, <<SCSS
+$family: unquote("Droid+Sans")
+
+@import url("http://fonts.googleapis.com/css?family=\#{$family}")
+SASS
+$family: unquote("Droid+Sans");
+
+@import url("http://fonts.googleapis.com/css?family=\#{$family}");
+SCSS
+  end
+
   def test_extend
     assert_renders <<SASS, <<SCSS
 .foo
@@ -767,7 +897,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
 
@@ -779,7 +921,9 @@ SCSS
 SASS
 @mixin foo-bar {
   baz {
-    a: b; } }
+    a: b;
+  }
+}
 SCSS
 
     assert_scss_to_sass <<SASS, <<SCSS
@@ -789,13 +933,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
@@ -811,7 +959,9 @@ SASS
 SASS
 @mixin foo-bar($baz, $bang) {
   baz {
-    a: $baz $bang; } }
+    a: $baz $bang;
+  }
+}
 SCSS
   end
 
@@ -823,13 +973,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
@@ -845,7 +999,8 @@ foo
 SASS
 foo {
   @include foo-bar;
-  a: blip; }
+  a: blip;
+}
 SCSS
   end
 
@@ -857,7 +1012,8 @@ foo
 SASS
 foo {
   @include foo-bar(12px, "blaz");
-  a: blip; }
+  a: blip;
+}
 SCSS
   end
 
@@ -871,7 +1027,21 @@ SASS
 foo {
   @include foo-bar(12px, "blaz", $blip: blap, $bloop: blop);
   @include foo-bar($blip: blap, $bloop: blop);
-  a: blip; }
+  a: blip;
+}
+SCSS
+  end
+
+  def test_mixin_include_with_hyphen_conversion_keyword_arg
+    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
   end
 
@@ -883,7 +1053,8 @@ SCSS
 SASS
 @function foo() {
   $var: 1 + 1;
-  @return $var; }
+  @return $var;
+}
 SCSS
   end
 
@@ -895,7 +1066,9 @@ SCSS
 SASS
 @function foo($var1, $var2) {
   @if $var1 {
-    @return $var1 + $var2; } }
+    @return $var1 + $var2;
+  }
+}
 SCSS
   end
 
@@ -907,7 +1080,9 @@ SCSS
 SASS
 @function foo($var1, $var2: foo) {
   @if $var1 {
-    @return $var1 + $var2; } }
+    @return $var1 + $var2;
+  }
+}
 SCSS
   end
 
@@ -923,7 +1098,8 @@ $var1: 12px + 15px;
 
 foo {
   $var2: flaz(#abcdef);
-  val: $var1 $var2; }
+  val: $var1 $var2;
+}
 SCSS
   end
 
@@ -939,7 +1115,8 @@ $var1: 12px + 15px !default;
 
 foo {
   $var2: flaz(#abcdef) !default;
-  val: $var1 $var2; }
+  val: $var1 $var2;
+}
 SCSS
   end
 
@@ -967,7 +1144,8 @@ foo
   a: (1px / 2px)
 SASS
 foo {
-  a: (1px / 2px); }
+  a: (1px / 2px);
+}
 SCSS
   end
 
@@ -981,7 +1159,8 @@ SASS
 $var: 1px / 2px;
 
 foo {
-  a: $var; }
+  a: $var;
+}
 SCSS
 
     assert_renders <<SASS, <<SCSS
@@ -993,7 +1172,8 @@ SASS
 $var: 1px;
 
 foo {
-  a: $var / 2px; }
+  a: $var / 2px;
+}
 SCSS
 
     assert_renders <<SASS, <<SCSS
@@ -1001,7 +1181,8 @@ foo
   a: 1 + 1px / 2px
 SASS
 foo {
-  a: 1 + 1px / 2px; }
+  a: 1 + 1px / 2px;
+}
 SCSS
   end
 
@@ -1011,7 +1192,100 @@ foo
   a: 1px / 2px
 SASS
 foo {
-  a: 1px / 2px; }
+  a: 1px / 2px;
+}
+SCSS
+  end
+
+  def test_directive_with_interpolation
+    assert_renders <<SASS, <<SCSS
+$baz: 12
+
+@foo bar\#{$baz} qux
+  a: b
+SASS
+$baz: 12;
+
+@foo bar\#{$baz} qux {
+  a: b;
+}
+SCSS
+  end
+
+  def test_media_with_interpolation
+    assert_renders <<SASS, <<SCSS
+$baz: 12
+
+@media bar\#{$baz}
+  a: b
+SASS
+$baz: 12;
+
+@media bar\#{$baz} {
+  a: b;
+}
+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
+$media1: screen
+$media2: print
+$var: -webkit-min-device-pixel-ratio
+$val: 20
+
+@media \#{$media1} and ($var + "-foo": $val + 5), only \#{$media2}
+  a: b
+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
+  end
+
+  def test_supports_with_expressions
+    assert_renders <<SASS, <<SCSS
+$query: "(feature1: val)"
+$feature: feature2
+$val: val
+
+@supports \#{$query} and ($feature: $val) or (not ($feature + 3: $val + 4))
+  foo
+    a: b
+SASS
+$query: "(feature1: val)";
+$feature: feature2;
+$val: val;
+
+@supports \#{$query} and ($feature: $val) or (not ($feature + 3: $val + 4)) {
+  foo {
+    a: b;
+  }
+}
 SCSS
   end
 
@@ -1035,7 +1309,8 @@ foo {
   .name: val;
   name/**/: val;
   name/*\\**/: val;
-  name: val; }
+  name: val;
+}
 SCSS
   end
 
@@ -1053,7 +1328,8 @@ foo {
   *name: val;
   #name: val;
   .name: val;
-  name: val; }
+  name: val;
+}
 SCSS
   end
 
@@ -1064,7 +1340,8 @@ SCSS
   a: b
 SASS
 #{s} {
-  a: b; }
+  a: b;
+}
 SCSS
     end
 
@@ -1097,8 +1374,10 @@ div {
   before: before;
   background: {
     color: blue;
-    repeat: no-repeat; };
-  after: after; }
+    repeat: no-repeat;
+  };
+  after: after;
+}
 
 SCSS
   end
@@ -1106,17 +1385,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
@@ -1134,21 +1418,531 @@ SASS
   def test_loud_comment_conversion
     assert_renders(<<SASS, <<SCSS)
 /*! \#{"interpolated"}
-/*!
- *  \#{"also interpolated"}
 SASS
 /*! \#{"interpolated"} */
-/*!
- *  \#{"also interpolated"} */
 SCSS
+  end
+
+  def test_content_conversion
+    assert_renders(<<SASS, <<SCSS)
+$color: blue
+
+=context($class, $color: red)
+  .\#{$class}
+    background-color: $color
+    @content
+    border-color: $color
+
++context(parent)
+  +context(child, $color: yellow)
+    color: $color
+SASS
+$color: blue;
+
+@mixin context($class, $color: red) {
+  .\#{$class} {
+    background-color: $color;
+    @content;
+    border-color: $color;
+  }
+}
+
+@include context(parent) {
+  @include context(child, $color: yellow) {
+    color: $color;
+  }
+}
+SCSS
+
+  end
+
+  def test_empty_content
+    assert_scss_to_scss(<<SCSS)
+@mixin foo {
+  @content;
+}
+
+@include foo {}
+SCSS
+  end
+
+  def test_placeholder_conversion
+    assert_renders(<<SASS, <<SCSS)
+#content a%foo.bar
+  color: blue
+SASS
+#content a%foo.bar {
+  color: blue;
+}
+SCSS
+  end
+
+  def test_reference_selector
+    assert_renders(<<SASS, <<SCSS)
+foo /bar|baz/ bang
+  a: b
+SASS
+foo /bar|baz/ bang {
+  a: b;
+}
+SCSS
+  end
+
+  def test_subject
+    assert_renders(<<SASS, <<SCSS)
+foo bar! baz
+  a: b
+SASS
+foo bar! baz {
+  a: b;
+}
+SCSS
+  end
+
+  def test_placeholder_interoplation_conversion
     assert_renders(<<SASS, <<SCSS)
-//! \#{"interpolated"}
-//!
-//! \#{"also interpolated"}
+$foo: foo
+
+%\#{$foo}
+  color: blue
+
+.bar
+  @extend %foo
+SASS
+$foo: foo;
+
+%\#{$foo} {
+  color: blue;
+}
+
+.bar {
+  @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
+
+  def test_extend_with_optional
+    assert_scss_to_sass <<SASS, <<SCSS
+foo
+  @extend .bar !optional
 SASS
-//! \#{"interpolated"}
-//!
-//! \#{"also interpolated"}
+foo {
+  @extend .bar !optional;
+}
+SCSS
+  end
+
+  def test_mixin_var_args
+    assert_scss_to_sass <<SASS, <<SCSS
+=foo($args...)
+  a: b
+
+=bar($a, $args...)
+  a: b
+
+.foo
+  +foo($list...)
+  +bar(1, $list...)
+SASS
+@mixin foo($args...) {
+  a: b;
+}
+
+@mixin bar($a, $args...) {
+  a: b;
+}
+
+.foo {
+  @include foo($list...);
+  @include bar(1, $list...);
+}
+SCSS
+  end
+
+  def test_mixin_var_kwargs
+    assert_scss_to_sass <<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) {
+  a: $a;
+  c: $c;
+}
+
+.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
+@function foo($args...)
+  @return foo
+
+@function bar($a, $args...)
+  @return bar
+
+.foo
+  a: foo($list...)
+  b: bar(1, $list...)
+SASS
+@function foo($args...) {
+  @return foo;
+}
+
+@function bar($a, $args...) {
+  @return bar;
+}
+
+.foo {
+  a: foo($list...);
+  b: bar(1, $list...);
+}
+SCSS
+  end
+
+  def test_function_var_kwargs
+    assert_scss_to_sass <<SASS, <<SCSS
+@function foo($a: b, $c: d)
+  @return foo
+
+.foo
+  a: foo($list..., $map...)
+  b: foo(pos, $list..., $kwd: val, $map...)
+SASS
+@function foo($a: b, $c: d) {
+  @return foo;
+}
+
+.foo {
+  a: foo($list..., $map...);
+  b: foo(pos, $list..., $kwd: val, $map...);
+}
+SCSS
+  end
+
+  def test_at_root
+    assert_scss_to_sass <<SASS, <<SCSS
+.foo
+  @at-root
+    .bar
+      a: b
+    .baz
+      c: d
+SASS
+.foo {
+  @at-root {
+    .bar {
+      a: b;
+    }
+    .baz {
+      c: d;
+    }
+  }
+}
+SCSS
+  end
+
+  def test_at_root_with_selector
+    assert_scss_to_sass <<SASS, <<SCSS
+.foo
+  @at-root .bar
+    a: b
+SASS
+.foo {
+  @at-root .bar {
+    a: b;
+  }
+}
+SCSS
+  end
+
+  def test_at_root_without
+    assert_scss_to_sass <<SASS, <<SCSS
+.foo
+  @at-root (without: media rule)
+    a: b
+SASS
+.foo {
+  @at-root (without: media rule) {
+    a: b;
+  }
+}
+SCSS
+  end
+
+  def test_at_root_with
+    assert_scss_to_sass <<SASS, <<SCSS
+.foo
+  @at-root (with: media rule)
+    a: b
+SASS
+.foo {
+  @at-root (with: media rule) {
+    a: b;
+  }
+}
+SCSS
+  end
+
+  def test_function_var_kwargs_with_list
+    assert_scss_to_sass <<SASS, <<SCSS
+@function foo($a: b, $c: d)
+  @return $a, $c
+
+.foo
+  a: foo($list..., $map...)
+SASS
+@function foo($a: b, $c: d) {
+  @return $a, $c;
+}
+
+.foo {
+  a: foo($list..., $map...);
+}
+SCSS
+  end
+
+  ## Regression Tests
+
+  def test_list_in_args
+    assert_renders(<<SASS, <<SCSS)
++mixin((a, b, c))
+
++mixin($arg: (a, b, c))
+
++mixin(a, b, (c, d, e)...)
+SASS
+@include mixin((a, b, c));
+
+@include mixin($arg: (a, b, c));
+
+@include mixin(a, b, (c, d, e)...);
+SCSS
+  end
+
+  def test_media_query_with_expr
+    assert_scss_to_sass <<SASS, <<SCSS
+@media foo and (bar: baz)
+  a: b
+SASS
+@media foo and (bar: baz) {
+  a: b; }
+SCSS
+  end
+
+  def test_nested_if_statements
+    assert_renders(<<SASS, <<SCSS)
+@if $foo
+  one
+    a: b
+@else
+  @if $bar
+    two
+      a: b
+  @else
+    three
+      a: b
+SASS
+@if $foo {
+  one {
+    a: b;
+  }
+}
+@else {
+  @if $bar {
+    two {
+      a: b;
+    }
+  }
+  @else {
+    three {
+      a: b;
+    }
+  }
+}
+SCSS
+  end
+
+  def test_comment_indentation
+    assert_renders(<<SASS, <<SCSS, :indent => '    ')
+foo
+    // bar
+    /* baz
+    a: b
+SASS
+foo {
+    // bar
+    /* baz */
+    a: b;
+}
+SCSS
+  end
+
+  def test_keyword_arguments
+    assert_renders(<<SASS, <<SCSS, :dasherize => true)
+$foo: foo($dash-ed: 2px)
+SASS
+$foo: foo($dash-ed: 2px);
+SCSS
+    assert_scss_to_sass(<<SASS, <<SCSS, :dasherize => true)
+$foo: foo($dash-ed: 2px)
+SASS
+$foo: foo($dash_ed: 2px);
+SCSS
+    assert_sass_to_scss(<<SCSS, <<SASS, :dasherize => true)
+$foo: foo($dash-ed: 2px);
+SCSS
+$foo: foo($dash_ed: 2px)
+SASS
+    assert_renders(<<SASS, <<SCSS)
+$foo: foo($under_scored: 1px)
+SASS
+$foo: foo($under_scored: 1px);
+SCSS
+    assert_renders(<<SASS, <<SCSS)
+$foo: foo($dash-ed: 2px, $under_scored: 1px)
+SASS
+$foo: foo($dash-ed: 2px, $under_scored: 1px);
+SCSS
+  end
+
+  def test_ambiguous_negation
+    assert_renders(<<SASS, <<SCSS, :indent => '    ')
+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
+
+  def test_variable_with_global
+    assert_renders(<<SASS, <<SCSS)
+$var: 1
+
+foo
+  $var: 2 !global
+  $var: 3 !global !default
+SASS
+$var: 1;
+
+foo {
+  $var: 2 !global;
+  $var: 3 !global !default;
+}
 SCSS
   end
 
@@ -1174,7 +1968,7 @@ SCSS
     options ||= {}
 
     assert_equal(scss.rstrip, to_scss(in_scss, options.merge(:syntax => :scss)).rstrip,
-      "Expected SCSS to transform to #{scss == in_scss ? 'itself' : 'SCSS'}k")
+      "Expected SCSS to transform to #{scss == in_scss ? 'itself' : 'SCSS'}")
   end
 
   def assert_sass_to_scss(scss, sass, options = {})