Merge pull request #2767 from jekyll/rdiscount-2

Gemfile

@@ -9,7 +9,7 @@ gem 'rr', '~> 1.1'
 gem 'cucumber', '1.3.18'
 gem 'RedCloth', '~> 4.2'
 gem 'maruku', '~> 0.7.0'
-gem 'rdiscount', '~> 1.6'
+gem 'rdiscount', '~> 2.0'
 gem 'launchy', '~> 2.3'
 gem 'simplecov', '~> 0.9'
 gem 'simplecov-gem-adapter', '~> 1.0.1'

test/test_rdiscount.rb

@@ -16,7 +16,24 @@ class TestRdiscount < Test::Unit::TestCase
     end
 
     should "render toc" do
-      assert_equal "<h1 id=\"Header+1\">Header 1</h1>\n\n<h2 id=\"Header+2\">Header 2</h2>\n\n<p>\n <ul>\n <li><a href=\"#Header+1\">Header 1</a>\n  <ul>\n  <li><a href=\"#Header+2\">Header 2</a>  </li>\n  </ul>\n </li>\n </ul>\n\n</p>", @markdown.convert("# Header 1\n\n## Header 2\n\n{:toc}").strip
+      toc = <<-TOC
+<a name="Header.1"></a>
+<h1>Header 1</h1>
+
+<a name="Header.2"></a>
+<h2>Header 2</h2>
+
+<p><ul>
+ <li><a href="#Header.1">Header 1</a>
+ <ul>
+  <li><a href="#Header.2">Header 2</a></li>
+ </ul>
+ </li>
+</ul>
+
+</p>
+TOC
+      assert_equal toc.strip, @markdown.convert("# Header 1\n\n## Header 2\n\n{:toc}").strip
     end
   end
 end