From 6191f6002558b0e29bc6d13ad451d5e099db11bd Mon Sep 17 00:00:00 2001 From: kristi Date: Mon, 14 May 2012 02:01:33 -0700 Subject: [PATCH] Fix tests for added example repo pages --- test/test_committer.rb | 2 +- test/test_git_access.rb | 5 +++-- test/test_page.rb | 21 +++++++++++++++++++++ test/test_wiki.rb | 4 ++-- 4 files changed, 27 insertions(+), 5 deletions(-) diff --git a/test/test_committer.rb b/test/test_committer.rb index 0b65736b..494b12f5 100644 --- a/test/test_committer.rb +++ b/test/test_committer.rb @@ -50,7 +50,7 @@ context "Wiki" do end test "parents with default master ref" do - ref = '1db89ebba7e2c14d93b94ff98cfa3708a4f0d4e3' + ref = 'b0de6e794dfdc7ef3400e894225bfe23308aae5c' committer = Gollum::Committer.new(@wiki) assert_equal ref, committer.parents.first.sha end diff --git a/test/test_git_access.rb b/test/test_git_access.rb index 3f94a3df..3cd8d0ac 100644 --- a/test/test_git_access.rb +++ b/test/test_git_access.rb @@ -18,8 +18,9 @@ context "GitAccess" do assert @access.ref_map.empty? assert @access.tree_map.empty? @access.tree 'master' - assert_equal({"master"=>"1db89ebba7e2c14d93b94ff98cfa3708a4f0d4e3"}, @access.ref_map) + assert_equal({"master"=>"b0de6e794dfdc7ef3400e894225bfe23308aae5c"}, @access.ref_map) + @access.tree '1db89ebba7e2c14d93b94ff98cfa3708a4f0d4e3' map = @access.tree_map['1db89ebba7e2c14d93b94ff98cfa3708a4f0d4e3'] assert_equal 'Bilbo-Baggins.md', map[0].path assert_equal '', map[0].dir @@ -49,4 +50,4 @@ context "GitAccess" do test "cannot access tree from invalid ref" do assert_equal [], @access.tree('foo') end -end \ No newline at end of file +end diff --git a/test/test_page.rb b/test/test_page.rb index c81b1187..020dc106 100644 --- a/test/test_page.rb +++ b/test/test_page.rb @@ -114,6 +114,25 @@ context "Page" do assert_equal "Eye Of Sauron", page.title end + test "top level header" do + header = @wiki.page('Home').header + assert_equal "Hobbits\n", header.raw_data + assert_equal "_Header.md", header.path + end + + test "nested header" do + header = @wiki.page('Eye Of Sauron').header + assert_equal "Sauron\n", header.raw_data + assert_equal "Mordor/_Header.md", header.path + end + + test "header itself" do + header = @wiki.page("_Header") + assert_nil header.header + assert_nil header.footer + assert_nil header.sidebar + end + test "top level footer" do footer = @wiki.page('Home').footer assert_equal 'Lord of the Rings wiki', footer.raw_data @@ -128,6 +147,7 @@ context "Page" do test "footer itself" do footer = @wiki.page("_Footer") + assert_nil footer.header assert_nil footer.footer assert_nil footer.sidebar end @@ -146,6 +166,7 @@ context "Page" do test "sidebar itself" do sidebar = @wiki.page("_Sidebar") + assert_nil sidebar.header assert_nil sidebar.footer assert_nil sidebar.sidebar end diff --git a/test/test_wiki.rb b/test/test_wiki.rb index 3ec25a04..c3d18e5b 100644 --- a/test/test_wiki.rb +++ b/test/test_wiki.rb @@ -54,12 +54,12 @@ context "Wiki" do test "list pages" do pages = @wiki.pages assert_equal \ - ['Bilbo-Baggins.md', 'Eye-Of-Sauron.md', 'Home.textile', 'My-Precious.md', 'Samwise Gamgee.mediawiki'], + ['Bilbo-Baggins.md', 'Boromir.md', 'Eye-Of-Sauron.md', 'Home.textile', 'My-Precious.md', 'Samwise Gamgee.mediawiki'], pages.map { |p| p.filename }.sort end test "counts pages" do - assert_equal 5, @wiki.size + assert_equal 6, @wiki.size end test "text_data" do