From 80fb3ff06fc14e57b4c32745487425decb09beb8 Mon Sep 17 00:00:00 2001 From: Thomas Reynolds Date: Sun, 13 Jan 2013 15:22:36 -0800 Subject: [PATCH] merge --- middleman-core/lib/middleman-core/renderers/sass.rb | 4 ++-- middleman-more/features/sass_cache_path.feature | 8 ++++---- .../fixtures/sass-cache-path-default-app/config.rb | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/middleman-core/lib/middleman-core/renderers/sass.rb b/middleman-core/lib/middleman-core/renderers/sass.rb index 38b6afa1..45698ebf 100644 --- a/middleman-core/lib/middleman-core/renderers/sass.rb +++ b/middleman-core/lib/middleman-core/renderers/sass.rb @@ -14,14 +14,14 @@ module Middleman # Default sass options app.config.define_setting :sass, {}, 'Sass engine options' - # Location of SASS .sass_cache directory. + # Location of SASS .sass-cache directory. # @return [String] app.config.define_setting :sass_cache_path, nil, 'Location of sass cache' # runtime compile of path app.before_configuration do template_extensions :scss => :css, :sass => :css - config[:sass_cache_path] = File.join(app.root_path, '.sass_cache') + config[:sass_cache_path] = File.join(app.root_path, '.sass-cache') end # Tell Tilt to use it as well (for inline sass blocks) diff --git a/middleman-more/features/sass_cache_path.feature b/middleman-more/features/sass_cache_path.feature index 08f0f0ad..846dba25 100644 --- a/middleman-more/features/sass_cache_path.feature +++ b/middleman-more/features/sass_cache_path.feature @@ -1,6 +1,6 @@ -Feature: SASS .sass_cache custom location +Feature: SASS .sass-cache custom location - Scenario: Using the default location for .sass_cache folder + Scenario: Using the default location for .sass-cache folder Given the Server is running at "sass-cache-path-default-app" When I go to "/stylesheets/plain.css" @@ -10,10 +10,10 @@ Feature: SASS .sass_cache custom location # Not sure how to test this location, as the directory is stored outside of the app root # during testing, but inside app root in "production" - # Then a directory named ".sass_cache" should exist + # Then a directory named ".sass-cache" should exist - Scenario: Using a custom location for .sass_cache folder + Scenario: Using a custom location for .sass-cache folder Given the Server is running at "sass-cache-path-custom-app" When I go to "/stylesheets/plain.css" diff --git a/middleman-more/fixtures/sass-cache-path-default-app/config.rb b/middleman-more/fixtures/sass-cache-path-default-app/config.rb index 59549a45..77b161b6 100644 --- a/middleman-more/fixtures/sass-cache-path-default-app/config.rb +++ b/middleman-more/fixtures/sass-cache-path-default-app/config.rb @@ -1,3 +1,3 @@ # Using default setting -# set :sass_cache_path, File.join(Dir.pwd, '.sass_cache') +# set :sass_cache_path, File.join(Dir.pwd, '.sass-cache')