Merge pull request #182 from schacon/test-fixes

Fixing Tests

gollum.gemspec

@@ -37,6 +37,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency('shoulda')
   s.add_development_dependency('rack-test')
   s.add_development_dependency('wikicloth')
+  s.add_development_dependency('rake')
 
   # = MANIFEST =
   s.files = %w[

test/helper.rb

@@ -38,6 +38,12 @@ def commit_details
     :email   => "tom@github.com" }
 end
 
+def normal(text)
+  text.gsub!(' ', '')
+  text.gsub!("\n", '')
+  text
+end
+
 # test/spec/mini 3
 # http://gist.github.com/25455
 # chris@ozmm.org

test/test_markup.rb

@@ -173,7 +173,7 @@ context "Markup" do
     @wiki.write_page("Potato", :mediawiki, "a [[Potato|Potato Heaad]] ", commit_details)
     page = @wiki.page("Potato")
     output = page.formatted_data
-    assert_equal "<p>\na <a class=\"internal present\" href=\"/Potato\">Potato Heaad</a> </p>", output
+    assert_equal normal("<p>\na <a class=\"internal present\" href=\"/Potato\">Potato Heaad</a> </p>"), normal(output)
   end
 
   #########################################################################
@@ -476,8 +476,8 @@ context "Markup" do
   test "id prefix added" do
     content = "h2(#foo). xxxx[1]\n\nfn1.footnote"
     output = "<h2 id=\"wiki-foo\">xxxx" +
-             "<sup class=\"footnote\"><a href=\"#wiki-fn1\">1</a></sup></h2>" +
-             "\n<p class=\"footnote\" id=\"wiki-fn1\"><sup>1</sup> footnote</p>"
+             "<sup class=\"footnote\" id=\"wiki-fnr1\"><a href=\"#wiki-fn1\">1</a></sup></h2>" +
+             "\n<p class=\"footnote\" id=\"wiki-fn1\"><a href=\"#wiki-fnr1\"><sup>1</sup></a> footnote</p>"
     compare(content, output, :textile)
   end
 
@@ -513,7 +513,7 @@ context "Markup" do
     page = @wiki.page("Bilbo Baggins")
     rendered = Gollum::Markup.new(page).render
     if regexes.empty?
-      assert_equal output, rendered
+      assert_equal normal(output), normal(rendered)
     else
       regexes.each { |r| assert_match r, output }
     end
@@ -528,6 +528,6 @@ context "Markup" do
     @wiki.clear_cache
     page = @wiki.page("Bilbo Baggins")
     rendered = Gollum::Markup.new(page).render
-    assert_equal output, rendered
+    assert_equal normal(output), normal(rendered)
   end
 end