diff --git a/History.markdown b/History.markdown
index e96952cc..efcc7cf8 100644
--- a/History.markdown
+++ b/History.markdown
@@ -3,6 +3,7 @@
### Minor Enhancements
* Move the building of related posts into their own class (#1057)
+ * Removed trailing spaces in several places throughout the code (#1116)
### Bug Fixes
* Rename Jekyll::Logger to Jekyll::Stevenson to fix inheritance issue (#1106)
diff --git a/features/drafts.feature b/features/drafts.feature
index 27832fc4..27b3f074 100644
--- a/features/drafts.feature
+++ b/features/drafts.feature
@@ -2,7 +2,7 @@ Feature: Draft Posts
As a hacker who likes to blog
I want to be able to preview drafts locally
In order to see if they look alright before publishing
-
+
Scenario: Preview a draft
Given I have a configuration file with "permalink" set to "none"
And I have a _drafts directory
diff --git a/features/post_data.feature b/features/post_data.feature
index 5ed7e862..3ba37062 100644
--- a/features/post_data.feature
+++ b/features/post_data.feature
@@ -117,7 +117,7 @@ Feature: Post data
When I run jekyll
Then the _site directory should exist
And I should see "Post category: movies" in "_site/movies/2009/03/27/star-wars.html"
-
+
Scenario: Use post.categories variable when category is in YAML and is mixed-case
Given I have a _posts directory
And I have a _layouts directory
@@ -128,7 +128,7 @@ Feature: Post data
When I run jekyll
Then the _site directory should exist
And I should see "Post category: movies" in "_site/movies/2009/03/27/star-wars.html"
-
+
Scenario: Use post.categories variable when category is in YAML
Given I have a _posts directory
And I have a _layouts directory
diff --git a/lib/site_template/_layouts/default.html b/lib/site_template/_layouts/default.html
index 46ebc109..364e27ee 100644
--- a/lib/site_template/_layouts/default.html
+++ b/lib/site_template/_layouts/default.html
@@ -21,7 +21,7 @@
-
+
{{ content }}
diff --git a/test/test_page.rb b/test/test_page.rb
index db822405..2d8c98ee 100644
--- a/test/test_page.rb
+++ b/test/test_page.rb
@@ -102,7 +102,7 @@ class TestPage < Test::Unit::TestCase
assert_equal "/about/", @page.dir
end
end
-
+
context "with specified layout of nil" do
setup do
@page = setup_page('sitemap.xml')
diff --git a/test/test_post.rb b/test/test_post.rb
index 9ea972a8..903e48c5 100644
--- a/test/test_post.rb
+++ b/test/test_post.rb
@@ -139,7 +139,7 @@ class TestPost < Test::Unit::TestCase
assert_equal "/2013/2008/09/09/foo-bar.html", @post.url
end
end
-
+
context "with specified layout of nil" do
setup do
file = '2013-01-12-nil-layout.textile'
@@ -422,7 +422,7 @@ class TestPost < Test::Unit::TestCase
post = setup_post("2009-01-27-empty-categories.textile")
assert_equal [], post.categories
end
-
+
should "recognize number category in yaml" do
post = setup_post("2013-05-10-number-category.textile")
assert post.categories.include?('2013')
@@ -440,7 +440,7 @@ class TestPost < Test::Unit::TestCase
assert post.tags.include?('cooking')
assert post.tags.include?('pizza')
end
-
+
should "recognize empty tag in yaml" do
post = setup_post("2009-05-18-empty-tag.textile")
assert_equal [], post.tags
@@ -528,46 +528,46 @@ class TestPost < Test::Unit::TestCase
assert_equal ['foo'], post.categories
end
end
-
+
context "converter file extension settings" do
setup do
stub(Jekyll).configuration { Jekyll::Configuration::DEFAULTS }
@site = Site.new(Jekyll.configuration)
end
-
+
should "process .md as markdown under default configuration" do
post = setup_post '2011-04-12-md-extension.md'
conv = post.converter
assert conv.kind_of? Jekyll::Converters::Markdown
end
-
+
should "process .text as identity under default configuration" do
post = setup_post '2011-04-12-text-extension.text'
conv = post.converter
assert conv.kind_of? Jekyll::Converters::Identity
end
-
+
should "process .text as markdown under alternate configuration" do
@site.config['markdown_ext'] = 'markdown,mdw,mdwn,md,text'
post = setup_post '2011-04-12-text-extension.text'
conv = post.converter
assert conv.kind_of? Jekyll::Converters::Markdown
end
-
+
should "process .md as markdown under alternate configuration" do
@site.config['markdown_ext'] = 'markdown,mkd,mkdn,md,text'
post = setup_post '2011-04-12-text-extension.text'
conv = post.converter
assert conv.kind_of? Jekyll::Converters::Markdown
end
-
+
should "process .text as textile under alternate configuration" do
@site.config['textile_ext'] = 'textile,text'
post = setup_post '2011-04-12-text-extension.text'
conv = post.converter
assert conv.kind_of? Jekyll::Converters::Textile
end
-
+
end
-
+
end
diff --git a/test/test_redcloth.rb b/test/test_redcloth.rb
index 6e635b96..94cc9f49 100644
--- a/test/test_redcloth.rb
+++ b/test/test_redcloth.rb
@@ -6,7 +6,7 @@ class TestRedCloth < Test::Unit::TestCase
setup do
@textile = Converters::Textile.new
end
-
+
should "preserve single line breaks in HTML output" do
assert_equal "line1
\nline2
", @textile.convert("p. line1\nline2").strip
end
@@ -19,7 +19,7 @@ class TestRedCloth < Test::Unit::TestCase
}
@textile = Converters::Textile.new config
end
-
+
should "preserve single line breaks in HTML output" do
assert_equal "line1
\nline2
", @textile.convert("p. line1\nline2").strip
end
@@ -34,7 +34,7 @@ class TestRedCloth < Test::Unit::TestCase
}
@textile = Converters::Textile.new config
end
-
+
should "preserve single line breaks in HTML output" do
assert_equal "line1
\nline2
", @textile.convert("p. line1\nline2").strip
end
diff --git a/test/test_site.rb b/test/test_site.rb
index 4e46ba7f..b4d06239 100644
--- a/test/test_site.rb
+++ b/test/test_site.rb
@@ -195,7 +195,7 @@ class TestSite < Test::Unit::TestCase
@site.exclude = excludes + ["exclude*"]
assert_equal files, @site.filter_entries(excludes + files + ["excludeA"])
end
-
+
should "not filter entries within include" do
includes = %w[_index.html .htaccess include*]
files = %w[index.html _index.html .htaccess includeA]
@@ -284,7 +284,7 @@ class TestSite < Test::Unit::TestCase
File.open(dest_dir('.svn/HEAD'), 'w')
File.open(dest_dir('.hg/HEAD'), 'w')
end
-
+
teardown do
FileUtils.rm_f(dest_dir('obsolete.html'))
FileUtils.rm_rf(dest_dir('qux'))
@@ -293,7 +293,7 @@ class TestSite < Test::Unit::TestCase
FileUtils.rm_rf(dest_dir('.svn'))
FileUtils.rm_rf(dest_dir('.hg'))
end
-
+
should 'remove orphaned files in destination' do
@site.process
assert !File.exist?(dest_dir('obsolete.html'))
@@ -317,7 +317,7 @@ class TestSite < Test::Unit::TestCase
assert File.exist?(dest_dir('.svn/HEAD'))
end
end
-
+
context 'with an invalid markdown processor in the configuration' do
should 'not throw an error at initialization time' do
bad_processor = 'not a processor name'
@@ -325,7 +325,7 @@ class TestSite < Test::Unit::TestCase
Site.new(Jekyll.configuration.merge({ 'markdown' => bad_processor }))
end
end
-
+
should 'throw FatalException at process time' do
bad_processor = 'not a processor name'
s = Site.new(Jekyll.configuration.merge({ 'markdown' => bad_processor }))
@@ -334,6 +334,6 @@ class TestSite < Test::Unit::TestCase
end
end
end
-
+
end
end