diff --git a/features/markdown.feature b/features/markdown.feature index f17d94a7..659eed0f 100644 --- a/features/markdown.feature +++ b/features/markdown.feature @@ -45,7 +45,7 @@ Feature: Markdown When I run jekyll build Then the _site directory should exist And I should see "My awesome code" in "_site/index.html" - And I should see "
\nMy awesome code\n
" in "_site/index.html"
+ And I should see "My awesome code
" in "_site/index.html"
Scenario: Maruku fenced codeblocks
Given I have a configuration file with "markdown" set to "maruku"
@@ -64,4 +64,4 @@ Feature: Markdown
When I run jekyll build
Then the _site directory should exist
And I should see "My awesome string" in "_site/index.html"
- And I should see "\nputs "My awesome string"\n
" in "_site/index.html"
+ And I should see "puts "My awesome string"
" in "_site/index.html"
diff --git a/jekyll.gemspec b/jekyll.gemspec
index c6617308..765626f5 100644
--- a/jekyll.gemspec
+++ b/jekyll.gemspec
@@ -50,7 +50,7 @@ Gem::Specification.new do |s|
s.add_development_dependency('rr', "~> 1.1")
s.add_development_dependency('cucumber', "1.3.11")
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('launchy', "~> 2.3")
s.add_development_dependency('simplecov', "~> 0.7")
diff --git a/test/test_tags.rb b/test/test_tags.rb
index 1895a629..c741a463 100644
--- a/test/test_tags.rb
+++ b/test/test_tags.rb
@@ -75,13 +75,13 @@ CONTENT
tag = Jekyll::Tags::HighlightBlock.new('highlight', 'ruby linenos=table cssclass=hl', ["test", "{% endhighlight %}", "\n"])
assert_equal({ :cssclass => 'hl', :linenos => 'table' }, tag.instance_variable_get(:@options))
-
+
tag = Jekyll::Tags::HighlightBlock.new('highlight', 'ruby linenos=table cssclass=hl hl_linenos=3', ["test", "{% endhighlight %}", "\n"])
assert_equal({ :cssclass => 'hl', :linenos => 'table', :hl_linenos => '3' }, tag.instance_variable_get(:@options))
-
+
tag = Jekyll::Tags::HighlightBlock.new('highlight', 'ruby linenos=table cssclass=hl hl_linenos="3 5 6"', ["test", "{% endhighlight %}", "\n"])
assert_equal({ :cssclass => 'hl', :linenos => 'table', :hl_linenos => ['3', '5', '6'] }, tag.instance_variable_get(:@options))
-
+
tag = Jekyll::Tags::HighlightBlock.new('highlight', 'Ruby ', ["test", "{% endhighlight %}", "\n"])
assert_equal "ruby", tag.instance_variable_get(:@lang), "lexers should be case insensitive"
end
@@ -420,9 +420,8 @@ CONTENT
)
end
- # todo: if #112 is merged into maruku, update to remove the newlines inside code block
should "render fenced code blocks" do
- assert_match %r{\nputs "Hello world"\n
}, @result.strip
+ assert_match %r{puts "Hello world"
}, @result.strip
end
end