From eea5921856f04c87d4b8c7f562487577a4f47b00 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Fri, 29 Aug 2014 18:12:33 -0700
Subject: [PATCH 1/2] Fix test for Liquid rendering in Sass.

---
 features/rendering.feature | 7 ++++---
 lib/jekyll/convertible.rb  | 1 +
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/features/rendering.feature b/features/rendering.feature
index 6ceaef57..8e5ebaae 100644
--- a/features/rendering.feature
+++ b/features/rendering.feature
@@ -21,11 +21,12 @@ Feature: Rendering
     And I should not see "Ahoy, indeed!" in "_site/index.css"
     And I should not see "Ahoy, indeed!" in "_site/index.js"
 
-  Scenario: Don't render liquid in Sass
+  Scenario: Render liquid in Sass
     Given I have an "index.scss" page that contains ".foo-bar { color:{{site.color}}; }"
+    And I have a configuration file with "color" set to "red"
     When I run jekyll build
-    Then the _site directory should not exist
-    And I should see "Invalid CSS after" in the build output
+    Then the _site directory should exist
+    And I should see ".foo-bar {\n  color:red; }" in "_site/index.css"
 
   Scenario: Render liquid in CoffeeScript
     Given I have an "index.coffee" page with animal "cicada" that contains "hey='for {{page.animal}}'"
diff --git a/lib/jekyll/convertible.rb b/lib/jekyll/convertible.rb
index 72d825fa..8f63ea1a 100644
--- a/lib/jekyll/convertible.rb
+++ b/lib/jekyll/convertible.rb
@@ -67,6 +67,7 @@ module Jekyll
           converter.convert output
         rescue => e
           Jekyll.logger.error "Conversion error:", "#{converter.class} encountered an error converting '#{path}'."
+          Jekyll.logger.error("Conversion error:", e.to_s)
           raise e
         end
       end

From 943dc27e786c2cc04e71a47c58bbb16d791cdfd4 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sat, 30 Aug 2014 22:40:32 -0700
Subject: [PATCH 2/2] Add a space because regexp.

---
 features/rendering.feature | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/features/rendering.feature b/features/rendering.feature
index 8e5ebaae..e0b9d8f0 100644
--- a/features/rendering.feature
+++ b/features/rendering.feature
@@ -26,7 +26,7 @@ Feature: Rendering
     And I have a configuration file with "color" set to "red"
     When I run jekyll build
     Then the _site directory should exist
-    And I should see ".foo-bar {\n  color:red; }" in "_site/index.css"
+    And I should see ".foo-bar {\n  color: red; }" in "_site/index.css"
 
   Scenario: Render liquid in CoffeeScript
     Given I have an "index.coffee" page with animal "cicada" that contains "hey='for {{page.animal}}'"