From a1979f11b1a776abad6aa0c89dc47feb23d4dd40 Mon Sep 17 00:00:00 2001 From: Thomas Reynolds Date: Wed, 20 Aug 2014 09:48:03 -0700 Subject: [PATCH] Update sass dep and test new error message --- middleman-core/features/slim.feature | 2 +- middleman-core/lib/middleman-core/renderers/sass.rb | 2 +- middleman/middleman.gemspec | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/middleman-core/features/slim.feature b/middleman-core/features/slim.feature index c415fefc..187600a1 100644 --- a/middleman-core/features/slim.feature +++ b/middleman-core/features/slim.feature @@ -74,4 +74,4 @@ Feature: Support slim templating language When I go to "/sass.html" Then I should see "html, body, div" When I go to "/error.html" - Then I should see "Syntax error" \ No newline at end of file + Then I should see "Error: Invalid" \ No newline at end of file diff --git a/middleman-core/lib/middleman-core/renderers/sass.rb b/middleman-core/lib/middleman-core/renderers/sass.rb index bf1578b7..00d786d9 100644 --- a/middleman-core/lib/middleman-core/renderers/sass.rb +++ b/middleman-core/lib/middleman-core/renderers/sass.rb @@ -86,7 +86,7 @@ module Middleman begin @engine.render rescue ::Sass::SyntaxError => e - ::Sass::SyntaxError.exception_to_css(e, full_exception: true) + ::Sass::SyntaxError.exception_to_css(e) end end diff --git a/middleman/middleman.gemspec b/middleman/middleman.gemspec index 9ec12ff7..11e4e871 100644 --- a/middleman/middleman.gemspec +++ b/middleman/middleman.gemspec @@ -21,7 +21,7 @@ Gem::Specification.new do |s| s.add_dependency("middleman-core", Middleman::VERSION) s.add_dependency("middleman-sprockets", ">= 3.1.2") s.add_dependency("haml", [">= 4.0.5"]) - s.add_dependency("sass", [">= 3.2.17", "< 4.0"]) + s.add_dependency("sass", [">= 3.4.0", "< 4.0"]) s.add_dependency("compass-import-once", ["1.0.5"]) s.add_dependency("compass", [">= 1.0.0", "< 2.0.0"]) s.add_dependency("uglifier", ["~> 2.5"])