From db1ccc452559e8dc82ee53f108c48a5a97a06ba4 Mon Sep 17 00:00:00 2001 From: Tom Preston-Werner Date: Mon, 30 Aug 2010 16:10:14 -0700 Subject: [PATCH] DRY up test commit details. --- test/test_markup.rb | 24 ++++++--------- test/test_wiki.rb | 75 +++++++++++++++------------------------------ 2 files changed, 34 insertions(+), 65 deletions(-) diff --git a/test/test_markup.rb b/test/test_markup.rb index 99e37319..0a3e6649 100644 --- a/test/test_markup.rb +++ b/test/test_markup.rb @@ -6,10 +6,6 @@ context "Markup" do FileUtils.rm_rf(@path) Grit::Repo.init_bare(@path) @wiki = Gollum::Wiki.new(@path) - - @commit = { :message => "Add stuff", - :name => "Tom Preston-Werner", - :email => "tom@github.com" } end teardown do @@ -17,12 +13,12 @@ context "Markup" do end test "formats page from Wiki#pages" do - @wiki.write_page("Bilbo Baggins", :markdown, "a [[Foo]][[Bar]] b", @commit) + @wiki.write_page("Bilbo Baggins", :markdown, "a [[Foo]][[Bar]] b", commit_details) assert @wiki.pages[0].formatted_data end test "double page links no space" do - @wiki.write_page("Bilbo Baggins", :markdown, "a [[Foo]][[Bar]] b", @commit) + @wiki.write_page("Bilbo Baggins", :markdown, "a [[Foo]][[Bar]] b", commit_details) # "

a FooBar b

" page = @wiki.page("Bilbo Baggins") @@ -41,7 +37,7 @@ context "Markup" do end test "double page links with space" do - @wiki.write_page("Bilbo Baggins", :markdown, "a [[Foo]] [[Bar]] b", @commit) + @wiki.write_page("Bilbo Baggins", :markdown, "a [[Foo]] [[Bar]] b", commit_details) # "

a Foo Bar b

" page = @wiki.page("Bilbo Baggins") @@ -60,7 +56,7 @@ context "Markup" do end test "page link" do - @wiki.write_page("Bilbo Baggins", :markdown, "a [[Bilbo Baggins]] b", @commit) + @wiki.write_page("Bilbo Baggins", :markdown, "a [[Bilbo Baggins]] b", commit_details) page = @wiki.page("Bilbo Baggins") output = page.formatted_data @@ -70,7 +66,7 @@ context "Markup" do end test "absent page link" do - @wiki.write_page("Tolkien", :markdown, "a [[J. R. R. Tolkien]]'s b", @commit) + @wiki.write_page("Tolkien", :markdown, "a [[J. R. R. Tolkien]]'s b", commit_details) page = @wiki.page("Tolkien") output = page.formatted_data @@ -83,7 +79,7 @@ context "Markup" do ["/wiki", "/wiki/"].each_with_index do |path, i| name = "Bilbo Baggins #{i}" @wiki = Gollum::Wiki.new(@path, :base_path => path) - @wiki.write_page(name, :markdown, "a [[#{name}]] b", @commit) + @wiki.write_page(name, :markdown, "a [[#{name}]] b", commit_details) page = @wiki.page(name) output = page.formatted_data @@ -94,7 +90,7 @@ context "Markup" do end test "external page link" do - @wiki.write_page("Bilbo Baggins", :markdown, "a [[http://example.com]] b", @commit) + @wiki.write_page("Bilbo Baggins", :markdown, "a [[http://example.com]] b", commit_details) page = @wiki.page("Bilbo Baggins") assert_equal "

a http://example.com b

", page.formatted_data @@ -103,7 +99,7 @@ context "Markup" do test "image with http url" do ['http', 'https'].each do |scheme| name = "Bilbo Baggins #{scheme}" - @wiki.write_page(name, :markdown, "a [[#{scheme}://example.com/bilbo.jpg]] b", @commit) + @wiki.write_page(name, :markdown, "a [[#{scheme}://example.com/bilbo.jpg]] b", commit_details) page = @wiki.page(name) output = page.formatted_data @@ -116,7 +112,7 @@ context "Markup" do index = @wiki.repo.index index.add("alpha.jpg", "hi") index.commit("Add alpha.jpg") - @wiki.write_page("Bilbo Baggins", :markdown, "a [[/alpha.jpg]] [[a | /alpha.jpg]] b", @commit) + @wiki.write_page("Bilbo Baggins", :markdown, "a [[/alpha.jpg]] [[a | /alpha.jpg]] b", commit_details) page = @wiki.page("Bilbo Baggins") assert_equal %{

a a b

}, page.formatted_data @@ -221,7 +217,7 @@ context "Markup" do index = @wiki.repo.index index.add("alpha.jpg", "hi") index.commit("Add alpha.jpg") - @wiki.write_page("Bilbo Baggins", :markdown, "a [[Alpha|/alpha.jpg]] b", @commit) + @wiki.write_page("Bilbo Baggins", :markdown, "a [[Alpha|/alpha.jpg]] b", commit_details) page = @wiki.page("Bilbo Baggins") output = Gollum::Markup.new(page).render diff --git a/test/test_wiki.rb b/test/test_wiki.rb index 458e9621..2e5e4ede 100644 --- a/test/test_wiki.rb +++ b/test/test_wiki.rb @@ -94,58 +94,48 @@ context "Wiki page writing" do end test "write_page" do - commit = { :message => "Gollum page", - :name => "Tom Preston-Werner", - :email => "tom@github.com" } - @wiki.write_page("Gollum", :markdown, "# Gollum", commit) + cd = commit_details + @wiki.write_page("Gollum", :markdown, "# Gollum", cd) assert_equal 1, @wiki.repo.commits.size - assert_equal "Gollum page", @wiki.repo.commits.first.message - assert_equal "Tom Preston-Werner", @wiki.repo.commits.first.author.name - assert_equal "tom@github.com", @wiki.repo.commits.first.author.email + assert_equal cd[:message], @wiki.repo.commits.first.message + assert_equal cd[:name], @wiki.repo.commits.first.author.name + assert_equal cd[:email], @wiki.repo.commits.first.author.email assert @wiki.page("Gollum") - @wiki.write_page("Bilbo", :markdown, "# Bilbo", commit) + @wiki.write_page("Bilbo", :markdown, "# Bilbo", commit_details) assert_equal 2, @wiki.repo.commits.size assert @wiki.page("Bilbo") assert @wiki.page("Gollum") end test "is not allowed to overwrite file" do - commit = { :message => "Gollum page", - :name => "Tom Preston-Werner", - :email => "tom@github.com" } - @wiki.write_page("Abc-Def", :markdown, "# Gollum", commit) + @wiki.write_page("Abc-Def", :markdown, "# Gollum", commit_details) assert_raises Gollum::DuplicatePageError do - @wiki.write_page("ABC DEF", :textile, "# Gollum", commit) + @wiki.write_page("ABC DEF", :textile, "# Gollum", commit_details) end end test "update_page" do - commit = { :message => "Gollum page", - :name => "Tom Preston-Werner", - :email => "tom@github.com" } - @wiki.write_page("Gollum", :markdown, "# Gollum", commit) + @wiki.write_page("Gollum", :markdown, "# Gollum", commit_details) page = @wiki.page("Gollum") - @wiki.update_page(page, page.name, :markdown, "# Gollum2", commit) + cd = commit_details + @wiki.update_page(page, page.name, :markdown, "# Gollum2", cd) assert_equal 2, @wiki.repo.commits.size assert_equal "# Gollum2", @wiki.page("Gollum").raw_data - assert_equal "Gollum page", @wiki.repo.commits.first.message - assert_equal "Tom Preston-Werner", @wiki.repo.commits.first.author.name - assert_equal "tom@github.com", @wiki.repo.commits.first.author.email + assert_equal cd[:message], @wiki.repo.commits.first.message + assert_equal cd[:name], @wiki.repo.commits.first.author.name + assert_equal cd[:email], @wiki.repo.commits.first.author.email end test "update page with format change" do - commit = { :message => "Gollum page", - :name => "Tom Preston-Werner", - :email => "tom@github.com" } - @wiki.write_page("Gollum", :markdown, "# Gollum", commit) + @wiki.write_page("Gollum", :markdown, "# Gollum", commit_details) assert_equal :markdown, @wiki.page("Gollum").format page = @wiki.page("Gollum") - @wiki.update_page(page, page.name, :textile, "h1. Gollum", commit) + @wiki.update_page(page, page.name, :textile, "h1. Gollum", commit_details) assert_equal 2, @wiki.repo.commits.size assert_equal :textile, @wiki.page("Gollum").format @@ -153,30 +143,24 @@ context "Wiki page writing" do end test "update page with name change" do - commit = { :message => "Gollum page", - :name => "Tom Preston-Werner", - :email => "tom@github.com" } - @wiki.write_page("Gollum", :markdown, "# Gollum", commit) + @wiki.write_page("Gollum", :markdown, "# Gollum", commit_details) assert_equal :markdown, @wiki.page("Gollum").format page = @wiki.page("Gollum") - @wiki.update_page(page, 'Smeagol', :markdown, "h1. Gollum", commit) + @wiki.update_page(page, 'Smeagol', :markdown, "h1. Gollum", commit_details) assert_equal 2, @wiki.repo.commits.size assert_equal "h1. Gollum", @wiki.page("Smeagol").raw_data end test "update page with name and format change" do - commit = { :message => "Gollum page", - :name => "Tom Preston-Werner", - :email => "tom@github.com" } - @wiki.write_page("Gollum", :markdown, "# Gollum", commit) + @wiki.write_page("Gollum", :markdown, "# Gollum", commit_details) assert_equal :markdown, @wiki.page("Gollum").format page = @wiki.page("Gollum") - @wiki.update_page(page, 'Smeagol', :textile, "h1. Gollum", commit) + @wiki.update_page(page, 'Smeagol', :textile, "h1. Gollum", commit_details) assert_equal 2, @wiki.repo.commits.size assert_equal :textile, @wiki.page("Smeagol").format @@ -184,17 +168,13 @@ context "Wiki page writing" do end test "update nested page with format change" do - commit = { :message => "Gollum page", - :name => "Tom Preston-Werner", - :email => "tom@github.com" } - index = @wiki.repo.index index.add("lotr/Gollum.md", "# Gollum") index.commit("Add nested page") page = @wiki.page("Gollum") assert_equal :markdown, @wiki.page("Gollum").format - @wiki.update_page(page, page.name, :textile, "h1. Gollum", commit) + @wiki.update_page(page, page.name, :textile, "h1. Gollum", commit_details) page = @wiki.page("Gollum") assert_equal "lotr/Gollum.textile", page.path @@ -203,23 +183,16 @@ context "Wiki page writing" do end test "delete root page" do - commit = { :message => "Gollum page", - :name => "Tom Preston-Werner", - :email => "tom@github.com" } - @wiki.write_page("Gollum", :markdown, "# Gollum", commit) + @wiki.write_page("Gollum", :markdown, "# Gollum", commit_details) page = @wiki.page("Gollum") - @wiki.delete_page(page, commit) + @wiki.delete_page(page, commit_details) assert_equal 2, @wiki.repo.commits.size assert_nil @wiki.page("Gollum") end test "delete nested page" do - commit = { :message => "Gollum page", - :name => "Tom Preston-Werner", - :email => "tom@github.com" } - index = @wiki.repo.index index.add("greek/Bilbo-Baggins.md", "hi") index.add("Gollum.md", "hi") @@ -227,7 +200,7 @@ context "Wiki page writing" do page = @wiki.page("Bilbo-Baggins") assert page - @wiki.delete_page(page, commit) + @wiki.delete_page(page, commit_details) assert_equal 2, @wiki.repo.commits.size assert_nil @wiki.page("Bilbo-Baggins")