oreorenasass 3.4.4 → 3.4.5

data/test/sass/results/expanded.css

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

data/test/sass/results/import.css

@@ -26,6 +26,6 @@ body { font: Arial; background: blue; }
 #content.user.show #container.top #column.right { width: 600px; }
 #content.user.show #container.bottom { background: brown; }
 
-#foo { background-color: #baf; }
+#foo { background-color: #bbaaff; }
 
 nonimported { myconst: hello; otherconst: goodbye; post-mixin: here; }

data/test/sass/results/import_charset_ibm866.css

@@ -1,5 +1,5 @@
-@charset "UTF-8";
+@charset "IBM866";
 @import url(foo.css);
 .foo { a: b; }
 
-.bar { a: щ; }
+.bar { a: �; }

data/test/sass/results/mixins.css

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

data/test/sass/results/nested.css

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

data/test/sass/results/parent_ref.css

@@ -1,5 +1,5 @@
-a { color: #000; }
-a:hover { color: #f00; }
+a { color: black; }
+a:hover { color: red; }
 
 p, div { width: 100em; }
 p foo, div foo { width: 10em; }

data/test/sass/results/script.css

@@ -1,7 +1,7 @@
-#main { content: Hello\!; qstr: 'Quo"ted"!'; hstr: Hyph-en\!; width: 30em; background-color: #000; color: #ffa; short-color: #123; 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: 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; }
 
-#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 #123"; 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; }
 

data/test/sass/results/scss_import.css

@@ -26,6 +26,6 @@ body { font: Arial; background: blue; }
 #content.user.show #container.top #column.right { width: 600px; }
 #content.user.show #container.bottom { background: brown; }
 
-#foo { background-color: #baf; }
+#foo { background-color: #bbaaff; }
 
 nonimported { myconst: hello; otherconst: goodbye; post-mixin: here; }

data/test/sass/script_conversion_test.rb

@@ -3,7 +3,7 @@
 require File.dirname(__FILE__) + '/../test_helper'
 require 'sass/engine'
 
-class SassScriptConversionTest < MiniTest::Test
+class SassScriptConversionTest < Test::Unit::TestCase
   def test_bool
     assert_renders "true"
     assert_renders "false"
@@ -13,8 +13,9 @@ class SassScriptConversionTest < MiniTest::Test
     assert_renders "#abcdef"
     assert_renders "blue"
     assert_renders "rgba(0, 1, 2, 0.2)"
-    assert_renders "#abc"
-    assert_renders "#0000ff"
+
+    assert_equal "#aabbcc", render("#abc")
+    assert_equal "blue", render("#0000ff")
   end
 
   def test_number
@@ -57,10 +58,6 @@ class SassScriptConversionTest < MiniTest::Test
     assert_renders "foo($karg1: val, $karg2: val2)"
   end
 
-  def test_funcall_with_hyphen_conversion_keyword_arg
-    assert_renders "foo($a-b_c: val)"
-  end
-
   def test_url
     assert_renders "url(foo.gif)"
     assert_renders "url($var)"
@@ -86,37 +83,11 @@ class SassScriptConversionTest < MiniTest::Test
     assert_renders "foo(a, b, (a, b, c)...)"
   end
 
-  def test_singleton_list
-    assert_renders "(1,)"
-    assert_renders "(1 2 3,)"
-    assert_renders "((1, 2, 3),)"
-  end
-
-  def test_map
-    assert_renders "(foo: bar)"
-    assert_renders "(foo: bar, baz: bip)"
-    assert_renders "(foo: bar, baz: (bip: bap))"
-  end
-
-  def test_map_in_list
-    assert_renders "(foo: bar) baz"
-    assert_renders "(foo: bar), (baz: bip)"
-  end
-
-  def test_list_in_map
-    assert_renders "(foo: bar baz)"
-    assert_renders "(foo: (bar, baz), bip: bop)"
-  end
-
-  def test_selector
-    assert_renders "&"
-  end
-
   def self.test_precedence(outer, inner)
     op_outer = Sass::Script::Lexer::OPERATORS_REVERSE[outer]
     op_inner = Sass::Script::Lexer::OPERATORS_REVERSE[inner]
     class_eval <<RUBY
-      def test_precedence_#{outer}_#{inner}
+      def test_precedence_#{outer}_#{inner} 
         assert_renders "$foo #{op_outer} $bar #{op_inner} $baz"
         assert_renders "$foo #{op_inner} $bar #{op_outer} $baz"
 
@@ -135,7 +106,7 @@ RUBY
     op = separator_for(op_name)
     sibling = separator_for(sibling_name)
     class_eval <<RUBY
-      def test_associative_#{op_name}_#{sibling_name}
+      def test_associative_#{op_name}_#{sibling_name} 
         assert_renders "$foo#{op}$bar#{op}$baz"
 
         assert_equal "$foo#{op}$bar#{op}$baz",
@@ -163,7 +134,7 @@ RUBY
     op = Sass::Script::Lexer::OPERATORS_REVERSE[op_name]
     sibling = Sass::Script::Lexer::OPERATORS_REVERSE[sibling_name]
     class_eval <<RUBY
-      def test_non_associative_#{op_name}_#{sibling_name}
+      def test_non_associative_#{op_name}_#{sibling_name} 
         assert_renders "$foo #{op} $bar #{op} $baz"
 
         assert_renders "$foo #{op} ($bar #{op} $baz)"

data/test/sass/script_test.rb

@@ -1,12 +1,11 @@
 #!/usr/bin/env ruby
-# -*- coding: utf-8 -*-
 require File.dirname(__FILE__) + '/../test_helper'
 require 'sass/engine'
 
 module Sass::Script::Functions::UserFunctions
   def assert_options(val)
     val.options[:foo]
-    Sass::Script::Value::String.new("Options defined!")
+    Sass::Script::String.new("Options defined!")
   end
 
   def arg_error
@@ -18,73 +17,46 @@ module Sass::Script::Functions
   include Sass::Script::Functions::UserFunctions
 end
 
-class SassScriptTest < MiniTest::Test
+class SassScriptTest < Test::Unit::TestCase
   include Sass::Script
 
-  def test_color_clamps_input
-    assert_equal 0, Sass::Script::Value::Color.new([1, 2, -1]).blue
-    assert_equal 255, Sass::Script::Value::Color.new([256, 2, 3]).red
+  def test_color_checks_input
+    assert_raise_message(ArgumentError, "Blue value -1 must be between 0 and 255") {Color.new([1, 2, -1])}
+    assert_raise_message(ArgumentError, "Red value 256 must be between 0 and 255") {Color.new([256, 2, 3])}
   end
 
-  def test_color_clamps_rgba_input
-    assert_equal 1, Sass::Script::Value::Color.new([1, 2, 3, 1.1]).alpha
-    assert_equal 0, Sass::Script::Value::Color.new([1, 2, 3, -0.1]).alpha
+  def test_color_checks_rgba_input
+    assert_raise_message(ArgumentError, "Alpha channel 1.1 must be between 0 and 1") {Color.new([1, 2, 3, 1.1])}
+    assert_raise_message(ArgumentError, "Alpha channel -0.1 must be between 0 and 1") {Color.new([1, 2, 3, -0.1])}
   end
 
   def test_string_escapes
     assert_equal "'", resolve("\"'\"")
     assert_equal '"', resolve("\"\\\"\"")
-    assert_equal "\\", resolve("\"\\\\\"")
-    assert_equal "☃", resolve("\"\\2603\"")
-    assert_equal "☃f", resolve("\"\\2603 f\"")
-    assert_equal "☃x", resolve("\"\\2603x\"")
-    assert_equal "\\2603", resolve("\"\\\\2603\"")
-
-    # U+FFFD is the replacement character, "�".
-    assert_equal [0xFFFD].pack("U"), resolve("\"\\0\"")
-    assert_equal [0xFFFD].pack("U"), resolve("\"\\FFFFFF\"")
-    assert_equal [0xFFFD].pack("U"), resolve("\"\\D800\"")
-    assert_equal [0xD7FF].pack("U"), resolve("\"\\D7FF\"")
-    assert_equal [0xFFFD].pack("U"), resolve("\"\\DFFF\"")
-    assert_equal [0xE000].pack("U"), resolve("\"\\E000\"")
-  end
-
-  def test_string_escapes_are_resolved_before_operators
-    assert_equal "true", resolve('"abc" == "\61\62\63"')
-  end
+    assert_equal "\\\\", resolve("\"\\\\\"")
+    assert_equal "\\02fa", resolve("\"\\02fa\"")
 
-  def test_string_quote
-    assert_equal '"foo"', resolve_quoted('"foo"')
-    assert_equal "'f\"oo'", resolve_quoted('"f\"oo"')
-    assert_equal "\"f'oo\"", resolve_quoted("'f\\'oo'")
-    assert_equal "\"f'o\\\"o\"", resolve_quoted("'f\\'o\"o'")
-    assert_equal '"foo bar"', resolve_quoted('"foo\20 bar"')
-    assert_equal '"foo\a bar"', resolve_quoted('"foo\a bar"')
-    assert_equal '"x\ay"', resolve_quoted('"x\a y"')
-    assert_equal '"\a  "', resolve_quoted('"\a\20"')
-    assert_equal '"\a abcdef"', resolve_quoted('"\a abcdef"')
-    assert_equal '"☃abcdef"', resolve_quoted('"\2603 abcdef"')
-    assert_equal '"\\\\"', resolve_quoted('"\\\\"')
-    assert_equal '"foobar"', resolve_quoted("\"foo\\\nbar\"")
+    assert_equal "'", resolve("'\\''")
+    assert_equal '"', resolve("'\"'")
+    assert_equal "\\\\", resolve("'\\\\'")
+    assert_equal "\\02fa", resolve("'\\02fa'")
   end
 
   def test_color_names
     assert_equal "white", resolve("white")
-    assert_equal "#ffffff", resolve("#ffffff")
+    assert_equal "white", resolve("#ffffff")
     assert_equal "#fffffe", resolve("white - #000001")
-    assert_equal "transparent", resolve("transparent")
-    assert_equal "transparent", resolve("rgba(0, 0, 0, 0)")
   end
 
   def test_rgba_color_literals
-    assert_equal Sass::Script::Value::Color.new([1, 2, 3, 0.75]), eval("rgba(1, 2, 3, 0.75)")
+    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::Value::Color.new([1, 2, 3, 0]), eval("rgba(1, 2, 3, 0)")
+    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::Value::Color.new([1, 2, 3]), eval("rgba(1, 2, 3, 1)")
-    assert_equal Sass::Script::Value::Color.new([1, 2, 3, 1]), eval("rgba(1, 2, 3, 1)")
+    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
@@ -119,11 +91,10 @@ class SassScriptTest < MiniTest::Test
     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("blue", :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)
-    assert_equal "transparent", resolve("rgba(0, 0, 0, 0)", :style => :compressed)
   end
 
   def test_compressed_comma
@@ -133,8 +104,8 @@ class SassScriptTest < MiniTest::Test
   end
 
   def test_implicit_strings
-    assert_equal Sass::Script::Value::String.new("foo"), eval("foo")
-    assert_equal Sass::Script::Value::String.new("foo/bar"), eval("foo/bar")
+    assert_equal Sass::Script::String.new("foo"), eval("foo")
+    assert_equal Sass::Script::String.new("foo/bar"), eval("foo/bar")
   end
 
   def test_basic_interpolation
@@ -206,11 +177,6 @@ class SassScriptTest < MiniTest::Test
     assert_equal "foo1bar5baz4bang", resolve('\'foo#{1 + "bar#{2 + 3}baz" + 4}bang\'')
   end
 
-  def test_interpolation_with_newline
-    assert_equal "\nbang", resolve('"#{"\a "}bang"')
-    assert_equal "\n\nbang", resolve('"#{"\a "}\a bang"')
-  end
-
   def test_rule_interpolation
     assert_equal(<<CSS, render(<<SASS))
 foo bar baz bang {
@@ -263,9 +229,9 @@ SASS
   end
 
   def test_dynamic_url
-    assert_equal "url(foo-bar)", resolve("url($foo)", {}, env('foo' => Sass::Script::Value::String.new("foo-bar")))
-    assert_equal "url(foo-bar baz)", resolve("url($foo $bar)", {}, env('foo' => Sass::Script::Value::String.new("foo-bar"), 'bar' => Sass::Script::Value::String.new("baz")))
-    assert_equal "url(foo baz)", resolve("url(foo $bar)", {}, env('bar' => Sass::Script::Value::String.new("baz")))
+    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)")
   end
 
@@ -277,7 +243,7 @@ SASS
   end
 
   def test_hyphenated_variables
-    assert_equal("a-b", resolve("$a-b", {}, env("a-b" => Sass::Script::Value::String.new("a-b"))))
+    assert_equal("a-b", resolve("$a-b", {}, env("a-b" => Sass::Script::String.new("a-b"))))
   end
 
   def test_ruby_equality
@@ -286,8 +252,8 @@ SASS
     assert_equal eval('1 2 3.0'), eval('1 2 3')
     assert_equal eval('1, 2, 3.0'), eval('1, 2, 3')
     assert_equal eval('(1 2), (3, 4), (5 6)'), eval('(1 2), (3, 4), (5 6)')
-    refute_equal eval('1, 2, 3'), eval('1 2 3')
-    refute_equal eval('1'), eval('"1"')
+    assert_not_equal eval('1, 2, 3'), eval('1 2 3')
+    assert_not_equal eval('1'), eval('"1"')
   end
 
   def test_booleans
@@ -347,7 +313,6 @@ SASS
     assert_equal '"foo", "bar"', resolve("'foo' , 'bar'")
     assert_equal "true, 1", resolve('true , 1')
     assert_equal "foobar", resolve('"foo" + "bar"')
-    assert_equal "\nfoo\nxyz", resolve('"\a foo" + "\axyz"')
     assert_equal "true1", resolve('true + 1')
     assert_equal '"foo"-"bar"', resolve("'foo' - 'bar'")
     assert_equal "true-1", resolve('true - 1')
@@ -408,7 +373,7 @@ SASS
 
   def test_equals
     assert_equal("true", resolve('"foo" == $foo', {},
-        env("foo" => Sass::Script::Value::String.new("foo"))))
+        env("foo" => Sass::Script::String.new("foo"))))
     assert_equal "true", resolve("1 == 1.0")
     assert_equal "true", resolve("false != true")
     assert_equal "false", resolve("1em == 1px")
@@ -433,12 +398,6 @@ SASS
     assert_equal "true", resolve('() != null')
   end
 
-  def test_mod
-    assert_equal "5", resolve("29 % 12")
-    assert_equal "5px", resolve("29px % 12")
-    assert_equal "5px", resolve("29px % 12px")
-  end
-
   def test_operation_precedence
     assert_equal "false true", resolve("true and false false or true")
     assert_equal "true", resolve("false and true or true and true")
@@ -462,36 +421,6 @@ SASS
     assert_equal "true", resolve("1.1cm == 11mm")
   end
 
-  def test_length_units
-    assert_equal "2.54", resolve("(1in/1cm)")
-    assert_equal "2.3622", resolve("(1cm/1pc)")
-    assert_equal "4.23333", resolve("(1pc/1mm)")
-    assert_equal "2.83465", resolve("(1mm/1pt)")
-    assert_equal "1.33333", resolve("(1pt/1px)")
-    assert_equal "0.01042", resolve("(1px/1in)")
-  end
-
-  def test_angle_units
-    assert_equal "1.11111", resolve("(1deg/1grad)")
-    assert_equal "0.01571", resolve("(1grad/1rad)")
-    assert_equal "0.15915", resolve("(1rad/1turn)")
-    assert_equal "360", resolve("(1turn/1deg)")
-  end
-
-  def test_time_units
-    assert_equal "1000", resolve("(1s/1ms)")
-  end
-
-  def test_frequency_units
-    assert_equal "0.001", resolve("(1Hz/1kHz)")
-  end
-
-  def test_resolution_units
-    assert_equal "2.54", resolve("(1dpi/1dpcm)")
-    assert_equal "37.79528", resolve("(1dpcm/1dppx)")
-    assert_equal "0.01042", resolve("(1dppx/1dpi)")
-  end
-
   def test_operations_have_options
     assert_equal "Options defined!", resolve("assert_options(1 + 1)")
     assert_equal "Options defined!", resolve("assert_options('bar' + 'baz')")
@@ -524,22 +453,22 @@ SASS
     assert_equal "0.5", resolve("$var", {}, env("var" => eval("1px/2px")))
   end
 
-  def test_non_ident_colors_with_wrong_number_of_digits
+  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,
-      'Invalid CSS after "": expected expression (e.g. 1px, bold), was "#1"') {eval("#1")}
+      "Colors must have either three or six digits: '#12'") {eval("#12")}
     assert_raise_message(Sass::SyntaxError,
-      'Invalid CSS after "": expected expression (e.g. 1px, bold), was "#12"') {eval("#12")}
+      "Colors must have either three or six digits: '#abcd'") {eval("#abcd")}
     assert_raise_message(Sass::SyntaxError,
-      'Invalid CSS after "": expected expression (e.g. 1px, bold), was "#1234"') {eval("#1234")}
+      "Colors must have either three or six digits: '#abcdE'") {eval("#abcdE")}
     assert_raise_message(Sass::SyntaxError,
-      'Invalid CSS after "": expected expression (e.g. 1px, bold), was "#12345"') {eval("#12345")}
-    assert_raise_message(Sass::SyntaxError, 'Invalid CSS after "": expected expression (e.g. ' \
-      '1px, bold), was "#1234567"') {eval("#1234567")}
+      "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 "blue", resolve("BLUE")
+    assert_equal "red", resolve("rEd")
     assert_equal "#7f4000", resolve("mix(GrEeN, ReD)")
   end
 
@@ -560,59 +489,6 @@ SASS
     assert_equal "1 2 3", resolve("null 1 2 3")
   end
 
-  def test_map_can_have_trailing_comma
-    assert_equal("(foo: 1, bar: 2)", eval("(foo: 1, bar: 2,)").to_sass)
-  end
-
-  def test_list_can_have_trailing_comma
-    assert_equal("1, 2, 3", resolve("1, 2, 3,"))
-  end
-
-  def test_trailing_comma_defines_singleton_list
-    assert_equal("1 2 3", resolve("nth((1 2 3,), 1)"))
-  end
-
-  def test_map_cannot_have_duplicate_keys
-    assert_raise_message(Sass::SyntaxError, 'Duplicate key "foo" in map (foo: bar, foo: baz).') do
-      eval("(foo: bar, foo: baz)")
-    end
-    assert_raise_message(Sass::SyntaxError, 'Duplicate key "foo" in map (foo: bar, fo + o: baz).') do
-      eval("(foo: bar, fo + o: baz)")
-    end
-    assert_raise_message(Sass::SyntaxError, 'Duplicate key "foo" in map (foo: bar, "foo": baz).') do
-      eval("(foo: bar, 'foo': baz)")
-    end
-    assert_raise_message(Sass::SyntaxError, 'Duplicate key 2px in map (2px: bar, 1px + 1px: baz).') do
-      eval("(2px: bar, 1px + 1px: baz)")
-    end
-    assert_raise_message(Sass::SyntaxError, 'Duplicate key #0000ff in map (blue: bar, #00f: baz).') do
-      eval("(blue: bar, #00f: baz)")
-    end
-  end
-
-  def test_non_duplicate_map_keys
-    # These shouldn't throw errors
-    eval("(foo: foo, bar: bar)")
-    eval("(2px: foo, 2: bar)")
-    eval("(2px: foo, 2em: bar)")
-    eval("('2px': foo, 2px: bar)")
-  end
-
-  def test_map_syntax_errors
-    assert_raise_message(Sass::SyntaxError, 'Invalid CSS after "(foo:": expected expression (e.g. 1px, bold), was ")"') do
-      eval("(foo:)")
-    end
-    assert_raise_message(Sass::SyntaxError, 'Invalid CSS after "(": expected ")", was ":bar)"') do
-      eval("(:bar)")
-    end
-    assert_raise_message(Sass::SyntaxError, 'Invalid CSS after "(foo, bar": expected ")", was ": baz)"') do
-      eval("(foo, bar: baz)")
-    end
-    assert_raise_message(Sass::SyntaxError, 'Invalid CSS after "(foo: bar, baz": expected ":", was ")"') do
-      eval("(foo: bar, baz)")
-    end
-  end
-
   def test_deep_argument_error_not_unwrapped
     # JRuby (as of 1.6.7.2) offers no way of distinguishing between
     # argument errors caused by programming errors in a function and
@@ -620,7 +496,7 @@ SASS
     return if RUBY_PLATFORM =~ /java/
 
     # Don't validate the message; it's different on Rubinius.
-    assert_raises(ArgumentError) {resolve("arg-error()")}
+    assert_raise(ArgumentError) {resolve("arg-error()")}
   end
 
   def test_shallow_argument_error_unwrapped
@@ -628,268 +504,12 @@ SASS
   end
 
   def test_boolean_ops_short_circuit
-    assert_equal "false", resolve("$ie and $ie <= 7", {}, env('ie' => Sass::Script::Value::Bool.new(false)))
-    assert_equal "true", resolve("$ie or $undef", {}, env('ie' => Sass::Script::Value::Bool.new(true)))
-  end
-
-  def test_selector
-    env = Sass::Environment.new
-    assert_equal "true", resolve("& == null", {}, env)
-
-    env.selector = selector('.foo.bar .baz.bang, .bip.bop')
-    assert_equal ".foo.bar .baz.bang, .bip.bop", resolve("&", {}, env)
-    assert_equal ".foo.bar .baz.bang", resolve("nth(&, 1)", {}, env)
-    assert_equal ".bip.bop", resolve("nth(&, 2)", {}, env)
-    assert_equal ".foo.bar", resolve("nth(nth(&, 1), 1)", {}, env)
-    assert_equal ".baz.bang", resolve("nth(nth(&, 1), 2)", {}, env)
-    assert_equal ".bip.bop", resolve("nth(nth(&, 2), 1)", {}, env)
-    assert_equal "string", resolve("type-of(nth(nth(&, 1), 1))", {}, env)
-
-    env.selector = selector('.foo > .bar')
-    assert_equal ".foo > .bar", resolve("&", {}, env)
-    assert_equal ".foo > .bar", resolve("nth(&, 1)", {}, env)
-    assert_equal ".foo", resolve("nth(nth(&, 1), 1)", {}, env)
-    assert_equal ">", resolve("nth(nth(&, 1), 2)", {}, env)
-    assert_equal ".bar", resolve("nth(nth(&, 1), 3)", {}, env)
-  end
-
-  def test_selector_with_newlines
-    env = Sass::Environment.new
-    env.selector = selector(".foo.bar\n.baz.bang,\n\n.bip.bop")
-    assert_equal ".foo.bar .baz.bang, .bip.bop", resolve("&", {}, env)
-    assert_equal ".foo.bar .baz.bang", resolve("nth(&, 1)", {}, env)
-    assert_equal ".bip.bop", resolve("nth(&, 2)", {}, env)
-    assert_equal ".foo.bar", resolve("nth(nth(&, 1), 1)", {}, env)
-    assert_equal ".baz.bang", resolve("nth(nth(&, 1), 2)", {}, env)
-    assert_equal ".bip.bop", resolve("nth(nth(&, 2), 1)", {}, env)
-    assert_equal "string", resolve("type-of(nth(nth(&, 1), 1))", {}, env)
-  end
-
-  def test_setting_global_variable_globally
-    assert_no_warning {assert_equal(<<CSS, render(<<SCSS, :syntax => :scss))}
-.foo {
-  a: 1; }
-
-.bar {
-  b: 2; }
-CSS
-$var: 1;
-
-.foo {
-  a: $var;
-}
-
-$var: 2;
-
-.bar {
-  b: $var;
-}
-SCSS
-  end
-
-  def test_setting_global_variable_locally
-    assert_no_warning {assert_equal(<<CSS, render(<<SCSS, :syntax => :scss))}
-.bar {
-  a: x;
-  b: y;
-  c: z; }
-CSS
-$var1: 1;
-$var3: 3;
-
-.foo {
-  $var1: x !global;
-  $var2: y !global;
-  @each $var3 in _ {
-    $var3: z !global;
-  }
-}
-
-.bar {
-  a: $var1;
-  b: $var2;
-  c: $var3;
-}
-SCSS
-  end
-
-  def test_setting_global_variable_locally_with_default
-    assert_equal(<<CSS, render(<<SCSS, :syntax => :scss))
-.bar {
-  a: 1;
-  b: y;
-  c: z; }
-CSS
-$var1: 1;
-
-.foo {
-  $var1: x !global !default;
-  $var2: y !global !default;
-  @each $var3 in _ {
-    $var3: z !global !default;
-  }
-}
-
-.bar {
-  a: $var1;
-  b: $var2;
-  c: $var3;
-}
-SCSS
-  end
-
-  def test_setting_local_variable
-    assert_equal(<<CSS, render(<<SCSS, :syntax => :scss))
-.a {
-  value: inside; }
-
-.b {
-  value: outside; }
-CSS
-$var: outside;
-
-.a {
-  $var: inside;
-  value: $var;
-}
-
-.b {
-  value: $var;
-}
-SCSS
-  end
-
-  def test_setting_local_variable_from_inner_scope
-    assert_equal(<<CSS, render(<<SCSS, :syntax => :scss))
-.a .b {
-  value: inside; }
-.a .c {
-  value: inside; }
-CSS
-.a {
-  $var: outside;
-
-  .b {
-    $var: inside;
-    value: $var;
-  }
-
-  .c {
-    value: $var;
-  }
-}
-SCSS
-  end
-
-  def test_color_format_is_preserved_by_default
-    assert_equal "blue", resolve("blue")
-    assert_equal "bLuE", resolve("bLuE")
-    assert_equal "#00f", resolve("#00f")
-    assert_equal "blue #00F", resolve("blue #00F")
-    assert_equal "blue", resolve("nth(blue #00F, 1)")
-    assert_equal "#00F", resolve("nth(blue #00F, 2)")
-  end
-
-  def test_color_format_isnt_always_preserved_in_compressed_style
-    assert_equal "red", resolve("red", :style => :compressed)
-    assert_equal "red", resolve("#f00", :style => :compressed)
-    assert_equal "red red", resolve("red #f00", :style => :compressed)
-    assert_equal "red", resolve("nth(red #f00, 2)", :style => :compressed)
-  end
-
-  def test_color_format_is_sometimes_preserved_in_compressed_style
-    assert_equal "ReD", resolve("ReD", :style => :compressed)
-    assert_equal "blue", resolve("blue", :style => :compressed)
-    assert_equal "#00f", resolve("#00f", :style => :compressed)
-  end
-
-  def test_color_format_isnt_preserved_when_modified
-    assert_equal "magenta", resolve("#f00 + #00f")
-  end
-
-  def test_ids
-    assert_equal "#foo", resolve("#foo")
-    assert_equal "#abcd", resolve("#abcd")
-    assert_equal "#abc-def", resolve("#abc-def")
-    assert_equal "#abc_def", resolve("#abc_def")
-    assert_equal "#uvw-xyz", resolve("#uvw-xyz")
-    assert_equal "#uvw_xyz", resolve("#uvw_xyz")
-    assert_equal "#uvwxyz", resolve("#uvw + xyz")
-  end
-
-  def test_scientific_notation
-    assert_equal "2000", resolve("2e3")
-    assert_equal "2000", resolve("2E3")
-    assert_equal "2000", resolve("2e+3")
-    assert_equal "2000em", resolve("2e3em")
-    assert_equal "25000000000", resolve("2.5e10")
-    assert_equal "0.1234", resolve("1234e-4")
-    assert_equal "12.34", resolve("1.234e1")
-  end
-
-  def test_identifier_units
-    assert_equal "5-foo", resolve("2-foo + 3-foo")
-    assert_equal "5-foo-", resolve("2-foo- + 3-foo-")
-    assert_equal "5-\\u2603", resolve("2-\\u2603 + 3-\\u2603")
-  end
-
-  def test_backslash_newline_in_string
-    assert_equal 'foobar', resolve("\"foo\\\nbar\"")
-    assert_equal 'foobar', resolve("'foo\\\nbar'")
-  end
-
-  def test_unclosed_special_fun
-    assert_raise_message(Sass::SyntaxError, 'Invalid CSS after "calc(foo()": expected ")", was ""') do
-      resolve("calc(foo()")
-    end
-    assert_raise_message(Sass::SyntaxError, 'Invalid CSS after "calc(#{\')\'}": expected ")", was ""') do
-      resolve("calc(\#{')'}")
-    end
-    assert_raise_message(Sass::SyntaxError, 'Invalid CSS after "calc(#{foo": expected "}", was ""') do
-      resolve("calc(\#{foo")
-    end
-  end
-
-  def test_special_fun_with_interpolation
-    assert_equal "calc())", resolve("calc(\#{')'})")
-    assert_equal "calc(# {foo})", resolve("calc(# {foo})")
+    assert_equal "false", resolve("$ie and $ie <= 7", {}, env('ie' => Sass::Script::Bool.new(false)))
+    assert_equal "true", resolve("$ie or $undef", {}, env('ie' => Sass::Script::Bool.new(true)))
   end
 
   # Regression Tests
 
-  def test_repeatedly_modified_color
-    assert_equal(<<CSS, render(<<SASS))
-a {
-  link-color: #161C14;
-  link-color-hover: black;
-  link-color-tap: rgba(22, 28, 20, 0.3); }
-CSS
-$green: #161C14
-$link-color: $green
-$link-color-hover: darken($link-color, 10%)
-$link-color-tap: rgba($green, 0.3)
-
-a
-  link-color: $link-color
-  link-color-hover: $link-color-hover
-  link-color-tap: $link-color-tap
-SASS
-  end
-
-  def test_inspect_divided_numbers
-    assert_equal "1px/2px", resolve("inspect(1px/2px)")
-    assert_equal "0.5", resolve("inspect((1px/2px))")
-  end
-
-  def test_minus_without_whitespace
-    assert_equal "5px", resolve("15px-10px")
-    assert_equal "5px-", resolve("15px--10px-")
-  end
-
-  def test_minus_preceded_by_comment
-    assert_equal "15px -10px", resolve("15px/**/-10px")
-  end
-
   def test_user_defined_function_forces_division
     assert_equal(<<CSS, render(<<SASS))
 a {
@@ -928,17 +548,6 @@ end
     assert_equal "teal\\+bang(12)", resolve("teal\\+bang(12)")
   end
 
-  def test_and_or_not_disallowed_as_function_names
-    %w[and or not].each do |name|
-      assert_raise_message(Sass::SyntaxError, "Invalid function name \"#{name}\".") do
-        render(<<SASS)
-@function #{name}()
-  @return null
-SASS
-      end
-    end
-  end
-
   def test_interpolation_after_hash
     assert_equal "#2", resolve('"##{1 + 1}"')
   end
@@ -960,67 +569,26 @@ SASS
     assert_equal "and-bang", resolve("and-bang")
   end
 
-  def test_number_initialization
-    assert_equal Sass::Script::Value::Number.new(10, ["px"]), Sass::Script::Value::Number.new(10, "px")
-    assert_equal Sass::Script::Value::Number.new(10, ["px"], ["em"]), Sass::Script::Value::Number.new(10, "px", "em")
-  end
-
-  def test_is_unit
-    assert Sass::Script::Value::Number.new(10, "px").is_unit?("px")
-    assert Sass::Script::Value::Number.new(10).is_unit?(nil)
-    assert !Sass::Script::Value::Number.new(10, "px", "em").is_unit?("px")
-    assert !Sass::Script::Value::Number.new(10, [], "em").is_unit?("em")
-    assert !Sass::Script::Value::Number.new(10, ["px", "em"]).is_unit?("px")
-  end
-
-  def test_rename_redirect
-    assert_no_warning do
-      assert_equal Sass::Script::Value::Base, Sass::Script::Literal
-      assert_equal Sass::Script::Tree::Node, Sass::Script::Node
-      assert_equal Sass::Script::Tree::Operation, Sass::Script::Operation
-      assert_equal Sass::Script::Value::String, Sass::Script::String
-    end
-  end
-
-  def test_number_printing
-    assert_equal "1", resolve("1")
-    assert_equal "1", resolve("1.0")
-    assert_equal "1000000000", resolve("1000000000")
-    assert_equal "0.00001", resolve("0.00001")
-    assert_equal "1.12121", resolve("1.121214")
-    assert_equal "1.12122", resolve("1.121215")
-    assert_equal "Infinity", resolve("(1.0/0.0)")
-    assert_equal "-Infinity", resolve("(-1.0/0.0)")
-    assert_equal "NaN", resolve("(0.0/0.0)")
-  end
-
   private
 
   def resolve(str, opts = {}, environment = env)
     munge_filename opts
     val = eval(str, opts, environment)
-    assert_kind_of Sass::Script::Value::Base, val
-    val.is_a?(Sass::Script::Value::String) ? val.value : val.to_s
-  end
-
-  def resolve_quoted(str, opts = {}, environment = env)
-    munge_filename opts
-    val = eval(str, opts, environment)
-    assert_kind_of Sass::Script::Value::Base, val
-    val.to_s
+    assert_kind_of Sass::Script::Literal, val
+    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::Value::String, val
+    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::Value::String, val
+    assert_kind_of Sass::Script::String, val
     assert_equal :string, val.type
   end
 
@@ -1042,13 +610,13 @@ SASS
     env
   end
 
-  def selector(str)
-    parser = Sass::SCSS::StaticParser.new(
-      str, filename_for_test, Sass::Importers::Filesystem.new('.'))
-    parser.parse_selector
-  end
-
-  def test_null_is_a_singleton
-    assert_same Sass::Script::Value::Null.new, Sass::Script::Value::Null.new
+  def test_number_printing
+    assert_equal "1", eval("1")
+    assert_equal "1", eval("1.0")
+    assert_equal "1.121", eval("1.1214")
+    assert_equal "1.122", eval("1.1215")
+    assert_equal "Infinity", eval("1.0/0.0")
+    assert_equal "-Infinity", eval("-1.0/0.0")
+    assert_equal "NaN", eval("0.0/0.0")
   end
 end