dan
/
jekyll
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2856 from jekyll/fix-liquid-in-sas

This commit is contained in:
Parker Moore 2014-08-30 22:50:07 -07:00
parent ca2e291306 943dc27e78
commit ba05d00ac4
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
features/rendering.feature
View File

@ -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.css"
And I should not see "Ahoy, indeed!" in "_site/index.js" 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}}; }" 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 When I run jekyll build
Then the _site directory should not exist Then the _site directory should exist
And I should see "Invalid CSS after" in the build output And I should see ".foo-bar {\n color: red; }" in "_site/index.css"
Scenario: Render liquid in CoffeeScript Scenario: Render liquid in CoffeeScript
Given I have an "index.coffee" page with animal "cicada" that contains "hey='for {{page.animal}}'" Given I have an "index.coffee" page with animal "cicada" that contains "hey='for {{page.animal}}'"

1
lib/jekyll/convertible.rb
View File

@ -67,6 +67,7 @@ module Jekyll
converter.convert output converter.convert output
rescue => e rescue => e
Jekyll.logger.error "Conversion error:", "#{converter.class} encountered an error converting '#{path}'." Jekyll.logger.error "Conversion error:", "#{converter.class} encountered an error converting '#{path}'."
Jekyll.logger.error("Conversion error:", e.to_s)
raise e raise e
end end
end end