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

Merge pull request #1734 from GhostGambler/issue-1702

Browse source 
Issue #1702
This commit is contained in:
Thomas Reynolds 2016-01-05 09:50:41 -08:00
commit 62b17d38ad
5 changed files with 33 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
middleman-core/features/encoding_option.feature Normal file
View file

@ -0,0 +1,23 @@
# encoding: iso-8859-1
Feature: encoding option
Scenario: No encoding set
Given a fixture app "clean-app"
Given the Server is running at "clean-app"
When I go to "/index.html"
Then the "Content-Type" header should contain "text/html"
Then the "Content-Type" header should contain "charset=utf-8"
Scenario: Custom encoding set
Given a fixture app "i-8859-1-app"
And a file named "config.rb" with:
"""
set :encoding, "ISO-8859-1"
"""
Given the Server is running at "i-8859-1-app"
When I go to "/index.html"
Then the "Content-Type" header should contain "text/html"
Then the "Content-Type" header should contain "charset=iso-8859-1"
Then I should see "äöü"

1
middleman-core/fixtures/i-8859-1-app/config.rb Normal file
View file

@ -0,0 +1 @@
set :encoding, "ISO-8859-1"

1
middleman-core/fixtures/i-8859-1-app/source/index.html.erb Normal file
View file

@ -0,0 +1 @@
<EFBFBD><EFBFBD><EFBFBD>

9
middleman-core/lib/middleman-core/application.rb
View file

@ -253,11 +253,6 @@ module Middleman
# Initialize the Sitemap # Initialize the Sitemap
@sitemap = ::Middleman::Sitemap::Store.new(self) @sitemap = ::Middleman::Sitemap::Store.new(self)
if Object.const_defined?(:Encoding)
Encoding.default_internal = config[:encoding]
Encoding.default_external = config[:encoding]
end
::Middleman::Extension.clear_after_extension_callbacks ::Middleman::Extension.clear_after_extension_callbacks
after_configuration_eval(&method(:prune_tilt_templates)) after_configuration_eval(&method(:prune_tilt_templates))
@ -276,6 +271,10 @@ module Middleman
# Eval config. # Eval config.
evaluate_configuration! evaluate_configuration!
if Object.const_defined?(:Encoding)
Encoding.default_external = config[:encoding]
end
# Run any `configure` blocks for the current environment. # Run any `configure` blocks for the current environment.
execute_callbacks([:configure, config[:environment]]) execute_callbacks([:configure, config[:environment]])

4
middleman-core/lib/middleman-core/step_definitions/server_steps.rb
View file

@ -75,6 +75,10 @@ Then /^the content type should be "([^\"]*)"$/ do |expected|
expect(page.response_headers['Content-Type']).to start_with expected expect(page.response_headers['Content-Type']).to start_with expected
end end
Then /^the "([^\"]*)" header should contain "([^\"]*)"$/ do |header, expected|
expect(page.response_headers[header]).to include expected
end
Then /^I should see "([^\"]*)"$/ do |expected| Then /^I should see "([^\"]*)"$/ do |expected|
expect(page.body).to include expected expect(page.body).to include expected
end end