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

Ensure that misspelled or missing partials generate an error

Browse source
This commit is contained in:
Greg Tarsa 2016-03-03 11:20:52 -05:00
parent 737e6f5e64
commit fbc572f920
3 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
middleman-core/features/partials.feature
View file

@ -5,25 +5,30 @@ Feature: Provide Sane Defaults for Partial Behavior
When I go to "/index.html" When I go to "/index.html"
Then I should see "Header" Then I should see "Header"
And I should see "Footer" And I should see "Footer"
Scenario: Finds shared partials relative to the root (sub) Scenario: Finds shared partials relative to the root (sub)
Given the Server is running at "partials-app" Given the Server is running at "partials-app"
When I go to "/sub/index.html" When I go to "/sub/index.html"
Then I should see "Header" Then I should see "Header"
And I should see "Footer" And I should see "Footer"
Scenario: Flags error when partial is not found
Given the Server is running at "partials-app"
When I go to "/index_missing.html"
Then I should see "Error: Could not locate partial"
Scenario: Prefers partials of the same engine type Scenario: Prefers partials of the same engine type
Given the Server is running at "partials-app" Given the Server is running at "partials-app"
When I go to "/index.html" When I go to "/index.html"
Then I should see "ERb Main" Then I should see "ERb Main"
Scenario: Prefers partials of the same engine type Scenario: Prefers partials of the same engine type
Given the Server is running at "partials-app" Given the Server is running at "partials-app"
When I go to "/second.html" When I go to "/second.html"
Then I should see "Str Main" Then I should see "Str Main"
And I should see "Header" And I should see "Header"
And I should see "Footer" And I should see "Footer"
Scenario: Finds partial relative to template Scenario: Finds partial relative to template
Given the Server is running at "partials-app" Given the Server is running at "partials-app"
When I go to "/sub/index.html" When I go to "/sub/index.html"
@ -33,7 +38,7 @@ Feature: Provide Sane Defaults for Partial Behavior
Given the Server is running at "partials-app" Given the Server is running at "partials-app"
When I go to "/locals.html" When I go to "/locals.html"
Then I should see "Local var is bar" Then I should see "Local var is bar"
Scenario: Partial and Layout use different engines Scenario: Partial and Layout use different engines
Given the Server is running at "different-engine-partial" Given the Server is running at "different-engine-partial"
When I go to "/index.html" When I go to "/index.html"

3
middleman-core/fixtures/partials-app/source/index_missing.html.erb Executable file
View file

@ -0,0 +1,3 @@
<%= partial "shared/header" %>
<%= partial "i_do_not_exist" %>
<%= partial "shared/footer" %>

1
middleman-core/lib/middleman-core/template_context.rb
View file

@ -104,7 +104,6 @@ module Middleman
partial_file = locate_partial(name, false) || locate_partial(name, true) partial_file = locate_partial(name, false) || locate_partial(name, true)
return '' unless partial_file
raise ::Middleman::TemplateRenderer::TemplateNotFound, "Could not locate partial: #{name}" unless partial_file raise ::Middleman::TemplateRenderer::TemplateNotFound, "Could not locate partial: #{name}" unless partial_file
source_path = sitemap.file_to_path(partial_file) source_path = sitemap.file_to_path(partial_file)