radiantcms-couchrest_model 0.1.3 → 0.1.4

data/vendor/plugins/haml/test/sass/results/compressed.css

@@ -1 +1 @@
-#main{width:15em;color:blue}#main p{border-style:dotted;border-width:2px}#main .cool{width:100px}#left{font-size:2em;font-weight:bold;float:left}
+#main{width:15em;color:#0000ff}#main p{border-style:dotted;border-width:2px}#main .cool{width:100px}#left{font-size:2em;font-weight:bold;float:left}

data/vendor/plugins/haml/test/sass/results/expanded.css

@@ -1,6 +1,6 @@
 #main {
   width: 15em;
-  color: blue;
+  color: #0000ff;
 }
 #main p {
   border-style: dotted;

data/vendor/plugins/haml/test/sass/results/import.css

@@ -12,8 +12,6 @@ body { font: Arial; background: blue; }
 
 midrule { inthe: middle; }
 
-scss { imported: yes; }
-
 body { font: Arial; background: blue; }
 
 #page { width: 700px; height: 100; }
@@ -26,6 +24,6 @@ body { font: Arial; background: blue; }
 
 @import url(basic.css);
 @import url(../results/complex.css);
-#foo { background-color: #bbaaff; }
+#foo { background-color: #baf; }
 
 nonimported { myconst: hello; otherconst: goodbye; post-mixin: here; }

data/vendor/plugins/haml/test/sass/results/mixins.css

@@ -1,12 +1,12 @@
 #main {
   width: 15em;
-  color: blue;
+  color: #0000ff;
 }
 #main p {
   border-top-width: 2px;
   border-top-color: #ffcc00;
   border-left-width: 1px;
-  border-left-color: black;
+  border-left-color: #000;
   -moz-border-radius: 10px;
   border-style: dotted;
   border-width: 2px;
@@ -19,7 +19,7 @@
   border-top-width: 2px;
   border-top-color: #ffcc00;
   border-left-width: 1px;
-  border-left-color: black;
+  border-left-color: #000;
   -moz-border-radius: 10px;
   font-size: 2em;
   font-weight: bold;
@@ -30,9 +30,9 @@
   border-top-width: 2px;
   border-top-color: #ffcc00;
   border-left-width: 1px;
-  border-left-color: black;
+  border-left-color: #000;
   -moz-border-radius: 10px;
-  color: red;
+  color: #f00;
   font-size: 20px;
   float: right;
 }
@@ -41,12 +41,12 @@
   border-top-width: 2px;
   border-top-color: #ffcc00;
   border-left-width: 1px;
-  border-left-color: black;
+  border-left-color: #000;
   -moz-border-radius: 10px;
 }
 
 .complex {
-  color: red;
+  color: #f00;
   font-size: 20px;
   text-decoration: none;
 }
@@ -59,12 +59,12 @@
 }
 * html .complex {
   height: 1px;
-  color: red;
+  color: #f00;
   font-size: 20px;
 }
 
 .more-complex {
-  color: red;
+  color: #f00;
   font-size: 20px;
   text-decoration: none;
   display: inline;
@@ -80,16 +80,16 @@
 }
 * html .more-complex {
   height: 1px;
-  color: red;
+  color: #f00;
   font-size: 20px;
 }
 .more-complex a:hover {
   text-decoration: underline;
-  color: red;
+  color: #f00;
   font-size: 20px;
   border-top-width: 2px;
   border-top-color: #ffcc00;
   border-left-width: 1px;
-  border-left-color: black;
+  border-left-color: #000;
   -moz-border-radius: 10px;
 }

data/vendor/plugins/haml/test/sass/results/nested.css

@@ -1,6 +1,6 @@
 #main {
   width: 15em;
-  color: blue; }
+  color: #0000ff; }
   #main p {
     border-style: dotted;
     /* Nested comment

data/vendor/plugins/haml/test/sass/results/parent_ref.css

@@ -1,13 +1,13 @@
-a { color: black; }
-a:hover { color: red; }
+a { color: #000; }
+a:hover { color: #f00; }
 
 p, div { width: 100em; }
 p foo, div foo { width: 10em; }
 p:hover, p bar, div:hover, div bar { height: 20em; }
 
 #cool { border-style: solid; border-width: 2em; }
-.ie7 #cool, .ie6 #cool { content: string("Totally not cool."); }
-.firefox #cool { content: string("Quite cool."); }
+.ie7 #cool, .ie6 #cool { content: string(Totally not cool.); }
+.firefox #cool { content: string(Quite cool.); }
 
 .wow, .snazzy { font-family: fantasy; }
 .wow:hover, .wow:visited, .snazzy:hover, .snazzy:visited { font-weight: bold; }

data/vendor/plugins/haml/test/sass/results/script.css

@@ -1,7 +1,7 @@
-#main { content: Hello\!; qstr: 'Quo"ted"!'; hstr: Hyph-en\!; width: 30em; background-color: black; color: #ffffaa; short-color: #112233; named-color: olive; con: "foo" bar 9 hi there "boom"; con2: "noquo" quo; }
-#main #sidebar { background-color: #00ff98; num-normal: 10; num-dec: 10.2; num-dec0: 99; num-neg: -10; esc: 10 \+12; many: 6; order: 7; complex: #4c9db1hi16; }
+#main { content: Hello!; qstr: Quo"ted"!; hstr: Hyph-en!; width: 30em; background-color: #000; color: #ffffaa; short-color: #112233; named-color: olive; con: foo bar(9 hi there boom); con2: noquo quo; }
+#main #sidebar { background-color: #00ff98; num-normal: 10; num-dec: 10.2; num-dec0: 99; num-neg: -10; esc: 10 +12; many: 6; order: 7; complex: #4c9db1hi16; }
 
-#plus { num-num: 7; num-num-un: 25em; num-num-un2: 23em; num-num-neg: 9.87; num-str: 100px; num-col: #b7b7b7; num-perc: 31%; str-str: "hi\ there"; str-str2: "hi there"; str-col: "14em solid #112233"; str-num: "times: 13"; col-num: #ff7b9d; col-col: #5173ff; }
+#plus { num-num: 7; num-num-un: 25em; num-num-un2: 23em; num-num-neg: 9.87; num-str: 100px; num-col: #b7b7b7; num-perc: 31%; str-str: hi there; str-str2: hi there; str-col: 14em solid #112233; str-num: times: 13; col-num: #ff7b9d; col-col: #5173ff; }
 
 #minus { num-num: 900; col-num: #f9f9f4; col-col: #000035; unary-num: -1; unary-const: 10; unary-paren: -11; unary-two: 12; unary-many: 12; unary-crazy: -15; }
 
@@ -11,6 +11,6 @@
 
 #mod { num-num: 2; col-col: #0f0e05; col-num: #020001; }
 
-#const { escaped-quote: \$foo \!bar; default: Hello\! !important; }
+#const { escaped-quote: !foo; default: Hello! !important; }
 
 #regression { a: 4; }

data/vendor/plugins/haml/test/sass/script_test.rb

@@ -2,42 +2,18 @@
 require File.dirname(__FILE__) + '/../test_helper'
 require 'sass/engine'
 
-module Sass::Script::Functions::UserFunctions
-  def assert_options(val)
-    val.options[:foo]
-    Sass::Script::String.new("Options defined!")
-  end
-end
-
 class SassScriptTest < Test::Unit::TestCase
   include Sass::Script
 
   def test_color_checks_input
-    assert_raise_message(Sass::SyntaxError, "Blue value must be between 0 and 255") {Color.new([1, 2, -1])}
-    assert_raise_message(Sass::SyntaxError, "Red value must be between 0 and 255") {Color.new([256, 2, 3])}
-  end
-
-  def test_color_checks_rgba_input
-    assert_raise_message(Sass::SyntaxError, "Alpha channel must be between 0 and 1") {Color.new([1, 2, 3, 1.1])}
-    assert_raise_message(Sass::SyntaxError, "Alpha channel must be between 0 and 1") {Color.new([1, 2, 3, -0.1])}
+    assert_raise(Sass::SyntaxError, "Color values must be between 0 and 255") {Color.new([1, 2, -1])}
+    assert_raise(Sass::SyntaxError, "Color values must be between 0 and 255") {Color.new([256, 2, 3])}
   end
 
   def test_string_escapes
-    assert_equal "'", resolve("\"'\"")
     assert_equal '"', resolve("\"\\\"\"")
-    assert_equal "\\\\", resolve("\"\\\\\"")
+    assert_equal "\\", resolve("\"\\\\\"")
     assert_equal "\\02fa", resolve("\"\\02fa\"")
-
-    assert_equal "'", resolve("'\\''")
-    assert_equal '"', resolve("'\"'")
-    assert_equal "\\\\", resolve("'\\\\'")
-    assert_equal "\\02fa", resolve("'\\02fa'")
-  end
-
-  def test_string_interpolation
-    assert_equal "foo2bar", resolve('\'foo#{1 + 1}bar\'')
-    assert_equal "foo2bar", resolve('"foo#{1 + 1}bar"')
-    assert_equal "foo1bar5baz4bang", resolve('\'foo#{1 + "bar#{2 + 3}baz" + 4}bang\'')
   end
 
   def test_color_names
@@ -46,124 +22,15 @@ class SassScriptTest < Test::Unit::TestCase
     assert_equal "#fffffe", resolve("white - #000001")
   end
 
-  def test_rgba_color_literals
-    assert_equal Sass::Script::Color.new([1, 2, 3, 0.75]), eval("rgba(1, 2, 3, 0.75)")
-    assert_equal "rgba(1, 2, 3, 0.75)", resolve("rgba(1, 2, 3, 0.75)")
-
-    assert_equal Sass::Script::Color.new([1, 2, 3, 0]), eval("rgba(1, 2, 3, 0)")
-    assert_equal "rgba(1, 2, 3, 0)", resolve("rgba(1, 2, 3, 0)")
-
-    assert_equal Sass::Script::Color.new([1, 2, 3]), eval("rgba(1, 2, 3, 1)")
-    assert_equal Sass::Script::Color.new([1, 2, 3, 1]), eval("rgba(1, 2, 3, 1)")
-    assert_equal "#010203", resolve("rgba(1, 2, 3, 1)")
-    assert_equal "white", resolve("rgba(255, 255, 255, 1)")
-  end
-
-  def test_rgba_color_math
-    assert_equal "rgba(50, 50, 100, 0.35)", resolve("rgba(1, 1, 2, 0.35) * rgba(50, 50, 50, 0.35)")
-    assert_equal "rgba(52, 52, 52, 0.25)", resolve("rgba(2, 2, 2, 0.25) + rgba(50, 50, 50, 0.25)")
-
-    assert_raise_message(Sass::SyntaxError, "Alpha channels must be equal: rgba(1, 2, 3, 0.15) + rgba(50, 50, 50, 0.75)") do
-      resolve("rgba(1, 2, 3, 0.15) + rgba(50, 50, 50, 0.75)")
-    end
-    assert_raise_message(Sass::SyntaxError, "Alpha channels must be equal: #123456 * rgba(50, 50, 50, 0.75)") do
-      resolve("#123456 * rgba(50, 50, 50, 0.75)")
-    end
-    assert_raise_message(Sass::SyntaxError, "Alpha channels must be equal: rgba(50, 50, 50, 0.75) / #123456") do
-      resolve("rgba(50, 50, 50, 0.75) / #123456")
-    end
-  end
-
-  def test_rgba_number_math
-    assert_equal "rgba(49, 49, 49, 0.75)", resolve("rgba(50, 50, 50, 0.75) - 1")
-    assert_equal "rgba(100, 100, 100, 0.75)", resolve("rgba(50, 50, 50, 0.75) * 2")
-  end
-
-  def test_rgba_rounding
-    assert_equal "rgba(10, 1, 0, 0.123)", resolve("rgba(10.0, 1.23456789, 0.0, 0.1234567)")
-  end
-
-  def test_compressed_colors
-    assert_equal "#123456", resolve("#123456", :style => :compressed)
-    assert_equal "rgba(1,2,3,0.5)", resolve("rgba(1, 2, 3, 0.5)", :style => :compressed)
-    assert_equal "#123", resolve("#112233", :style => :compressed)
-    assert_equal "#000", resolve("black", :style => :compressed)
-    assert_equal "red", resolve("#f00", :style => :compressed)
-    assert_equal "blue", resolve("#00f", :style => :compressed)
-    assert_equal "navy", resolve("#000080", :style => :compressed)
-    assert_equal "navy #fff", resolve("#000080 white", :style => :compressed)
-    assert_equal "This color is #fff", resolve('"This color is #{ white }"', :style => :compressed)
-  end
-
-  def test_compressed_comma
-    # assert_equal "foo,bar,baz", resolve("foo, bar, baz", :style => :compressed)
-    # assert_equal "foo,#baf,baz", resolve("foo, #baf, baz", :style => :compressed)
-    assert_equal "foo,#baf,red", resolve("foo, #baf, #f00", :style => :compressed)
-  end
-
   def test_implicit_strings
-    assert_equal Sass::Script::String.new("foo"), eval("foo")
-    assert_equal Sass::Script::String.new("foo bar"), eval("foo bar")
-    assert_equal Sass::Script::String.new("foo/bar"), eval("foo/bar")
-  end
-
-  def test_basic_interpolation
-    assert_equal "foo3bar", resolve("foo\#{1 + 2}bar")
-    assert_equal "foo3 bar", resolve("foo\#{1 + 2} bar")
-    assert_equal "foo 3bar", resolve("foo \#{1 + 2}bar")
-    assert_equal "foo 3 bar", resolve("foo \#{1 + 2} bar")
-    assert_equal "foo 35 bar", resolve("foo \#{1 + 2}\#{2 + 3} bar")
-    assert_equal "foo 3 5 bar", resolve("foo \#{1 + 2} \#{2 + 3} bar")
-    assert_equal "3bar", resolve("\#{1 + 2}bar")
-    assert_equal "foo3", resolve("foo\#{1 + 2}")
-    assert_equal "3", resolve("\#{1 + 2}")
-  end
-
-  def test_interpolation_in_function
-    assert_equal 'flabnabbit(1foo)', resolve('flabnabbit(#{1 + "foo"})')
-    assert_equal 'flabnabbit(foo 1foobaz)', resolve('flabnabbit(foo #{1 + "foo"}baz)')
-    assert_equal('flabnabbit(foo 1foo2bar baz)',
-      resolve('flabnabbit(foo #{1 + "foo"}#{2 + "bar"} baz)'))
-  end
-
-  def test_interpolation_near_operators
-    assert_equal '3 , 7', resolve('#{1 + 2} , #{3 + 4}')
-    assert_equal '3, 7', resolve('#{1 + 2}, #{3 + 4}')
-    assert_equal '3 ,7', resolve('#{1 + 2} ,#{3 + 4}')
-    assert_equal '3,7', resolve('#{1 + 2},#{3 + 4}')
-
-    assert_equal '3 / 7', resolve('3 / #{3 + 4}')
-    assert_equal '3 /7', resolve('3 /#{3 + 4}')
-    assert_equal '3/ 7', resolve('3/ #{3 + 4}')
-    assert_equal '3/7', resolve('3/#{3 + 4}')
-
-    assert_equal '3 * 7', resolve('#{1 + 2} * 7')
-    assert_equal '3* 7', resolve('#{1 + 2}* 7')
-    assert_equal '3 *7', resolve('#{1 + 2} *7')
-    assert_equal '3*7', resolve('#{1 + 2}*7')
-
-    assert_equal '-3', resolve('-#{1 + 2}')
-    assert_equal '- 3', resolve('- #{1 + 2}')
-
-    assert_equal '5 + 3 * 7', resolve('5 + #{1 + 2} * #{3 + 4}')
-    assert_equal '5 +3 * 7', resolve('5 +#{1 + 2} * #{3 + 4}')
-    assert_equal '5+3 * 7', resolve('5+#{1 + 2} * #{3 + 4}')
-    assert_equal '3 * 7 + 5', resolve('#{1 + 2} * #{3 + 4} + 5')
-    assert_equal '3 * 7+ 5', resolve('#{1 + 2} * #{3 + 4}+ 5')
-    assert_equal '3 * 7+5', resolve('#{1 + 2} * #{3 + 4}+5')
-
-    assert_equal '5/3 + 7', resolve('5 / (#{1 + 2} + #{3 + 4})')
-    assert_equal '5/3 + 7', resolve('5 /(#{1 + 2} + #{3 + 4})')
-    assert_equal '5/3 + 7', resolve('5 /( #{1 + 2} + #{3 + 4} )')
-    assert_equal '3 + 7/5', resolve('(#{1 + 2} + #{3 + 4}) / 5')
-    assert_equal '3 + 7/5', resolve('(#{1 + 2} + #{3 + 4})/ 5')
-    assert_equal '3 + 7/5', resolve('( #{1 + 2} + #{3 + 4} )/ 5')
-
-    assert_equal '3 + 5', resolve('#{1 + 2} + 2 + 3')
-    assert_equal '3 +5', resolve('#{1 + 2} +2 + 3')
+    silence_warnings do
+      assert_equal Sass::Script::String.new("foo"), eval("foo")
+      assert_equal Sass::Script::String.new("foo bar"), eval("foo bar")
+      assert_equal Sass::Script::String.new("foo/bar"), eval("foo/bar")
+    end
   end
 
-  def test_string_interpolation
+  def test_interpolation
     assert_equal "foo bar, baz bang", resolve('"foo #{"bar"}, #{"baz"} bang"')
     assert_equal "foo bar baz bang", resolve('"foo #{"#{"ba" + "r"} baz"} bang"')
     assert_equal 'foo #{bar baz} bang', resolve('"foo \#{#{"ba" + "r"} baz} bang"')
@@ -179,57 +46,78 @@ foo \#{"\#{"ba" + "r"} baz"} bang
   a: b
 SASS
     assert_equal(<<CSS, render(<<SASS))
-foo [bar="\#{bar baz}"] bang {
+foo \#{bar baz} bang {
   a: b; }
 CSS
-foo [bar="\\\#{\#{"ba" + "r"} baz}"] bang
+foo \\\#{\#{"ba" + "r"} baz} bang
   a: b
 SASS
     assert_equal(<<CSS, render(<<SASS))
-foo [bar="\#{baz"] bang {
+foo \#{baz bang {
   a: b; }
 CSS
-foo [bar="\#{"\\\#{" + "baz"}"] bang
+foo \#{"\\\#{" + "baz"} bang
   a: b
 SASS
   end
 
-  def test_inaccessible_functions
-    assert_equal "send(to_s)", resolve("send(to_s)", :line => 2)
-    assert_equal "public_instance_methods()", resolve("public_instance_methods()")
-  end
-
-  def test_default_functions
-    assert_equal "url(12)", resolve("url(12)")
-    assert_equal 'blam("foo")', resolve('blam("foo")')
+  def test_implicit_string_warning
+    assert_warning(<<WARN) {eval("foo")}
+DEPRECATION WARNING:
+On line 1, character 1 of 'test_implicit_string_warning_inline.sass'
+Implicit strings have been deprecated and will be removed in version 3.0.
+'foo' was not quoted. Please add double quotes (e.g. "foo").
+WARN
+    assert_warning(<<WARN) {eval("1 + foo")}
+DEPRECATION WARNING:
+On line 1, character 5 of 'test_implicit_string_warning_inline.sass'
+Implicit strings have been deprecated and will be removed in version 3.0.
+'foo' was not quoted. Please add double quotes (e.g. "foo").
+WARN
+    assert_warning(<<WARN) {render("@if 1 + foo")}
+DEPRECATION WARNING:
+On line 1, character 9 of 'test_implicit_string_warning_inline.sass'
+Implicit strings have been deprecated and will be removed in version 3.0.
+'foo' was not quoted. Please add double quotes (e.g. "foo").
+WARN
+
+    # Regression
+    assert_warning(<<WARN) {render("@if if")}
+DEPRECATION WARNING:
+On line 1, character 5 of 'test_implicit_string_warning_inline.sass'
+Implicit strings have been deprecated and will be removed in version 3.0.
+'if' was not quoted. Please add double quotes (e.g. "if").
+WARN
   end
 
-  def test_function_results_have_options
-    assert_equal "Options defined!", resolve("assert_options(abs(1))")
-    assert_equal "Options defined!", resolve("assert_options(round(1.2))")
-  end
-
-  def test_funcall_requires_no_whitespace_before_lparen
-    assert_equal "no-repeat 15px", resolve("no-repeat (7px + 8px)")
-    assert_equal "no-repeat(15px)", resolve("no-repeat(7px + 8px)")
-  end
-
-  def test_dynamic_url
-    assert_equal "url(foo-bar)", resolve("url($foo)", {}, env('foo' => Sass::Script::String.new("foo-bar")))
-    assert_equal "url(foo-bar baz)", resolve("url($foo $bar)", {}, env('foo' => Sass::Script::String.new("foo-bar"), 'bar' => Sass::Script::String.new("baz")))
-    assert_equal "url(foo baz)", resolve("url(foo $bar)", {}, env('bar' => Sass::Script::String.new("baz")))
-    assert_equal "url(foo bar)", resolve("url(foo    bar)")
+  def test_inaccessible_functions
+    assert_warning <<WARN do
+DEPRECATION WARNING:
+On line 2, character 6 of 'test_inaccessible_functions_inline.sass'
+Implicit strings have been deprecated and will be removed in version 3.0.
+'to_s' was not quoted. Please add double quotes (e.g. "to_s").
+WARN
+      assert_equal "send(to_s)", resolve("send(to_s)", :line => 2)
+    end
+    assert_equal "public_instance_methods()", resolve("public_instance_methods()")
   end
 
-  def test_url_with_interpolation
-    assert_equal "url(http://sass-lang.com/images/foo-bar)", resolve("url(http://sass-lang.com/images/\#{foo-bar})")
-    assert_equal 'url("http://sass-lang.com/images/foo-bar")', resolve("url('http://sass-lang.com/images/\#{foo-bar}')")
-    assert_equal 'url("http://sass-lang.com/images/foo-bar")', resolve('url("http://sass-lang.com/images/#{foo-bar}")')
-    assert_unquoted "url(http://sass-lang.com/images/\#{foo-bar})"
-  end
+  def test_hyphen_warning
+    a = Sass::Script::String.new("a")
+    b = Sass::Script::String.new("b")
+    assert_warning(<<WARN) {eval("!a-!b", {}, env("a" => a, "b" => b))}
+DEPRECATION WARNING:
+On line 1, character 3 of 'test_hyphen_warning_inline.sass'
+- will be allowed as part of variable names in version 3.0.
+Please add whitespace to separate it from the previous token.
+WARN
 
-  def test_hyphenated_variables
-    assert_equal("a-b", resolve("$a-b", {}, env("a-b" => Sass::Script::String.new("a-b"))))
+    assert_warning(<<WARN) {eval("true-false")}
+DEPRECATION WARNING:
+On line 1, character 5 of 'test_hyphen_warning_inline.sass'
+- will be allowed as part of variable names in version 3.0.
+Please add whitespace to separate it from the previous token.
+WARN
   end
 
   def test_ruby_equality
@@ -267,27 +155,27 @@ SASS
     assert_equal "2", resolve("1 + 1")
     assert_equal "0", resolve("1 - 1")
     assert_equal "8", resolve("2 * 4")
-    assert_equal "0.5", resolve("(2 / 4)")
-    assert_equal "2", resolve("(4 / 2)")
+    assert_equal "0.5", resolve("2 / 4")
+    assert_equal "2", resolve("4 / 2")
 
     assert_equal "-1", resolve("-1")
   end
 
   def test_string_ops
-    assert_equal '"foo" "bar"', resolve('"foo" "bar"')
+    assert_equal "foo bar", resolve('"foo" "bar"')
     assert_equal "true 1", resolve('true 1')
-    assert_equal '"foo", "bar"', resolve("'foo' , 'bar'")
+    assert_equal "foo, bar", resolve('"foo" , "bar"')
     assert_equal "true, 1", resolve('true , 1')
     assert_equal "foobar", resolve('"foo" + "bar"')
     assert_equal "true1", resolve('true + 1')
-    assert_equal '"foo"-"bar"', resolve("'foo' - 'bar'")
+    assert_equal "foo-bar", resolve('"foo" - "bar"')
     assert_equal "true-1", resolve('true - 1')
-    assert_equal '"foo"/"bar"', resolve('"foo" / "bar"')
+    assert_equal "foo/bar", resolve('"foo" / "bar"')
     assert_equal "true/1", resolve('true / 1')
 
-    assert_equal '-"bar"', resolve("- 'bar'")
+    assert_equal "-bar", resolve('- "bar"')
     assert_equal "-true", resolve('- true')
-    assert_equal '/"bar"', resolve('/ "bar"')
+    assert_equal "/bar", resolve('/ "bar"')
     assert_equal "/true", resolve('/ true')
   end
 
@@ -307,7 +195,7 @@ SASS
   end
 
   def test_equals
-    assert_equal("true", resolve('"foo" == $foo', {},
+    assert_equal("true", resolve('"foo" == !foo', {},
         env("foo" => Sass::Script::String.new("foo"))))
     assert_equal "true", resolve("1 == 1.0")
     assert_equal "true", resolve("false != true")
@@ -337,114 +225,23 @@ SASS
     assert_equal "true", resolve("1.1cm == 11mm")
   end
 
-  def test_operations_have_options
-    assert_equal "Options defined!", resolve("assert_options(1 + 1)")
-    assert_equal "Options defined!", resolve("assert_options('bar' + 'baz')")
-  end
-
-  def test_slash_compiles_literally_when_left_alone
-    assert_equal "1px/2px", resolve("1px/2px")
-    assert_equal "1px/2px/3px/4px", resolve("1px/2px/3px/4px")
-
-    assert_equal "1px/2px redpx bluepx", resolve("1px/2px redpx bluepx")
-    assert_equal "foo 1px/2px/3px bar", resolve("foo 1px/2px/3px bar")
-  end
-
-  def test_slash_divides_with_parens
-    assert_equal "0.5", resolve("(1px/2px)")
-    assert_equal "0.5", resolve("(1px)/2px")
-    assert_equal "0.5", resolve("1px/(2px)")
-  end
-
-  def test_slash_divides_with_other_arithmetic
-    assert_equal "0.5px", resolve("1px*1px/2px")
-    assert_equal "0.5px", resolve("1px/2px*1px")
-    assert_equal "0.5", resolve("0+1px/2px")
-    assert_equal "0.5", resolve("1px/2px+0")
-  end
-
-  def test_slash_divides_with_variable
-    assert_equal "0.5", resolve("$var/2px", {}, env("var" => eval("1px")))
-    assert_equal "0.5", resolve("1px/$var", {}, env("var" => eval("2px")))
-    assert_equal "0.5", resolve("$var", {}, env("var" => eval("1px/2px")))
-  end
-
-  def test_colors_with_wrong_number_of_digits
-    assert_raise_message(Sass::SyntaxError,
-      "Colors must have either three or six digits: '#0'") {eval("#0")}
-    assert_raise_message(Sass::SyntaxError,
-      "Colors must have either three or six digits: '#12'") {eval("#12")}
-    assert_raise_message(Sass::SyntaxError,
-      "Colors must have either three or six digits: '#abcd'") {eval("#abcd")}
-    assert_raise_message(Sass::SyntaxError,
-      "Colors must have either three or six digits: '#abcdE'") {eval("#abcdE")}
-    assert_raise_message(Sass::SyntaxError,
-      "Colors must have either three or six digits: '#abcdEFA'") {eval("#abcdEFA")}
-  end
-
-  def test_case_insensitive_color_names
-    assert_equal "blue", resolve("BLUE")
-    assert_equal "red", resolve("rEd")
-    assert_equal "#7f4000", resolve("mix(GrEeN, ReD)")
-  end
-
-  # Regression Tests
-
-  def test_funcall_has_higher_precedence_than_color_name
-    assert_equal "teal(12)", resolve("teal(12)")
-    assert_equal "tealbang(12)", resolve("tealbang(12)")
-    assert_equal "teal-bang(12)", resolve("teal-bang(12)")
-    assert_equal "teal\\+bang(12)", resolve("teal\\+bang(12)")
-  end
+  # Regression tests
 
   def test_interpolation_after_hash
     assert_equal "#2", resolve('"##{1 + 1}"')
   end
 
-  def test_misplaced_comma_in_funcall
-    assert_raise_message(Sass::SyntaxError,
-      'Invalid CSS after "foo(bar, ": expected function argument, was ")"') {eval('foo(bar, )')}
-  end
-
-  def test_color_prefixed_identifier
-    assert_equal "tealbang", resolve("tealbang")
-    assert_equal "teal-bang", resolve("teal-bang")
-  end
-
-  def test_op_prefixed_identifier
-    assert_equal "notbang", resolve("notbang")
-    assert_equal "not-bang", resolve("not-bang")
-    assert_equal "or-bang", resolve("or-bang")
-    assert_equal "and-bang", resolve("and-bang")
-  end
-
   private
 
   def resolve(str, opts = {}, environment = env)
     munge_filename opts
-    val = eval(str, opts, environment)
-    val.is_a?(Sass::Script::String) ? val.value : val.to_s
-  end
-
-  def assert_unquoted(str, opts = {}, environment = env)
-    munge_filename opts
-    val = eval(str, opts, environment)
-    assert_kind_of Sass::Script::String, val
-    assert_equal :identifier, val.type
-  end
-
-  def assert_quoted(str, opts = {}, environment = env)
-    munge_filename opts
-    val = eval(str, opts, environment)
-    assert_kind_of Sass::Script::String, val
-    assert_equal :string, val.type
+    eval(str, opts, environment).to_s
   end
 
   def eval(str, opts = {}, environment = env)
     munge_filename opts
-    environment.options = opts
-    Sass::Script.parse(str, opts.delete(:line) || 1,
-      opts.delete(:offset) || 0, opts).perform(environment)
+    Sass::Script.parse(str, opts[:line] || 1,
+      opts[:offset] || 0, opts[:filename]).perform(environment)
   end
 
   def render(sass, options = {})