haml 3.1.0 → 3.1.1

data/vendor/sass/test/sass/functions_test.rb

@@ -35,6 +35,10 @@ module Sass::Script::Functions::UserFunctions
   end
 end
 
+module Sass::Script::Functions
+  include Sass::Script::Functions::UserFunctions
+end
+
 class SassFunctionTest < Test::Unit::TestCase
   # Tests taken from:
   #   http://www.w3.org/Style/CSS/Test/CSS3/Color/20070927/html4/t040204-hsl-h-rotating-b.htm
@@ -461,6 +465,276 @@ class SassFunctionTest < Test::Unit::TestCase
     assert_error_message("\"foo\" is not a number for `adjust-hue'", "adjust-hue(#fff, \"foo\")")
   end
 
+  def test_adjust_color
+    # HSL
+    assert_equal(evaluate("hsl(180, 30, 90)"),
+      evaluate("adjust-color(hsl(120, 30, 90), $hue: 60deg)"))
+    assert_equal(evaluate("hsl(120, 50, 90)"),
+      evaluate("adjust-color(hsl(120, 30, 90), $saturation: 20%)"))
+    assert_equal(evaluate("hsl(120, 30, 60)"),
+      evaluate("adjust-color(hsl(120, 30, 90), $lightness: -30%)"))
+    # RGB
+    assert_equal(evaluate("rgb(15, 20, 30)"),
+      evaluate("adjust-color(rgb(10, 20, 30), $red: 5)"))
+    assert_equal(evaluate("rgb(10, 15, 30)"),
+      evaluate("adjust-color(rgb(10, 20, 30), $green: -5)"))
+    assert_equal(evaluate("rgb(10, 20, 40)"),
+      evaluate("adjust-color(rgb(10, 20, 30), $blue: 10)"))
+    # Alpha
+    assert_equal(evaluate("hsla(120, 30, 90, 0.65)"),
+      evaluate("adjust-color(hsl(120, 30, 90), $alpha: -0.35)"))
+    assert_equal(evaluate("rgba(10, 20, 30, 0.9)"),
+      evaluate("adjust-color(rgba(10, 20, 30, 0.4), $alpha: 0.5)"))
+
+    # HSL composability
+    assert_equal(evaluate("hsl(180, 20, 90)"),
+      evaluate("adjust-color(hsl(120, 30, 90), $hue: 60deg, $saturation: -10%)"))
+    assert_equal(evaluate("hsl(180, 20, 95)"),
+      evaluate("adjust-color(hsl(120, 30, 90), $hue: 60deg, $saturation: -10%, $lightness: 5%)"))
+    assert_equal(evaluate("hsla(120, 20, 95, 0.3)"),
+      evaluate("adjust-color(hsl(120, 30, 90), $saturation: -10%, $lightness: 5%, $alpha: -0.7)"))
+
+    # RGB composability
+    assert_equal(evaluate("rgb(15, 20, 29)"),
+      evaluate("adjust-color(rgb(10, 20, 30), $red: 5, $blue: -1)"))
+    assert_equal(evaluate("rgb(15, 45, 29)"),
+      evaluate("adjust-color(rgb(10, 20, 30), $red: 5, $green: 25, $blue: -1)"))
+    assert_equal(evaluate("rgba(10, 25, 29, 0.7)"),
+      evaluate("adjust-color(rgb(10, 20, 30), $green: 5, $blue: -1, $alpha: -0.3)"))
+
+    # HSL range restriction
+    assert_equal(evaluate("hsl(120, 30, 90)"),
+      evaluate("adjust-color(hsl(120, 30, 90), $hue: 720deg)"))
+    assert_equal(evaluate("hsl(120, 0, 90)"),
+      evaluate("adjust-color(hsl(120, 30, 90), $saturation: -90%)"))
+    assert_equal(evaluate("hsl(120, 30, 100)"),
+      evaluate("adjust-color(hsl(120, 30, 90), $lightness: 30%)"))
+
+    # RGB range restriction
+    assert_equal(evaluate("rgb(255, 20, 30)"),
+      evaluate("adjust-color(rgb(10, 20, 30), $red: 250)"))
+    assert_equal(evaluate("rgb(10, 0, 30)"),
+      evaluate("adjust-color(rgb(10, 20, 30), $green: -30)"))
+    assert_equal(evaluate("rgb(10, 20, 0)"),
+      evaluate("adjust-color(rgb(10, 20, 30), $blue: -40)"))
+  end
+
+  def test_adjust_color_tests_types
+    assert_error_message("\"foo\" is not a color for `adjust-color'", "adjust-color(foo, $hue: 10)")
+    # HSL
+    assert_error_message("$hue: \"foo\" is not a number for `adjust-color'",
+      "adjust-color(blue, $hue: foo)")
+    assert_error_message("$saturation: \"foo\" is not a number for `adjust-color'",
+      "adjust-color(blue, $saturation: foo)")
+    assert_error_message("$lightness: \"foo\" is not a number for `adjust-color'",
+      "adjust-color(blue, $lightness: foo)")
+    # RGB
+    assert_error_message("$red: \"foo\" is not a number for `adjust-color'",
+      "adjust-color(blue, $red: foo)")
+    assert_error_message("$green: \"foo\" is not a number for `adjust-color'",
+      "adjust-color(blue, $green: foo)")
+    assert_error_message("$blue: \"foo\" is not a number for `adjust-color'",
+      "adjust-color(blue, $blue: foo)")
+    # Alpha
+    assert_error_message("$alpha: \"foo\" is not a number for `adjust-color'",
+      "adjust-color(blue, $alpha: foo)")
+  end
+
+  def test_adjust_color_tests_arg_range
+    # HSL
+    assert_error_message("$saturation: Amount 101% must be between -100% and 100% for `adjust-color'",
+      "adjust-color(blue, $saturation: 101%)")
+    assert_error_message("$saturation: Amount -101% must be between -100% and 100% for `adjust-color'",
+      "adjust-color(blue, $saturation: -101%)")
+    assert_error_message("$lightness: Amount 101% must be between -100% and 100% for `adjust-color'",
+      "adjust-color(blue, $lightness: 101%)")
+    assert_error_message("$lightness: Amount -101% must be between -100% and 100% for `adjust-color'",
+      "adjust-color(blue, $lightness: -101%)")
+    # RGB
+    assert_error_message("$red: Amount 256 must be between -255 and 255 for `adjust-color'",
+      "adjust-color(blue, $red: 256)")
+    assert_error_message("$red: Amount -256 must be between -255 and 255 for `adjust-color'",
+      "adjust-color(blue, $red: -256)")
+    assert_error_message("$green: Amount 256 must be between -255 and 255 for `adjust-color'",
+      "adjust-color(blue, $green: 256)")
+    assert_error_message("$green: Amount -256 must be between -255 and 255 for `adjust-color'",
+      "adjust-color(blue, $green: -256)")
+    assert_error_message("$blue: Amount 256 must be between -255 and 255 for `adjust-color'",
+      "adjust-color(blue, $blue: 256)")
+    assert_error_message("$blue: Amount -256 must be between -255 and 255 for `adjust-color'",
+      "adjust-color(blue, $blue: -256)")
+    # Alpha
+    assert_error_message("$alpha: Amount 1.1 must be between -1 and 1 for `adjust-color'",
+      "adjust-color(blue, $alpha: 1.1)")
+    assert_error_message("$alpha: Amount -1.1 must be between -1 and 1 for `adjust-color'",
+      "adjust-color(blue, $alpha: -1.1)")
+  end
+
+  def test_adjust_color_argument_errors
+    assert_error_message("Unknown argument $hoo (260deg) for `adjust-color'",
+      "adjust-color(blue, $hoo: 260deg)")
+    assert_error_message("Cannot specify HSL and RGB values for a color at the same time for `adjust-color'",
+      "adjust-color(blue, $hue: 120deg, $red: 10)");
+    assert_error_message("10px is not a keyword argument for `adjust_color'",
+      "adjust-color(blue, 10px)")
+    assert_error_message("10px is not a keyword argument for `adjust_color'",
+      "adjust-color(blue, 10px, 20px)")
+    assert_error_message("10px is not a keyword argument for `adjust_color'",
+      "adjust-color(blue, 10px, $hue: 180deg)")
+  end
+
+  def test_scale_color
+    # HSL
+    assert_equal(evaluate("hsl(120, 51, 90)"),
+      evaluate("scale-color(hsl(120, 30, 90), $saturation: 30%)"))
+    assert_equal(evaluate("hsl(120, 30, 76.5)"),
+      evaluate("scale-color(hsl(120, 30, 90), $lightness: -15%)"))
+    # RGB
+    assert_equal(evaluate("rgb(157, 20, 30)"),
+      evaluate("scale-color(rgb(10, 20, 30), $red: 60%)"))
+    assert_equal(evaluate("rgb(10, 38.8, 30)"),
+      evaluate("scale-color(rgb(10, 20, 30), $green: 8%)"))
+    assert_equal(evaluate("rgb(10, 20, 20)"),
+      evaluate("scale-color(rgb(10, 20, 30), $blue: -(1/3)*100%)"))
+    # Alpha
+    assert_equal(evaluate("hsla(120, 30, 90, 0.86)"),
+      evaluate("scale-color(hsl(120, 30, 90), $alpha: -14%)"))
+    assert_equal(evaluate("rgba(10, 20, 30, 0.82)"),
+      evaluate("scale-color(rgba(10, 20, 30, 0.8), $alpha: 10%)"))
+
+    # HSL composability
+    assert_equal(evaluate("hsl(120, 51, 76.5)"),
+      evaluate("scale-color(hsl(120, 30, 90), $saturation: 30%, $lightness: -15%)"))
+    assert_equal(evaluate("hsla(120, 51, 90, 0.2)"),
+      evaluate("scale-color(hsl(120, 30, 90), $saturation: 30%, $alpha: -80%)"))
+
+    # RGB composability
+    assert_equal(evaluate("rgb(157, 38.8, 30)"),
+      evaluate("scale-color(rgb(10, 20, 30), $red: 60%, $green: 8%)"))
+    assert_equal(evaluate("rgb(157, 38.8, 20)"),
+      evaluate("scale-color(rgb(10, 20, 30), $red: 60%, $green: 8%, $blue: -(1/3)*100%)"))
+    assert_equal(evaluate("rgba(10, 38.8, 20, 0.55)"),
+      evaluate("scale-color(rgba(10, 20, 30, 0.5), $green: 8%, $blue: -(1/3)*100%, $alpha: 10%)"))
+
+    # Extremes
+    assert_equal(evaluate("hsl(120, 100, 90)"),
+      evaluate("scale-color(hsl(120, 30, 90), $saturation: 100%)"))
+    assert_equal(evaluate("hsl(120, 30, 90)"),
+      evaluate("scale-color(hsl(120, 30, 90), $saturation: 0%)"))
+    assert_equal(evaluate("hsl(120, 0, 90)"),
+      evaluate("scale-color(hsl(120, 30, 90), $saturation: -100%)"))
+  end
+
+  def test_scale_color_tests_types
+    assert_error_message("\"foo\" is not a color for `scale-color'", "scale-color(foo, $red: 10%)")
+    # HSL
+    assert_error_message("$saturation: \"foo\" is not a number for `scale-color'",
+      "scale-color(blue, $saturation: foo)")
+    assert_error_message("$lightness: \"foo\" is not a number for `scale-color'",
+      "scale-color(blue, $lightness: foo)")
+    # RGB
+    assert_error_message("$red: \"foo\" is not a number for `scale-color'",
+      "scale-color(blue, $red: foo)")
+    assert_error_message("$green: \"foo\" is not a number for `scale-color'",
+      "scale-color(blue, $green: foo)")
+    assert_error_message("$blue: \"foo\" is not a number for `scale-color'",
+      "scale-color(blue, $blue: foo)")
+    # Alpha
+    assert_error_message("$alpha: \"foo\" is not a number for `scale-color'",
+      "scale-color(blue, $alpha: foo)")
+  end
+
+  def test_scale_color_argument_errors
+    # Range
+    assert_error_message("$saturation: Amount 101% must be between -100% and 100% for `scale-color'",
+      "scale-color(blue, $saturation: 101%)")
+    assert_error_message("$red: Amount -101% must be between -100% and 100% for `scale-color'",
+      "scale-color(blue, $red: -101%)")
+    assert_error_message("$alpha: Amount -101% must be between -100% and 100% for `scale-color'",
+      "scale-color(blue, $alpha: -101%)")
+
+    # Unit
+    assert_error_message("$saturation: Amount 80 must be a % (e.g. 80%) for `scale-color'",
+      "scale-color(blue, $saturation: 80)")
+    assert_error_message("$alpha: Amount 0.5 must be a % (e.g. 0.5%) for `scale-color'",
+      "scale-color(blue, $alpha: 0.5)")
+
+    # Unknown argument
+    assert_error_message("Unknown argument $hue (80%) for `scale-color'", "scale-color(blue, $hue: 80%)")
+
+    # Non-keyword arg
+    assert_error_message("10px is not a keyword argument for `scale_color'", "scale-color(blue, 10px)")
+
+    # HSL/RGB
+    assert_error_message("Cannot specify HSL and RGB values for a color at the same time for `scale-color'",
+      "scale-color(blue, $lightness: 10%, $red: 20%)");
+  end
+
+  def test_change_color
+    # HSL
+    assert_equal(evaluate("hsl(195, 30, 90)"),
+      evaluate("change-color(hsl(120, 30, 90), $hue: 195deg)"))
+    assert_equal(evaluate("hsl(120, 50, 90)"),
+      evaluate("change-color(hsl(120, 30, 90), $saturation: 50%)"))
+    assert_equal(evaluate("hsl(120, 30, 40)"),
+      evaluate("change-color(hsl(120, 30, 90), $lightness: 40%)"))
+    # RGB
+    assert_equal(evaluate("rgb(123, 20, 30)"),
+      evaluate("change-color(rgb(10, 20, 30), $red: 123)"))
+    assert_equal(evaluate("rgb(10, 234, 30)"),
+      evaluate("change-color(rgb(10, 20, 30), $green: 234)"))
+    assert_equal(evaluate("rgb(10, 20, 198)"),
+      evaluate("change-color(rgb(10, 20, 30), $blue: 198)"))
+    # Alpha
+    assert_equal(evaluate("rgba(10, 20, 30, 0.76)"),
+      evaluate("change-color(rgb(10, 20, 30), $alpha: 0.76)"))
+
+    # HSL composability
+    assert_equal(evaluate("hsl(56, 30, 47)"),
+      evaluate("change-color(hsl(120, 30, 90), $hue: 56deg, $lightness: 47%)"))
+    assert_equal(evaluate("hsla(56, 30, 47, 0.9)"),
+      evaluate("change-color(hsl(120, 30, 90), $hue: 56deg, $lightness: 47%, $alpha: 0.9)"))
+  end
+
+  def test_change_color_tests_types
+    assert_error_message("\"foo\" is not a color for `change-color'", "change-color(foo, $red: 10%)")
+    # HSL
+    assert_error_message("$saturation: \"foo\" is not a number for `change-color'",
+      "change-color(blue, $saturation: foo)")
+    assert_error_message("$lightness: \"foo\" is not a number for `change-color'",
+      "change-color(blue, $lightness: foo)")
+    # RGB
+    assert_error_message("$red: \"foo\" is not a number for `change-color'", "change-color(blue, $red: foo)")
+    assert_error_message("$green: \"foo\" is not a number for `change-color'", "change-color(blue, $green: foo)")
+    assert_error_message("$blue: \"foo\" is not a number for `change-color'", "change-color(blue, $blue: foo)")
+    # Alpha
+    assert_error_message("$alpha: \"foo\" is not a number for `change-color'", "change-color(blue, $alpha: foo)")
+  end
+
+  def test_change_color_argument_errors
+    # Range
+    assert_error_message("Saturation must be between 0 and 100 for `change-color'",
+      "change-color(blue, $saturation: 101%)")
+    assert_error_message("Lightness must be between 0 and 100 for `change-color'",
+      "change-color(blue, $lightness: 101%)")
+    assert_error_message("Red value must be between 0 and 255 for `change-color'",
+      "change-color(blue, $red: -1)")
+    assert_error_message("Green value must be between 0 and 255 for `change-color'",
+      "change-color(blue, $green: 256)")
+    assert_error_message("Blue value must be between 0 and 255 for `change-color'",
+      "change-color(blue, $blue: 500)")
+
+    # Unknown argument
+    assert_error_message("Unknown argument $hoo (80%) for `change-color'", "change-color(blue, $hoo: 80%)")
+
+    # Non-keyword arg
+    assert_error_message("10px is not a keyword argument for `change_color'", "change-color(blue, 10px)")
+
+    # HSL/RGB
+    assert_error_message("Cannot specify HSL and RGB values for a color at the same time for `change-color'",
+      "change-color(blue, $lightness: 10%, $red: 120)");
+  end
+
   def test_mix
     assert_equal("#7f007f", evaluate("mix(#f00, #00f)"))
     assert_equal("#7f7f7f", evaluate("mix(#f00, #0ff)"))
@@ -532,10 +806,6 @@ class SassFunctionTest < Test::Unit::TestCase
     assert_equal('foo', evaluate('unquote($string: foo)'))
   end
 
-  def test_unquote_tests_type
-    assert_error_message("#ff0000 is not a string for `unquote'", "unquote(#f00)")
-  end
-
   def test_quote
     assert_equal('"foo"', evaluate('quote(foo)'))
     assert_equal('"foo"', evaluate('quote("foo")'))
@@ -605,6 +875,8 @@ MSG
     assert_equal("3", evaluate("length((foo, bar, baz bip))"))
     assert_equal("3", evaluate("length((foo, bar, (baz, bip)))"))
     assert_equal("1", evaluate("length(#f00)"))
+    assert_equal("0", evaluate("length(())"))
+    assert_equal("4", evaluate("length(1 2 () 3)"))
   end
 
   def test_nth
@@ -618,6 +890,7 @@ MSG
     assert_error_message("List index 1.5 must be an integer for `nth'", "nth(foo, 1.5)")
     assert_error_message("List index is 5 but list is only 4 items long for `nth'", "nth(1 2 3 4, 5)")
     assert_error_message("List index is 2 but list is only 1 item long for `nth'", "nth(foo, 2)")
+    assert_error_message("List index is 1 but list has no items for `nth'", "nth((), 1)")
   end
 
   def test_join
@@ -641,6 +914,20 @@ MSG
     assert_equal("1 2 3 4", evaluate("join((1, 2), (3, 4), space)"))
     assert_equal("1, 2", evaluate("join(1, 2, comma)"))
 
+    assert_equal("1 2", evaluate("join(1 2, ())"))
+    assert_equal("1, 2", evaluate("join((1, 2), ())"))
+    assert_equal("true", evaluate("(1 2) == join(1 2, ())"))
+    assert_equal("true", evaluate("(1, 2) == join((1, 2), ())"))
+    assert_equal("false", evaluate("(1 2 ()) == join(1 2, ())"))
+    assert_equal("false", evaluate("(1, 2, ()) == join((1, 2), ())"))
+
+    assert_equal("1 2", evaluate("join((), 1 2)"))
+    assert_equal("1, 2", evaluate("join((), (1, 2))"))
+    assert_equal("true", evaluate("(1 2) == join((), 1 2)"))
+    assert_equal("true", evaluate("(1, 2) == join((), (1, 2))"))
+    assert_equal("false", evaluate("(1 2 ()) == join((), 1 2)"))
+    assert_equal("false", evaluate("(1, 2, ()) == join((), (1, 2))"))
+
     assert_error_message("Separator name must be space, comma, or auto for `join'", "join(1, 2, baboon)")
   end
 
@@ -665,9 +952,24 @@ MSG
     assert_equal("1 2 3, 4", evaluate("append((1, 2), (3, 4), space)"))
     assert_equal("1, 2", evaluate("append(1, 2, comma)"))
 
+    assert_equal("1 2", evaluate("append(1 2, ())"))
+    assert_equal("1, 2", evaluate("append((1, 2), ())"))
+    assert_equal("true", evaluate("(1 2 ()) == append(1 2, ())"))
+    assert_equal("true", evaluate("(1, 2, ()) == append((1, 2), ())"))
+
+    assert_equal("1 2", evaluate("append((), 1 2)"))
+    assert_equal("1, 2", evaluate("append((), (1, 2))"))
+    assert_equal("false", evaluate("(1 2) == append((), 1 2)"))
+    assert_equal("true", evaluate("(1 2) == nth(append((), 1 2), 1)"))
+
     assert_error_message("Separator name must be space, comma, or auto for `append'", "append(1, 2, baboon)")
   end
 
+  def test_if
+    assert_equal("1px", evaluate("if(true, 1px, 2px)"))
+    assert_equal("2px", evaluate("if(false, 1px, 2px)"))
+  end
+
   def test_keyword_args_rgb
     assert_equal(%Q{white}, evaluate("rgb($red: 255, $green: 255, $blue: 255)"))
   end

data/vendor/sass/test/sass/importer_test.rb

@@ -5,8 +5,6 @@ require File.dirname(__FILE__) + '/test_helper'
 class ImporterTest < Test::Unit::TestCase
   
   class FruitImporter < Sass::Importers::Base
-    attr_reader :cached
-
     def find(name, context = nil)
       if name =~ %r{fruits/(\w+)(\.s[ac]ss)?}
         fruit = $1
@@ -31,13 +29,6 @@ class ImporterTest < Test::Unit::TestCase
     def key(name, context)
       [self.class.name, name]
     end
-
-    def _around_dump
-      @cached = true
-      yield
-    ensure
-      @cached = false
-    end
   end
 
   # This class proves that you can override the extension scheme for importers
@@ -88,17 +79,4 @@ CSS
   ensure
     FileUtils.rm_rf(absolutize("tmp"))
   end
-
-  def test_caching_importer
-    source = "p\n  foo: bar"
-    importer = FruitImporter.new
-    filename = filename_for_test
-    engine = Sass::Engine.new(source, :filename => filename, :importer => importer)
-    engine.to_tree # Trigger caching
-
-    sha = Digest::SHA1.hexdigest(source)
-    cache = engine.options[:cache_store]
-    cached_tree = cache.retrieve(cache.key(*importer.key(filename, engine.options)), sha)
-    assert cached_tree.options[:importer].cached, "Importer's _around_dump method should have been called"
-  end
 end

data/vendor/sass/test/sass/plugin_test.rb

@@ -19,7 +19,7 @@ class SassPluginTest < Test::Unit::TestCase
     FileUtils.mkdir_p tempfile_loc
     FileUtils.mkdir_p tempfile_loc(nil,"more_")
     set_plugin_opts
-    update_all_stylesheets!
+    check_for_updates!
     reset_mtimes
   end
 
@@ -39,21 +39,21 @@ class SassPluginTest < Test::Unit::TestCase
   def test_no_update
     File.delete(tempfile_loc('basic'))
     assert_needs_update 'basic'
-    update_all_stylesheets!
+    check_for_updates!
     assert_stylesheet_updated 'basic'
   end
 
   def test_update_needed_when_modified
     touch 'basic'
     assert_needs_update 'basic'
-    update_all_stylesheets!
+    check_for_updates!
     assert_stylesheet_updated 'basic'
   end
 
   def test_update_needed_when_dependency_modified
     touch 'basic'
     assert_needs_update 'import'
-    update_all_stylesheets!
+    check_for_updates!
     assert_stylesheet_updated 'basic'
     assert_stylesheet_updated 'import'
   end
@@ -61,7 +61,7 @@ class SassPluginTest < Test::Unit::TestCase
   def test_update_needed_when_scss_dependency_modified
     touch 'scss_importee'
     assert_needs_update 'import'
-    update_all_stylesheets!
+    check_for_updates!
     assert_stylesheet_updated 'scss_importee'
     assert_stylesheet_updated 'import'
   end
@@ -69,14 +69,34 @@ class SassPluginTest < Test::Unit::TestCase
   def test_scss_update_needed_when_dependency_modified
     touch 'basic'
     assert_needs_update 'scss_import'
-    update_all_stylesheets!
+    check_for_updates!
     assert_stylesheet_updated 'basic'
     assert_stylesheet_updated 'scss_import'
   end
 
+  def test_update_needed_when_nested_import_dependency_modified
+    touch 'basic'
+    assert_needs_update 'nested_import'
+    check_for_updates!
+    assert_stylesheet_updated 'basic'
+    assert_stylesheet_updated 'scss_import'
+  end
+
+  def test_no_updates_when_always_check_and_always_update_both_false
+    Sass::Plugin.options[:always_update] = false
+    Sass::Plugin.options[:always_check] = false
+
+    touch 'basic'
+    assert_needs_update 'basic'
+    check_for_updates!
+
+    # Check it's still stale
+    assert_needs_update 'basic'
+  end
+
   def test_full_exception_handling
     File.delete(tempfile_loc('bork1'))
-    update_all_stylesheets!
+    check_for_updates!
     File.open(tempfile_loc('bork1')) do |file|
       assert_equal(<<CSS.strip, file.read.split("\n")[0...6].join("\n"))
 /*
@@ -95,17 +115,17 @@ CSS
     Sass::Plugin.options[:full_exception] = false
 
     File.delete(tempfile_loc('bork1'))
-    assert_raise(Sass::SyntaxError) {update_all_stylesheets!}
+    assert_raise(Sass::SyntaxError) {check_for_updates!}
   ensure
     Sass::Plugin.options[:full_exception] = old_full_exception
   end
-  
+
   def test_two_template_directories
     set_plugin_opts :template_location => {
       template_loc => tempfile_loc,
       template_loc(nil,'more_') => tempfile_loc(nil,'more_')
     }
-    update_all_stylesheets!
+    check_for_updates!
     ['more1', 'more_import'].each { |name| assert_renders_correctly(name, :prefix => 'more_') }
   end
 
@@ -116,7 +136,7 @@ CSS
                       template_loc => tempfile_loc,
                       template_loc(nil,'more_') => tempfile_loc(nil,'more_')
                     }
-    update_all_stylesheets!
+    check_for_updates!
     assert_renders_correctly('more1_with_line_comments', 'more1', :prefix => 'more_')
   end
 
@@ -138,7 +158,7 @@ CSS
     touch 'basic'
     assert_needs_update "more1", "more_"
     assert_needs_update "basic"
-    update_all_stylesheets!
+    check_for_updates!
     assert_doesnt_need_update "more1", "more_"
     assert_doesnt_need_update "basic"
   end
@@ -154,7 +174,7 @@ CSS
     touch 'basic'
     assert_needs_update "more1", "more_"
     assert_needs_update "basic"
-    update_all_stylesheets!
+    check_for_updates!
     assert_doesnt_need_update "more1", "more_"
     assert_needs_update "basic"
   end
@@ -259,7 +279,7 @@ CSS
 
     touch 'basic', 'more_'
     assert_needs_update "import"
-    update_all_stylesheets!
+    check_for_updates!
     assert_renders_correctly("import")
   ensure
     FileUtils.mv(template_loc("basic", "more_"), template_loc("basic"))
@@ -268,12 +288,22 @@ CSS
   def test_cached_relative_import
     old_always_update = Sass::Plugin.options[:always_update]
     Sass::Plugin.options[:always_update] = true
-    update_all_stylesheets!
+    check_for_updates!
     assert_renders_correctly('subdir/subdir')
   ensure
     Sass::Plugin.options[:always_update] = old_always_update
   end
 
+  def test_cached_if
+    set_plugin_opts :cache_store => Sass::CacheStores::Filesystem.new(tempfile_loc + '/cache')
+    check_for_updates!
+    assert_renders_correctly 'if'
+    check_for_updates!
+    assert_renders_correctly 'if'
+  ensure
+    set_plugin_opts :cache_store => @@cache_store
+  end
+
  private
 
   def assert_renders_correctly(*arguments)
@@ -326,7 +356,7 @@ CSS
     if block_given?
       yield
     else
-      update_all_stylesheets!
+      check_for_updates!
     end
 
     assert run, "Expected #{name} callback to be run with arguments:\n  #{expected_args.inspect}"
@@ -349,23 +379,23 @@ CSS
     if block_given?
       yield
     else
-      update_all_stylesheets!
+      check_for_updates!
     end
   end
 
   def assert_callbacks(*args)
-    return update_all_stylesheets! if args.empty?
+    return check_for_updates! if args.empty?
     assert_callback(*args.pop) {assert_callbacks(*args)}
   end
 
   def assert_no_callbacks(*args)
-    return update_all_stylesheets! if args.empty?
+    return check_for_updates! if args.empty?
     assert_no_callback(*args.pop) {assert_no_callbacks(*args)}
   end
 
-  def update_all_stylesheets!
+  def check_for_updates!
     Sass::Util.silence_sass_warnings do
-      Sass::Plugin.update_stylesheets
+      Sass::Plugin.check_for_updates
     end
   end