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

Merge pull request #2576 from bhollis/maruku-update

This commit is contained in:
Parker Moore 2014-07-09 23:44:03 -07:00
parent fb170007c8 cbb4b10ce6
commit ece22497dd
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
features/markdown.feature
View File

@ -45,7 +45,7 @@ Feature: Markdown
When I run jekyll build When I run jekyll build
Then the _site directory should exist Then the _site directory should exist
And I should see "My awesome code" in "_site/index.html" And I should see "My awesome code" in "_site/index.html"
And I should see "<pre><code>\nMy awesome code\n</code></pre>" in "_site/index.html" And I should see "<pre><code>My awesome code</code></pre>" in "_site/index.html"
Scenario: Maruku fenced codeblocks Scenario: Maruku fenced codeblocks
Given I have a configuration file with "markdown" set to "maruku" Given I have a configuration file with "markdown" set to "maruku"
@ -64,4 +64,4 @@ Feature: Markdown
When I run jekyll build When I run jekyll build
Then the _site directory should exist Then the _site directory should exist
And I should see "My awesome string" in "_site/index.html" And I should see "My awesome string" in "_site/index.html"
And I should see "<pre class="ruby"><code class="ruby">\nputs &quot;My awesome string&quot;\n</code></pre>" in "_site/index.html" And I should see "<pre class="ruby"><code class="ruby">puts &quot;My awesome string&quot;</code></pre>" in "_site/index.html"

2
jekyll.gemspec
View File

@ -50,7 +50,7 @@ Gem::Specification.new do |s|
s.add_development_dependency('rr', "~> 1.1") s.add_development_dependency('rr', "~> 1.1")
s.add_development_dependency('cucumber', "1.3.11") s.add_development_dependency('cucumber', "1.3.11")
s.add_development_dependency('RedCloth', "~> 4.2") s.add_development_dependency('RedCloth', "~> 4.2")
s.add_development_dependency('maruku', "0.7.0") s.add_development_dependency('maruku', "~> 0.7.0")
s.add_development_dependency('rdiscount', "~> 1.6") s.add_development_dependency('rdiscount', "~> 1.6")
s.add_development_dependency('launchy', "~> 2.3") s.add_development_dependency('launchy', "~> 2.3")
s.add_development_dependency('simplecov', "~> 0.7") s.add_development_dependency('simplecov', "~> 0.7")

3
test/test_tags.rb
View File

@ -420,9 +420,8 @@ CONTENT
) )
end end
# todo: if #112 is merged into maruku, update to remove the newlines inside code block
should "render fenced code blocks" do should "render fenced code blocks" do
assert_match %r{<pre class=\"ruby\"><code class=\"ruby\">\nputs &quot;Hello world&quot;\n</code></pre>}, @result.strip assert_match %r{<pre class=\"ruby\"><code class=\"ruby\">puts &quot;Hello world&quot;</code></pre>}, @result.strip
end end
end end