haml-edge 2.3.179 → 2.3.180

data/test/sass/css2sass_test.rb

@@ -24,13 +24,10 @@ SASS
     assert_equal(<<SASS, css2sass(<<CSS))
 li
   display: none
-
   a
     text-decoration: none
-
     span
       color: yellow
-
     &:hover
       text-decoration: underline
 SASS
@@ -57,11 +54,9 @@ CSS
 div .warning
   color: #d21a19
 
-
 span .debug
   cursor: crosshair
 
-
 div .debug
   cursor: default
 SASS
@@ -104,27 +99,34 @@ span.turkey {
 } /* just a line here */
 CSS
     sass = <<SASS
+/* comment
+
 elephant.rawr
   rampages: excessively
 
+/* actual multiline
+  comment
 
 span.turkey
   isdinner: true
 
-
 .turducken
+  /* Sounds funny
+     doesn't it
   chimera: not_really
 
-
 #overhere
   bored: sorta
+  /*                  it's for a good
+     cause
   better_than: thread_pools
 
-
 #one_more
   finally: srsly
+
+/* just a line here
 SASS
-    assert_equal(css2sass(css), sass)
+    assert_equal(sass, css2sass(css))
   end
 
   def test_fold_commas
@@ -145,12 +147,10 @@ CSS
 .one
   color: green
 
-
 .two
   color: green
   color: red
 
-
 .three
   color: red
 SASS
@@ -168,20 +168,15 @@ CSS
     assert_equal(<<SASS, css2sass(<<CSS))
 hello
   parent: true
-
   there
     parent: false
-
   who
     hoo: false
-
   why
     y: true
-
   when
     wen: nao
 
-
 down_here
   yeah: true
 SASS
@@ -214,7 +209,6 @@ CSS
   #location-navigation-form .form-submit, #business-listing-form .form-submit, #detailTabs ul, #detailsEnhanced #addTags, #locationSearchList, #moreHoods
     display: none
 
-
 #navListLeft
   display: none
 SASS
@@ -235,7 +229,6 @@ CSS
     assert_equal(<<SASS, css2sass(<<CSS))
 \\:focus
   a: b
-
   \\:foo
     bar: baz
 SASS
@@ -263,7 +256,7 @@ CSS
   end
 
   def test_error_truncate_after
-    css2sass("#{"a" * 15}foo")
+    css2sass("#{"a" * 16}foo")
     assert(false, "Expected exception")
   rescue Sass::SyntaxError => err
     assert_equal(1, err.sass_line)
@@ -271,11 +264,43 @@ CSS
   end
 
   def test_error_truncate_was
-    css2sass("foo }#{"a" * 15}")
+    css2sass("foo }foo#{"a" * 15}")
     assert(false, "Expected exception")
   rescue Sass::SyntaxError => err
     assert_equal(1, err.sass_line)
-    assert_equal('Invalid CSS after "foo ": expected "{", was "}aaaaaaaaaaaaaa..."', err.message)
+    assert_equal('Invalid CSS after "foo ": expected "{", was "}fooaaaaaaaaaaa..."', err.message)
+  end
+
+  def test_error_doesnt_truncate_after_when_elipsis_would_add_length
+    css2sass("#{"a" * 15}foo")
+    assert(false, "Expected exception")
+  rescue Sass::SyntaxError => err
+    assert_equal(1, err.sass_line)
+    assert_equal('Invalid CSS after "aaaaaaaaaaaaaaafoo": expected "{", was ""', err.message)
+  end
+
+  def test_error_doesnt_truncate_was_when_elipsis_would_add_length
+    css2sass("foo }foo#{"a" * 14}")
+    assert(false, "Expected exception")
+  rescue Sass::SyntaxError => err
+    assert_equal(1, err.sass_line)
+    assert_equal('Invalid CSS after "foo ": expected "{", was "}fooaaaaaaaaaaaaaa"', err.message)
+  end
+
+  def test_error_gets_rid_of_trailing_newline_for_after
+    css2sass("foo  \n  ")
+    assert(false, "Expected exception")
+  rescue Sass::SyntaxError => err
+    assert_equal(2, err.sass_line)
+    assert_equal('Invalid CSS after "foo": expected "{", was ""', err.message)
+  end
+
+  def test_error_gets_rid_of_trailing_newline_for_was
+    css2sass("foo \n  }foo")
+    assert(false, "Expected exception")
+  rescue Sass::SyntaxError => err
+    assert_equal(2, err.sass_line)
+    assert_equal('Invalid CSS after "foo": expected "{", was "}foo"', err.message)
   end
 
   # Encodings

data/test/sass/engine_test.rb

@@ -15,15 +15,14 @@ class SassEngineTest < Test::Unit::TestCase
   # if so, the second element should be the line number that should be reported for the error.
   # If this isn't provided, the tests will assume the line number should be the last line of the document.
   EXCEPTION_MAP = {
-    "!a = 1 + " => 'Expected expression, was end of text.',
-    "!a = 1 + 2 +" => 'Expected expression, was end of text.',
-    "!a = 1 + 2 + %" => 'Expected expression, was mod token.',
-    "!a = foo(\"bar\"" => 'Expected rparen token, was end of text.',
-    "!a = 1 }" => 'Unexpected end_interpolation token.',
-    "!a = 1 }foo\"" => 'Unexpected end_interpolation token.',
+    "$a: 1 + " => 'Invalid CSS after "1 +": expected expression (e.g. 1px, bold), was ""',
+    "$a: 1 + 2 +" => 'Invalid CSS after "1 + 2 +": expected expression (e.g. 1px, bold), was ""',
+    "$a: 1 + 2 + %" => 'Invalid CSS after "1 + 2 + ": expected expression (e.g. 1px, bold), was "%"',
+    "$a: foo(\"bar\"" => 'Invalid CSS after "foo("bar"": expected ")", was ""',
+    "$a: 1 }" => 'Invalid CSS after "1 ": expected expression (e.g. 1px, bold), was "}"',
+    "$a: 1 }foo\"" => 'Invalid CSS after "1 ": expected expression (e.g. 1px, bold), was "}foo""',
     ":" => 'Invalid property: ":".',
     ": a" => 'Invalid property: ": a".',
-    ":= a" => 'Invalid property: ":= a".',
     "a\n  :b" => <<MSG,
 Invalid property: ":b" (no value).
 If ":b" should be a selector, use "\\:b" instead.
@@ -31,32 +30,32 @@ MSG
     "a\n  b:" => 'Invalid property: "b:" (no value).',
     "a\n  :b: c" => 'Invalid property: ":b: c".',
     "a\n  :b:c d" => 'Invalid property: ":b:c d".',
-    "a\n  :b=c d" => 'Invalid property: ":b=c d".',
-    "a\n  :b c;" => 'Invalid property: ":b c;" (no ";" required at end-of-line).',
-    "a\n  b: c;" => 'Invalid property: "b: c;" (no ";" required at end-of-line).',
-    "a\n  b : c" => 'Invalid property: "b : c".',
-    "a\n  b=c: d" => 'Invalid property: "b=c: d".',
+    "a\n  :b c;" => 'Invalid CSS after "c": expected expression (e.g. 1px, bold), was ";"',
+    "a\n  b: c;" => 'Invalid CSS after "c": expected expression (e.g. 1px, bold), was ";"',
     "a: b" => 'Properties aren\'t allowed at the root of a document.',
     ":a b" => 'Properties aren\'t allowed at the root of a document.',
     "!" => 'Invalid variable: "!".',
-    "!a" => 'Invalid variable: "!a".',
+    "$a" => 'Invalid variable: "$a".',
     "! a" => 'Invalid variable: "! a".',
-    "!a b" => 'Invalid variable: "!a b".',
-    "!a = 1b + 2c" => "Incompatible units: 'c' and 'b'.",
-    "!a = 1b < 2c" => "Incompatible units: 'c' and 'b'.",
-    "!a = 1b > 2c" => "Incompatible units: 'c' and 'b'.",
-    "!a = 1b <= 2c" => "Incompatible units: 'c' and 'b'.",
-    "!a = 1b >= 2c" => "Incompatible units: 'c' and 'b'.",
-    "a\n  :b= 1b * 2c" => "2b*c isn't a valid CSS value.",
-    "a\n  :b= 1b % 2c" => "Cannot modulo by a number with units: 2c.",
-    "!a = 2px + #ccc" => "Cannot add a number with units (2px) to a color (#cccccc).",
-    "!a = #ccc + 2px" => "Cannot add a number with units (2px) to a color (#cccccc).",
+    "$a b" => 'Invalid variable: "$a b".',
+    "$a: 1b + 2c" => "Incompatible units: 'c' and 'b'.",
+    "$a: 1b < 2c" => "Incompatible units: 'c' and 'b'.",
+    "$a: 1b > 2c" => "Incompatible units: 'c' and 'b'.",
+    "$a: 1b <= 2c" => "Incompatible units: 'c' and 'b'.",
+    "$a: 1b >= 2c" => "Incompatible units: 'c' and 'b'.",
+    "a\n  b: 1b * 2c" => "2b*c isn't a valid CSS value.",
+    "a\n  b: 1b % 2c" => "Cannot modulo by a number with units: 2c.",
+    "$a: 2px + #ccc" => "Cannot add a number with units (2px) to a color (#cccccc).",
+    "$a: #ccc + 2px" => "Cannot add a number with units (2px) to a color (#cccccc).",
     "& 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,\n  :b c" => ["Rules can\'t end in commas.", 1],
     "a," => "Rules can\'t end in commas.",
-    "a,\n!b = 1" => ["Rules can\'t end in commas.", 1],
-    "!a = b\n  :c d\n" => "Illegal nesting: Nothing may be nested beneath variable declarations.",
+    "a,\n$b: 1" => ["Rules can\'t end in commas.", 1],
+    "$a: b\n  :c d\n" => "Illegal nesting: Nothing may be nested beneath variable declarations.",
+    "@import foo.sass" => "File to import not found or unreadable: foo.sass.",
+    "a,\n$b: 1" => ["Rules can\'t end in commas.", 1],
+    "$a: b\n  :c d\n" => "Illegal nesting: Nothing may be nested beneath variable declarations.",
     "@import foo.sass" => <<MSG,
 File to import not found or unreadable: foo.sass.
 Load paths:
@@ -66,7 +65,7 @@ MSG
     "@import templates/basic\n  foo" => "Illegal nesting: Nothing may be nested beneath import directives.",
     "foo\n  @import templates/basic" => "Import directives may only be used at the root of a document.",
     "foo\n  @import #{File.dirname(__FILE__)}/templates/basic" => "Import directives may only be used at the root of a document.",
-    %Q{!foo = "bar" "baz" !} => %Q{Syntax error in '"bar" "baz" !' at character 20.},
+    '$foo: "bar" "baz" !' => %Q{Invalid CSS after ""bar" "baz" ": expected expression (e.g. 1px, bold), was "!"},
     "=foo\n  :color red\n.bar\n  +bang" => "Undefined mixin 'bang'.",
     "=foo\n  :color red\n.bar\n  +bang_bop" => "Undefined mixin 'bang_bop'.",
     "=foo\n  :color red\n.bar\n  +bang-bop" => "Undefined mixin 'bang-bop'.",
@@ -82,28 +81,29 @@ MSG
     "a\n  b: c\na\n    d: e" => ["The line was indented 2 levels deeper than the previous line.", 4],
     "a\n  b: c\n  a\n        d: e" => ["The line was indented 3 levels deeper than the previous line.", 4],
     "a\n \tb: c" => ["Indentation can't use both tabs and spaces.", 2],
-    "=a(" => 'Expected rparen token, was end of text.',
-    "=a(b)" => 'Expected rparen token, was ident token.',
-    "=a(,)" => "Expected rparen token, was comma token.",
-    "=a(!)" => "Syntax error in '(!)' at character 4.",
-    "=a(!foo bar)" => "Expected rparen token, was ident token.",
+    "=a(" => 'Invalid CSS after "(": expected ")", was ""',
+    "=a(b)" => 'Invalid CSS after "(": expected ")", was "b)"',
+    "=a(,)" => 'Invalid CSS after "(": expected ")", was ",)"',
+    "=a(!)" => 'Invalid CSS after "(": expected ")", was "!)"',
+    "=a($foo bar)" => 'Invalid CSS after "($foo ": expected ")", was "bar)"',
     "=foo\n  bar: baz\n+foo" => ["Properties aren't allowed at the root of a document.", 2],
-    "a-\#{!b\n  c: d" => ["Expected end_interpolation token, was end of text.", 1],
-    "=a(!b = 1, !c)" => "Required argument !c must come before any optional arguments.",
-    "=a(!b = 1)\n  :a= !b\ndiv\n  +a(1,2)" => "Mixin a takes 1 argument but 2 were passed.",
-    "=a(!b)\n  :a= !b\ndiv\n  +a" => "Mixin a is missing parameter !b.",
+    "a-\#{$b\n  c: d" => ['Invalid CSS after "a-#{$b": expected "}", was ""', 1],
+    "=a($b = 1, $c)" => "Required argument $c must come before any optional arguments.",
+    "=a($b = 1)\n  a: $b\ndiv\n  +a(1,2)" => "Mixin a takes 1 argument but 2 were passed.",
+    "=a($b)\n  a: $b\ndiv\n  +a" => "Mixin a is missing parameter $b.",
     "@else\n  a\n    b: c" => ["@else must come after @if.", 1],
     "@if false\n@else foo" => "Invalid else directive '@else foo': expected 'if <expr>'.",
     "@if false\n@else if " => "Invalid else directive '@else if': expected 'if <expr>'.",
-    "a\n  !b = 12\nc\n  d = !b" => 'Undefined variable: "!b".',
-    "=foo\n  !b = 12\nc\n  +foo\n  d = !b" => 'Undefined variable: "!b".',
-    "c\n  d = !b-foo" => 'Undefined variable: "!b-foo".',
-    "c\n  d = !b_foo" => 'Undefined variable: "!b_foo".',
-    '@for !a from "foo" to 1' => '"foo" is not an integer.',
-    '@for !a from 1 to "2"' => '"2" is not an integer.',
-    '@for !a from 1 to "foo"' => '"foo" is not an integer.',
-    '@for !a from 1 to 1.232323' => '1.232 is not an integer.',
-    '@for !a from 1px to 3em' => "Incompatible units: 'em' and 'px'.",
+    "a\n  !b: 12\nc\n  d: !b" => 'Undefined variable: "$b".',
+    "a\n  $b: 12\nc\n  d: $b" => 'Undefined variable: "$b".',
+    "=foo\n  $b: 12\nc\n  +foo\n  d: $b" => 'Undefined variable: "$b".',
+    "c\n  d: $b-foo" => 'Undefined variable: "$b-foo".',
+    "c\n  d: $b_foo" => 'Undefined variable: "$b_foo".',
+    '@for $a from "foo" to 1' => '"foo" is not an integer.',
+    '@for $a from 1 to "2"' => '"2" is not an integer.',
+    '@for $a from 1 to "foo"' => '"foo" is not an integer.',
+    '@for $a from 1 to 1.232323' => '1.232 is not an integer.',
+    '@for $a from 1px to 3em' => "Incompatible units: 'em' and 'px'.",
     '@if' => "Invalid if directive '@if': expected expression.",
     '@while' => "Invalid while directive '@while': expected expression.",
     '@debug' => "Invalid debug directive '@debug': expected expression.",
@@ -249,11 +249,11 @@ SASS
 
   def test_mixin_exception
     render(<<SASS)
-=error-mixin(!a)
-  color = !a * 1em * 1px
+=error-mixin($a)
+  color: $a * 1em * 1px
 
-=outer-mixin(!a)
-  +error-mixin(!a)
+=outer-mixin($a)
+  +error-mixin($a)
 
 .error
   +outer-mixin(12)
@@ -278,11 +278,11 @@ SASS
 
   def test_mixin_callsite_exception
     render(<<SASS)
-=one-arg-mixin(!a)
-  color = !a
+=one-arg-mixin($a)
+  color: $a
 
-=outer-mixin(!a)
-  +one-arg-mixin(!a, 12)
+=outer-mixin($a)
+  +one-arg-mixin($a, 12)
 
 .error
   +outer-mixin(12)
@@ -365,11 +365,11 @@ CSS
   def test_exception_css_with_mixins
     opts = {:full_exception => true}
     render(<<SASS, opts)
-=error-mixin(!a)
-  color = !a * 1em * 1px
+=error-mixin($a)
+  color: $a * 1em * 1px
 
-=outer-mixin(!a)
-  +error-mixin(!a)
+=outer-mixin($a)
+  +error-mixin($a)
 
 .error
   +outer-mixin(12)
@@ -382,11 +382,11 @@ Syntax error: 12em*px isn't a valid CSS value.
         from line 5 of test_exception_css_with_mixins_inline.sass, in `outer-mixin'
         from line 8 of test_exception_css_with_mixins_inline.sass
 
-1: =error-mixin(!a)
-2:   color = !a * 1em * 1px
+1: =error-mixin($a)
+2:   color: $a * 1em * 1px
 3: 
-4: =outer-mixin(!a)
-5:   +error-mixin(!a)
+4: =outer-mixin($a)
+5:   +error-mixin($a)
 6: 
 7: .error
 CSS
@@ -398,7 +398,7 @@ CSS
     opts = {:full_exception => true}
     render(<<SASS, opts)
 .filler
-  stuff: stuff!
+  stuff: "stuff!"
 
 a: b
 
@@ -412,7 +412,7 @@ Syntax error: Properties aren't allowed at the root of a document.
         on line 4 of test_cssize_exception_css_inline.sass
 
 1: .filler
-2:   stuff: stuff!
+2:   stuff: "stuff!"
 3: 
 4: a: b
 5: 
@@ -436,7 +436,7 @@ CSS
 
   def test_nonexistent_extensionless_import
     assert_warning(<<WARN) do
-WARNING: nonexistent.sass not found. Using nonexistent.css instead.
+WARNING: Neither nonexistent.sass nor .scss found. Using nonexistent.css instead.
 This behavior is deprecated and will be removed in a future version.
 If you really need nonexistent.css, import it explicitly.
 WARN
@@ -458,18 +458,24 @@ WARN
   end
 
   def test_default_function
-    assert_equal("foo {\n  bar: url(foo.png); }\n", render(%Q{foo\n  bar = url("foo.png")\n}));
-    assert_equal("foo {\n  bar: url(); }\n", render("foo\n  bar = url()\n"));
+    assert_equal(<<CSS, render(<<SASS))
+foo {
+  bar: url("foo.png"); }
+CSS
+foo
+  bar: url("foo.png")
+SASS
+    assert_equal("foo {\n  bar: url(); }\n", render("foo\n  bar: url()\n"));
   end
 
   def test_string_minus
-    assert_equal("foo {\n  bar: baz-boom-bat; }\n", render(%Q{foo\n  bar = "baz"-"boom"-"bat"}))
-    assert_equal("foo {\n  bar: -baz-boom; }\n", render(%Q{foo\n  bar = -"baz"-"boom"}))
+    assert_equal("foo {\n  bar: baz-boom-bat; }\n", render(%Q{foo\n  bar: baz-boom-bat}))
+    assert_equal("foo {\n  bar: -baz-boom; }\n", render(%Q{foo\n  bar: -baz-boom}))
   end
 
   def test_string_div
-    assert_equal("foo {\n  bar: baz/boom/bat; }\n", render(%Q{foo\n  bar = "baz"/"boom"/"bat"}))
-    assert_equal("foo {\n  bar: /baz/boom; }\n", render(%Q{foo\n  bar = /"baz"/"boom"}))
+    assert_equal("foo {\n  bar: baz/boom/bat; }\n", render(%Q{foo\n  bar: baz/boom/bat}))
+    assert_equal("foo {\n  bar: /baz/boom; }\n", render(%Q{foo\n  bar: /baz/boom}))
   end
 
   def test_basic_multiline_selector
@@ -632,23 +638,23 @@ SASS
   end
 
   def test_debug_info
-    esc_file_name = Haml::Util.scope("test_debug_info_inline.sass").gsub(/([^a-zA-Z0-9_-])/, "\\\\\\1")
+    esc_file_name = Sass::SCSS::RX.escape_ident(Haml::Util.scope("test_debug_info_inline.sass"))
 
     assert_equal(<<CSS, render(<<SASS, :debug_info => true, :style => :compact))
-@media -sass-debug-info{filename{font-family:file\\:\\/\\/#{esc_file_name}}line{font-family:\\0032 }}
+@media -sass-debug-info{filename{font-family:file\\:\\/\\/#{esc_file_name}}line{font-family:\\000032}}
 foo bar { foo: bar; }
-@media -sass-debug-info{filename{font-family:file\\:\\/\\/#{esc_file_name}}line{font-family:\\0035 }}
+@media -sass-debug-info{filename{font-family:file\\:\\/\\/#{esc_file_name}}line{font-family:\\000035}}
 foo baz { blip: blop; }
 
-@media -sass-debug-info{filename{font-family:file\\:\\/\\/#{esc_file_name}}line{font-family:\\0039 }}
+@media -sass-debug-info{filename{font-family:file\\:\\/\\/#{esc_file_name}}line{font-family:\\000039}}
 floodle { flop: blop; }
 
-@media -sass-debug-info{filename{font-family:file\\:\\/\\/#{esc_file_name}}line{font-family:\\0031 8}}
+@media -sass-debug-info{filename{font-family:file\\:\\/\\/#{esc_file_name}}line{font-family:\\0000318}}
 bup { mix: on; }
-@media -sass-debug-info{filename{font-family:file\\:\\/\\/#{esc_file_name}}line{font-family:\\0031 5}}
+@media -sass-debug-info{filename{font-family:file\\:\\/\\/#{esc_file_name}}line{font-family:\\0000315}}
 bup mixin { moop: mup; }
 
-@media -sass-debug-info{filename{font-family:file\\:\\/\\/#{esc_file_name}}line{font-family:\\0032 2}}
+@media -sass-debug-info{filename{font-family:file\\:\\/\\/#{esc_file_name}}line{font-family:\\0000322}}
 bip hop, skip hop { a: b; }
 CSS
 foo
@@ -679,7 +685,7 @@ SASS
 
   def test_debug_info_without_filename
     assert_equal(<<CSS, Sass::Engine.new(<<SASS, :debug_info => true).render)
-@media -sass-debug-info{filename{font-family:}line{font-family:\\0031 }}
+@media -sass-debug-info{filename{font-family:}line{font-family:\\000031}}
 foo {
   a: b; }
 CSS
@@ -698,10 +704,10 @@ SASS
   end
 
   def test_debug_info_with_line_annotations
-    esc_file_name = Haml::Util.scope("test_debug_info_with_line_annotations_inline.sass").gsub(/([^a-zA-Z0-9_-])/, "\\\\\\1")
+    esc_file_name = Sass::SCSS::RX.escape_ident(Haml::Util.scope("test_debug_info_with_line_annotations_inline.sass"))
 
     assert_equal(<<CSS, render(<<SASS, :debug_info => true, :line_comments => true))
-@media -sass-debug-info{filename{font-family:file\\:\\/\\/#{esc_file_name}}line{font-family:\\0031 }}
+@media -sass-debug-info{filename{font-family:file\\:\\/\\/#{esc_file_name}}line{font-family:\\000031}}
 foo {
   a: b; }
 CSS
@@ -748,15 +754,99 @@ foo
 SASS
   end
 
-  def test_or_eq
-    assert_equal("foo {\n  a: b; }\n", render(%Q{!foo = "b"\n!foo ||= "c"\nfoo\n  a = !foo}))
-    assert_equal("foo {\n  a: b; }\n", render(%Q{!foo ||= "b"\nfoo\n  a = !foo}))
+  def test_equals_warning_for_properties
+    assert_warning(<<WARN) {assert_equal(<<CSS, render(<<SASS))}
+DEPRECATION WARNING:
+On line 3, character 3 of 'test_equals_warning_for_properties_inline.sass'
+Setting properties with = has been deprecated and will be removed in version 3.2.
+Use "a: $var" instead.
+
+You can use `sass-convert --in-place --from sass2 file.sass' to convert files automatically.
+WARN
+foo {
+  a: 2px 3px; }
+CSS
+$var: 2px 3px
+foo
+  a = $var
+SASS
+  end
+
+  def test_equals_warning_for_dynamic_properties
+    assert_warning(<<WARN) {assert_equal(<<CSS, render(<<SASS))}
+DEPRECATION WARNING:
+On line 4, character 3 of 'test_equals_warning_for_dynamic_properties_inline.sass'
+Setting properties with = has been deprecated and will be removed in version 3.2.
+Use "a-\#{$i}: $var" instead.
+
+You can use `sass-convert --in-place --from sass2 file.sass' to convert files automatically.
+WARN
+foo {
+  a-12: 2px 3px; }
+CSS
+$var: 2px 3px
+$i: 12
+foo
+  a-\#{$i} = $var
+SASS
+  end
+
+  def test_equals_warning_for_property_with_string
+    assert_warning(<<WARN) {assert_equal(<<CSS, render(<<SASS))}
+DEPRECATION WARNING:
+On line 2, character 3 of 'test_equals_warning_for_property_with_string_inline.sass'
+Setting properties with = has been deprecated and will be removed in version 3.2.
+Use "a: foo" instead.
+
+You can use `sass-convert --in-place --from sass2 file.sass' to convert files automatically.
+WARN
+foo {
+  a: foo; }
+CSS
+foo
+  a = "foo"
+SASS
+  end
+
+  def test_equals_warning_for_property_with_division
+    assert_warning(<<WARN) {assert_equal(<<CSS, render(<<SASS))}
+DEPRECATION WARNING:
+On line 2, character 3 of 'test_equals_warning_for_property_with_division_inline.sass'
+Setting properties with = has been deprecated and will be removed in version 3.2.
+Use "a: (1px / 2px)" instead.
+
+You can use `sass-convert --in-place --from sass2 file.sass' to convert files automatically.
+WARN
+foo {
+  a: 0.5; }
+CSS
+foo
+  a = 1px/2px
+SASS
+  end
+
+  def test_guarded_assign
+    assert_equal("foo {\n  a: b; }\n", render(%Q{$foo: b\n$foo: c !default\nfoo\n  a: $foo}))
+    assert_equal("foo {\n  a: b; }\n", render(%Q{$foo: b !default\nfoo\n  a: $foo}))
   end
   
   def test_mixins
     renders_correctly "mixins", { :style => :expanded }
   end
 
+  def test_directive_style_mixins
+    assert_equal <<CSS, render(<<SASS)
+bar {
+  prop: baz; }
+CSS
+@mixin foo($arg)
+  prop: $arg
+
+bar
+  @include foo(baz)
+SASS
+  end
+
   def test_mixins_dont_interfere_with_sibling_combinator
     assert_equal("foo + bar {\n  a: b; }\nfoo + baz {\n  c: d; }\n",
                  render("foo\n  +\n    bar\n      a: b\n    baz\n      c: d"))
@@ -764,33 +854,33 @@ SASS
 
   def test_mixin_args
     assert_equal("blat {\n  baz: hi; }\n", render(<<SASS))
-=foo(!bar)
-  baz = !bar
+=foo($bar)
+  baz: $bar
 blat
-  +foo(\"hi\")
+  +foo(hi)
 SASS
     assert_equal("blat {\n  baz: 3; }\n", render(<<SASS))
-=foo(!a, !b)
-  baz = !a + !b
+=foo($a, $b)
+  baz: $a + $b
 blat
   +foo(1, 2)
 SASS
     assert_equal("blat {\n  baz: 4;\n  baz: 3;\n  baz: 5;\n  bang: 3; }\n", render(<<SASS))
-=foo(!c = (6 + 4) / 2)
-  baz = !c
-!c = 3
+=foo($c: (6 + 4) / 2)
+  baz: $c
+$c: 3
 blat
-  +foo(!c + 1)
-  +foo((!c + 3)/2)
+  +foo($c + 1)
+  +foo(($c + 3)/2)
   +foo
-  bang = !c
+  bang: $c
 SASS
   end
 
   def test_default_values_for_mixin_arguments
     assert_equal("white {\n  color: white; }\n\nblack {\n  color: black; }\n", render(<<SASS))
-=foo(!a = #FFF)
-  :color= !a
+=foo($a: #FFF)
+  :color $a
 white
   +foo
 black
@@ -812,11 +902,11 @@ three {
   padding: 2px;
   margin: 3px; }
 CSS
-!a = 5px
-=foo(!a, !b = 1px, !c = 3px + !b)
-  :color= !a
-  :padding= !b
-  :margin= !c
+$a: 5px
+=foo($a, $b: 1px, $c: 3px + $b)
+  :color $a
+  :padding $b
+  :margin $c
 one
   +foo(#fff)
 two
@@ -844,23 +934,56 @@ a
 SASS
   end
 
+  def test_equals_warning_for_mixin_args
+    assert_warning(<<WARN) {assert_equal(<<CSS, render(<<SASS))}
+DEPRECATION WARNING:
+On line 1, character 6 of 'test_equals_warning_for_mixin_args_inline.sass'
+Setting mixin argument defaults with = has been deprecated and will be removed in version 3.2.
+Use "$arg: 1px" instead.
+
+You can use `sass-convert --in-place --from sass2 file.sass' to convert files automatically.
+WARN
+bar {
+  a: 1px; }
+CSS
+=foo($arg = 1px)
+  a: $arg
+
+bar
+  +foo
+SASS
+  end
+
+  def test_css_identifier_mixin
+    assert_equal(<<CSS, render(<<SASS))
+a {
+  foo: 12; }
+CSS
+=\\{foo\\(12\\)($a)
+  foo: $a
+
+a
+  +\\{foo\\(12\\)(12)
+SASS
+  end
+
   def test_interpolation
     assert_equal("a-1 {\n  b-2-3: c-3; }\n", render(<<SASS))
-!a = 1
-!b = 2
-!c = 3
-a-\#{!a}
-  b-\#{!b}-\#{!c}: c-\#{!a + !b}
+$a: 1
+$b: 2
+$c: 3
+a-\#{$a}
+  b-\#{$b}-\#{$c}: c-\#{$a + $b}
 SASS
   end
 
   def test_if_directive
     assert_equal("a {\n  b: 1; }\n", render(<<SASS))
-!var = true
+$var: true
 a
-  @if !var
+  @if $var
     b: 1
-  @if not !var
+  @if not $var
     b: 2
 SASS
   end
@@ -891,14 +1014,38 @@ b-3 {
 b-4 {
   j-1: 3; }
 CSS
-!a = 3
-@for !i from 0 to !a + 1
-  a-\#{!i}
-    2i = 2 * !i
+$a: 3
+@for $i from 0 to $a + 1
+  a-\#{$i}
+    2i: 2 * $i
+
+@for $j from 1 through 4
+  b-\#{$j}
+    j-1: $j - 1
+SASS
+  end
+
+  def test_for_with_bang_var
+    assert_warning(<<WARN) {assert_equal(<<CSS, render(<<SASS))}
+DEPRECATION WARNING:
+On line 1, character 6 of 'test_for_with_bang_var_inline.sass'
+Variables with ! have been deprecated and will be removed in version 3.2.
+Use "$bar" instead.
+
+You can use `sass-convert --in-place --from sass2 file.sass' to convert files automatically.
+WARN
+a-0 {
+  b: c; }
 
-@for !j from 1 through 4
-  b-\#{!j}
-    j-1 = !j - 1
+a-1 {
+  b: c; }
+
+a-2 {
+  b: c; }
+CSS
+@for !bar from 0 to 3
+  a-\#{$bar}
+    b: c
 SASS
   end
 
@@ -919,11 +1066,11 @@ a-2 {
 a-1 {
   blooble: gloop; }
 CSS
-!a = 5
-@while !a != 0
-  a-\#{!a}
+$a: 5
+@while $a != 0
+  a-\#{$a}
     blooble: gloop
-  !a = !a - 1
+  $a: $a - 1
 SASS
   end
 
@@ -973,11 +1120,83 @@ a {
   b: 1;
   c: 2; }
 CSS
-!a = 1
+$a: 1
 a
-  b = !a
-  !a = 2
-  c = !a
+  b: $a
+  $a: 2
+  c: $a
+SASS
+  end
+
+  def test_bang_variables
+    assert_warning(<<WARN) {assert_equal(<<CSS, render(<<SASS))}
+DEPRECATION WARNING:
+On line 1, character 1 of 'test_bang_variables_inline.sass'
+Variables with ! have been deprecated and will be removed in version 3.2.
+Use "$bang-var" instead.
+
+You can use `sass-convert --in-place --from sass2 file.sass' to convert files automatically.
+WARN
+foo {
+  a: 1px; }
+CSS
+!bang-var: 1px
+foo
+  a: $bang-var
+SASS
+
+    assert_warning(<<WARN) {assert_equal(<<CSS, render(<<SASS))}
+DEPRECATION WARNING:
+On line 3, character 6 of 'test_bang_variables_inline.sass'
+Variables with ! have been deprecated and will be removed in version 3.2.
+Use "$dollar-var" instead.
+
+You can use `sass-convert --in-place --from sass2 file.sass' to convert files automatically.
+WARN
+foo {
+  a: 1px; }
+CSS
+$dollar-var: 1px
+foo
+  a: !dollar-var
+SASS
+  end
+
+  def test_equals_warning_for_variables
+    assert_warning(<<WARN) {assert_equal(<<CSS, render(<<SASS))}
+DEPRECATION WARNING:
+On line 2, character 1 of 'test_equals_warning_for_variables_inline.sass'
+Setting variables with = has been deprecated and will be removed in version 3.2.
+Use "$equals-var: 2px 3px" instead.
+
+You can use `sass-convert --in-place --from sass2 file.sass' to convert files automatically.
+WARN
+foo {
+  a: 2px 3px; }
+CSS
+
+$equals-var = 2px 3px
+foo
+  a: $equals-var
+SASS
+  end
+
+  def test_equals_warning_for_guarded_variables
+    assert_warning(<<WARN) {assert_equal(<<CSS, render(<<SASS))}
+DEPRECATION WARNING:
+On line 2, character 1 of 'test_equals_warning_for_guarded_variables_inline.sass'
+Setting variable defaults with ||= has been deprecated and will be removed in version 3.2.
+Use "$equals-var: 2px 3px !default" instead.
+
+You can use `sass-convert --in-place --from sass2 file.sass' to convert files automatically.
+WARN
+foo {
+  a: 2px 3px; }
+CSS
+
+$equals-var ||= 2px 3px
+foo
+  a: $equals-var
 SASS
   end
 
@@ -991,18 +1210,18 @@ a {
 b {
   d: 17; }
 CSS
-!i = 12
+$i: 12
 a
-  @for !i from 1 through 2
-    b-\#{!i}: c
-  d = !i
+  @for $i from 1 through 2
+    b-\#{$i}: c
+  d: $i
 
 =foo
-  !i = 17
+  $i: 17
 
 b
   +foo
-  d = !i
+  d: $i
 SASS
   end
 
@@ -1015,22 +1234,45 @@ d {
   e: 13;
   f: foobar; }
 CSS
-!var-hyphen = 12
-!var_under = "foo"
+$var-hyphen: 12
+$var_under: foo
 
 a
-  !var_hyphen = 1 + !var_hyphen
-  !var-under = !var-under + "bar"
+  $var_hyphen: 1 + $var_hyphen
+  $var-under: $var-under + bar
   b: c
 
 d
-  e = !var-hyphen
-  f = !var_under
+  e: $var-hyphen
+  f: $var_under
+SASS
+  end
+
+  def test_css_identifier_variable
+    assert_equal(<<CSS, render(<<SASS))
+a {
+  b: 12; }
+CSS
+$\\{foo\\(12\\): 12
+
+a
+  b: $\\{foo\\(12\\)
+SASS
+  end
+
+  def test_important
+    assert_equal(<<CSS, render(<<SASS))
+a {
+  b: 12px !important; }
+CSS
+$foo: 12px
+a
+  b: $foo !important
 SASS
   end
 
   def test_argument_error
-    assert_raise(Sass::SyntaxError) { render("a\n  b = hsl(1)") }
+    assert_raise(Sass::SyntaxError) { render("a\n  b: hsl(1)") }
   end
 
   def test_comments_at_the_top_of_a_document
@@ -1136,25 +1378,7 @@ SASS
   def test_empty_selector_warning
     assert_warning(<<END) {render("foo bar")}
 WARNING on line 1 of test_empty_selector_warning_inline.sass:
-Selector "foo bar" doesn't have any properties and will not be rendered.
-END
-
-    assert_warning(<<END) {render(<<SASS)}
-WARNING on line 3 of test_empty_selector_warning_inline.sass:
-Selector
-  foo, bar, baz,
-  bang, bip, bop
-doesn't have any properties and will not be rendered.
-END
-
-
-foo, bar, baz,
-bang, bip, bop
-SASS
-
-    assert_warning(<<END) {render("foo bar", :filename => nil)}
-WARNING on line 1:
-Selector "foo bar" doesn't have any properties and will not be rendered.
+This selector doesn't have any properties and will not be rendered.
 END
   end
 
@@ -1189,6 +1413,302 @@ foo
 SASS
   end
 
+  def test_interpolation_in_raw_functions
+    assert_equal(<<CSS, render(<<SASS))
+foo {
+  filter: progid:Microsoft.foo.bar.Baz(flip=foobar, bang=#00ff00cc); }
+CSS
+foo
+  filter: progid:Microsoft.foo.bar.Baz(flip=\#{foo + bar}, bang=#00ff00cc)
+SASS
+  end
+
+  # SassScript string behavior
+
+  def test_plus_preserves_quotedness
+    assert_equal(<<CSS, render(<<SASS))
+foo {
+  a: "foo1";
+  b: "1foo";
+  c: foo1;
+  d: 1foo;
+  e: "foobar";
+  f: foobar; }
+CSS
+foo
+  a: "foo" + 1
+  b: 1 + "foo"
+  c: foo + 1
+  d: 1 + foo
+  e: "foo" + bar
+  f: foo + "bar"
+SASS
+  end
+
+  def test_colon_properties_preserve_quotedness
+    assert_equal(<<CSS, render(<<SASS))
+foo {
+  a: "foo";
+  b: bar;
+  c: "foo" bar;
+  d: foo, "bar"; }
+CSS
+foo
+  a: "foo"
+  b: bar
+  c: "foo" bar
+  d: foo, "bar"
+SASS
+  end
+
+  def test_colon_variables_preserve_quotedness
+    assert_equal(<<CSS, render(<<SASS))
+foo {
+  a: "foo";
+  b: bar; }
+CSS
+$a: "foo"
+$b: bar
+
+foo
+  a: $a
+  b: $b
+SASS
+  end
+
+  def test_colon_args_preserve_quotedness
+    assert_equal(<<CSS, render(<<SASS))
+foo {
+  a: "foo";
+  b: bar;
+  c: "foo" bar;
+  d: foo, "bar"; }
+CSS
+=foo($a: "foo", $b: bar, $c: "foo" bar, $d: (foo, "bar"))
+  foo
+    a: $a
+    b: $b
+    c: $c
+    d: $d
+
++foo
+SASS
+  end
+
+  def test_interpolation_unquotes_strings
+    assert_equal(<<CSS, render(<<SASS))
+.foo-bar {
+  a: b; }
+CSS
+.foo-\#{"bar"}
+  a: b
+SASS
+
+    assert_equal(<<CSS, render(<<SASS))
+.foo {
+  a: b c; }
+CSS
+.foo
+  a: b \#{"c"}
+SASS
+  end
+
+  def test_interpolation_unquotes_strings_in_vars
+    assert_equal(<<CSS, render(<<SASS))
+.foo-bar {
+  a: b; }
+CSS
+$var: "bar"
+
+.foo-\#{$var}
+  a: b
+SASS
+  end
+
+  def test_interpolation_doesnt_deep_unquote_strings
+    assert_equal(<<CSS, render(<<SASS))
+.foo-"bar" "baz" {
+  a: b; }
+CSS
+.foo-\#{"bar" "baz"}
+  a: b
+SASS
+  end
+
+  # Deprecated equals behavior
+
+  def test_equals_properties_unquote_strings
+    silence_warnings do
+      assert_equal(<<CSS, render(<<SASS))
+foo {
+  a: foo;
+  b: bar;
+  c: foo bar;
+  d: foo, bar; }
+CSS
+foo
+  a= "foo"
+  b= bar
+  c= "foo" bar
+  d= foo, "bar"
+SASS
+    end
+  end
+
+  def test_equals_properties_unquote_value
+    silence_warnings do
+      assert_equal(<<CSS, render(<<SASS))
+foo {
+  a: foo; }
+CSS
+$var: "foo"
+
+foo
+  a= $var
+SASS
+    end
+  end
+
+  def test_equals_properties_deep_unquote_vars
+    silence_warnings do
+      assert_equal(<<CSS, render(<<SASS))
+foo {
+  a: foo bar;
+  b: bar foo; }
+CSS
+$var: "foo"
+
+foo
+  a= $var "bar"
+  b= "bar" $var
+SASS
+    end
+  end
+
+  def test_equals_vars_unquote_strings
+    silence_warnings do
+      assert_equal(<<CSS, render(<<SASS))
+foo {
+  a: foo;
+  b: bar;
+  c: foo bar;
+  d: foo, bar; }
+CSS
+$a = "foo"
+$b = bar
+$c = "foo" bar
+$d = foo, "bar"
+
+foo
+  a: $a
+  b: $b
+  c: $c
+  d: $d
+SASS
+    end
+  end
+
+  def test_equals_vars_unquote_value
+    silence_warnings do
+      assert_equal(<<CSS, render(<<SASS))
+foo {
+  a: foo; }
+CSS
+$var1: "foo"
+$var2 = $var1
+
+foo
+  a: $var2
+SASS
+    end
+  end
+
+  def test_equals_vars_deep_unquote_vars
+    silence_warnings do
+      assert_equal(<<CSS, render(<<SASS))
+foo {
+  a: foo bar;
+  b: bar foo; }
+CSS
+$var: "foo"
+$a = $var "bar"
+$b = "bar" $var
+
+foo
+  a: $a
+  b: $b
+SASS
+    end
+  end
+
+  def test_equals_args_unquote_strings
+    silence_warnings do
+      assert_equal(<<CSS, render(<<SASS))
+foo {
+  a: foo;
+  b: bar;
+  c: foo bar;
+  d: foo, bar; }
+CSS
+=foo($a = "foo", $b = bar, $c = "foo" bar, $d = (foo, "bar"))
+  foo
+    a: $a
+    b: $b
+    c: $c
+    d: $d
+
++foo
+SASS
+    end
+  end
+
+  def test_equals_args_unquote_value
+    silence_warnings do
+      assert_equal(<<CSS, render(<<SASS))
+foo {
+  a: foo; }
+CSS
+$var1: "foo"
+
+=foo($var2 = $var1)
+  foo
+    a: $var2
+
++foo
+SASS
+    end
+  end
+
+  def test_equals_args_deep_unquote_vars
+    silence_warnings do
+      assert_equal(<<CSS, render(<<SASS))
+foo {
+  a: foo bar;
+  b: bar foo; }
+CSS
+$var: "foo"
+=foo($a = $var "bar", $b = "bar" $var)
+  foo
+    a: $a
+    b: $b
+
++foo
+SASS
+    end
+  end
+
+  def test_equals_properties_force_division
+    silence_warnings do
+      assert_equal(<<CSS, render(<<SASS))
+foo {
+  a: 0.5; }
+CSS
+foo
+  a = 1px/2px
+SASS
+    end
+  end
+
   # Regression tests
 
   def test_parens_in_mixins
@@ -1197,9 +1717,9 @@ SASS
   color: #01ff7f;
   background-color: #000102; }
 CSS
-=foo(!c1, !c2 = rgb(0, 1, 2))
-  color = !c1
-  background-color = !c2
+=foo($c1, $c2: rgb(0, 1, 2))
+  color: $c1
+  background-color: $c2
 
 .foo
   +foo(rgb(1,255,127))
@@ -1224,7 +1744,7 @@ SOURCE
 RESULT
 .box
   :border
-    /*:color black
+    /* :color black
     :style solid
 SOURCE
 
@@ -1310,7 +1830,7 @@ a {
   b: nested; }
 CSS
 a
-  b= option("style")
+  b: option("style")
 SASS
   end