deac/middleman
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Change test to respect global relative assets change

Browse source
This commit is contained in:
Thomas Reynolds 2015-09-19 14:26:30 -07:00
parent 3ae28874bf
commit 3e1fc0aa1f
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CHANGELOG.md
View file

@ -1,6 +1,10 @@
master master
=== ===
* `relative_assets` extension overrides local `relative: false` option to stylesheet/javascript tag helpers.
# 4.0.0.rc.1
* Removed ability to use JSON as frontmatter. Still allowed in data/ folder. * Removed ability to use JSON as frontmatter. Still allowed in data/ folder.
* Added YAML data postscript. Like frontmatter, but reversed. Attach content after the key/value data as a `:postscript` key to the data structure (if Hash). * Added YAML data postscript. Like frontmatter, but reversed. Attach content after the key/value data as a `:postscript` key to the data structure (if Hash).

8
middleman-core/features/relative_assets.feature
View file

@ -59,15 +59,15 @@ Feature: Relative Assets
When I cd to "build" When I cd to "build"
Then the file "relative_image/index.html" should contain "../stylesheets/relative_assets.css" Then the file "relative_image/index.html" should contain "../stylesheets/relative_assets.css"
Scenario: Rendering html with the feature enabled Scenario: Rendering html with the feature enabled (overrides relative option on helpers)
Given "relative_assets" feature is "enabled" Given "relative_assets" feature is "enabled"
And the Server is running at "relative-assets-app" And the Server is running at "relative-assets-app"
When I go to "/relative_image.html" When I go to "/relative_image.html"
Then I should see '"stylesheets/relative_assets.css"' Then I should see '"stylesheets/relative_assets.css"'
Then I should see '"javascripts/app.js"' Then I should see '"javascripts/app.js"'
When I go to "/relative_image_absolute_css.html" When I go to "/relative_image_absolute_css.html"
Then I should see '"/stylesheets/relative_assets.css"' Then I should see '"stylesheets/relative_assets.css"'
Then I should see '"/javascripts/app.js"' Then I should see '"javascripts/app.js"'
Then I should not see "/images/blank.gif" Then I should not see "/images/blank.gif"
And I should see "images/blank.gif" And I should see "images/blank.gif"
@ -121,4 +121,4 @@ Feature: Relative Assets
""" """
And the Server is running at "relative-assets-app" And the Server is running at "relative-assets-app"
When I go to "/sub/image_tag.html" When I go to "/sub/image_tag.html"
Then I should see '<img src="data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7" />' Then I should see '<img src="data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7" />'