diff --git a/features/markdown.feature b/features/markdown.feature index 2342951a..c0eeb25d 100644 --- a/features/markdown.feature +++ b/features/markdown.feature @@ -30,41 +30,3 @@ Feature: Markdown Then the _site directory should exist And I should see "Index" in "_site/index.html" And I should see "

My Title

" in "_site/index.html" - - Scenario: Maruku fenced codeblocks - Given I have a configuration file with "markdown" set to "maruku" - And I have an "index.markdown" file with content: - """ - --- - title: My title - --- - - # My title - - ``` - My awesome code - ``` - """ - 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 "
My awesome code
" in "_site/index.html" - - Scenario: Maruku fenced codeblocks with syntax highlighting - Given I have a configuration file with "markdown" set to "maruku" - And I have an "index.markdown" file with content: - """ - --- - title: My title - --- - - # My title - - ```ruby - puts "My awesome string" - ``` - """ - 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 "
puts "My awesome string"
" in "_site/index.html" diff --git a/features/site_configuration.feature b/features/site_configuration.feature index d3dadd2a..c9edc2ff 100644 --- a/features/site_configuration.feature +++ b/features/site_configuration.feature @@ -83,13 +83,6 @@ Feature: Site configuration Then the _site directory should exist And I should see "Google" in "_site/index.html" - Scenario: Use Maruku for markup - Given I have an "index.markdown" page that contains "[Google](http://google.com)" - And I have a configuration file with "markdown" set to "maruku" - When I run jekyll build - Then the _site directory should exist - And I should see "Google" in "_site/index.html" - Scenario: Highlight code with pygments Given I have an "index.html" page that contains "{% highlight ruby %} puts 'Hello world!' {% endhighlight %}" When I run jekyll build diff --git a/test/test_tags.rb b/test/test_tags.rb index 644527fb..30e8394b 100644 --- a/test/test_tags.rb +++ b/test/test_tags.rb @@ -30,7 +30,7 @@ class TestTags < JekyllUnitTest title: This is a test --- -This document results in a markdown error with maruku +This document has some highlighted code in it. {% highlight text %} #{code} @@ -338,7 +338,7 @@ EOS setup do @content = <FIGHT!}, @result - assert_match %r{FINISH HIM}, @result - end - end - context "using RDiscount" do setup do create_post(@content, 'markdown' => 'rdiscount') @@ -604,25 +593,6 @@ CONTENT end end - context "with fenced code blocks with backticks" do - - setup do - content = < 'maruku', - 'maruku' => {'fenced_code_blocks' => true}} - ) - end - - should "render fenced code blocks" do - assert_match %r{
puts "Hello world"
}, @result.strip - end - end - context "include missing file" do setup do @content = <