Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki

parasew · Dec 11, 2013 · 7bd2eb5 · 7bd2eb5
2 parents 58e7bfe + 9aefa0b
commit 7bd2eb5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/Gemfile b/Gemfile
@@ -11,8 +11,8 @@ gem "rake"
 gem "rdoc"
 gem "json"
 gem "file_signature", "~> 1.2.0"
-gem 'syntax', :git => 'http://github.com/distler/syntax.git'
-gem "maruku", :git => 'http://github.com/distler/maruku.git', :branch => 'nokogiri'
+gem 'syntax', :git => 'git://github.com/distler/syntax.git'
+gem "maruku", :git => 'git://github.com/distler/maruku.git', :branch => 'nokogiri'
 gem "rake"
 gem 'iconv', :platforms => :ruby_20
 gem 'rdoc-data', :platforms => :ruby_18
diff --git a/test/unit/page_renderer_test.rb b/test/unit/page_renderer_test.rb
@@ -248,9 +248,9 @@ def test_footnotes
 
   def test_toc
     assert_markup_parsed_as(
-      %{<h1 id='title'>Title</h1>\n<div class='maruku_toc'><ul><li><a href='#title'>Title<} +
-      %{/a><ul><li><a href='#section_1'>Section 1</a></l} +
-      %{i><li><a href='#section_2'>Section 2</a></li></ul></li></ul></div>\n<h2 id='section_} +
+      %{<h1 id='title'>Title</h1>\n<div class='maruku_toc'>} +
+      %{<ul><li><a href='#section_1'>Section 1</a></l} +
+      %{i><li><a href='#section_2'>Section 2</a></li></ul></div>\n<h2 id='section_} +
       %{1'>Section 1</h2>\n\n<p>Foo</p>\n\n<h2 id='section_2'>Section 2</h2>\n\n<p>Bar</p>},
       "#Title\n* Toc\n{:toc}\n\n##Section 1\n\nFoo\n\n##Section 2\n\nBar\n")
   end