[Sass] Actually, we don't need to manually set that default option.

The options are already merged into DEFAULT_OPTIONS,
and no one should be setting it to nil explicitly.

doc-src/SASS_CHANGELOG.md

@@ -20,9 +20,6 @@
   {Sass::Script::Functions::EvaluationContext Functions::EvaluationContext}).
   Now the module simply needs to be included in {Sass::Script::Functions}.
 
-* Fixed a bug where {Sass::Plugin} would die if caching was enabled
-  but the cache location wasn't explicitly set.
-
 ## [2.2.15](http://github.com/nex3/haml/commit/2.2.15)
 
 * Added {Sass::Script::Color#with} for a way of setting color channels

lib/sass/files.rb

@@ -84,7 +84,7 @@ module Sass
     private
 
     def sassc_filename(filename, options)
-      File.join(options[:cache_location] || Sass::Engine::DEFAULT_OPTIONS[:cache_location],
+      File.join(options[:cache_location],
         Digest::SHA1.hexdigest(File.dirname(File.expand_path(filename))),
         File.basename(filename) + 'c')
     end

test/sass/plugin_test.rb

@@ -138,21 +138,6 @@ class SassPluginTest < Test::Unit::TestCase
     FileUtils.mv(template_loc("basic", "more_"), template_loc("basic"))
   end
 
-  def test_update_with_cache_but_without_cache_location
-    old_cache = Sass::Plugin.options[:cache]
-    old_cache_location = Sass::Plugin.options[:cache_location]
-    Sass::Plugin.options[:cache] = true
-    Sass::Plugin.options[:cache_location] = nil
-
-    # We just want to make sure this doesn't raise an exception
-    FileUtils.touch(template_loc('basic'))
-    Sass::Plugin.update_stylesheets
-    assert_stylesheet_updated 'basic'
-  ensure
-    Sass::Plugin.options[:cache] = old_cache
-    Sass::Plugin.options[:cache_location] = old_cache_location
-  end
-
  private
 
   def assert_renders_correctly(*arguments)