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

Merge pull request #1736 from gregkare/trailing_whitespace 

Remove extra trailing whitespace
This commit is contained in:
Matt Rogers 2013-11-22 20:22:53 -08:00
parent 8595ea812c 49d5c3457c
commit cf60d5e34e
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
features/support/env.rb
View File

@ -50,7 +50,7 @@ def seconds_agnostic_datetime(datetime = Time.now)
pieces = datetime.to_s.split(" ") pieces = datetime.to_s.split(" ")
if pieces.size == 6 # Ruby 1.8.7 if pieces.size == 6 # Ruby 1.8.7
date = pieces[0..2].join(" ") date = pieces[0..2].join(" ")
time = seconds_agnostic_time(pieces[3]) time = seconds_agnostic_time(pieces[3])
zone = pieces[4..5].join(" ") zone = pieces[4..5].join(" ")
else # Ruby 1.9.1 or greater else # Ruby 1.9.1 or greater
date, time, zone = pieces date, time, zone = pieces

6
test/test_redcloth.rb
View File

@ -7,7 +7,7 @@ class TestRedCloth < Test::Unit::TestCase
@textile = Converters::Textile.new @textile = Converters::Textile.new
end end
should "preserve single line breaks in HTML output" do should "preserve single line breaks in HTML output" do
assert_equal "<p>line1<br />\nline2</p>", @textile.convert("p. line1\nline2").strip assert_equal "<p>line1<br />\nline2</p>", @textile.convert("p. line1\nline2").strip
end end
end end
@ -20,7 +20,7 @@ class TestRedCloth < Test::Unit::TestCase
@textile = Converters::Textile.new config @textile = Converters::Textile.new config
end end
should "preserve single line breaks in HTML output" do should "preserve single line breaks in HTML output" do
assert_equal "<p>line1<br />\nline2</p>", @textile.convert("p. line1\nline2").strip assert_equal "<p>line1<br />\nline2</p>", @textile.convert("p. line1\nline2").strip
end end
end end
@ -35,7 +35,7 @@ class TestRedCloth < Test::Unit::TestCase
@textile = Converters::Textile.new config @textile = Converters::Textile.new config
end end
should "preserve single line breaks in HTML output" do should "preserve single line breaks in HTML output" do
assert_equal "<p>line1<br />\nline2</p>", @textile.convert("p. line1\nline2").strip assert_equal "<p>line1<br />\nline2</p>", @textile.convert("p. line1\nline2").strip
end end
end end