From e3acef0e9199ba12c9fa012cf4aaf7ecf855bd41 Mon Sep 17 00:00:00 2001 From: James Dabbs Date: Mon, 25 Feb 2013 21:06:00 -0500 Subject: [PATCH] Add test for custom markup engine This required adding a file to the example repo, so some of the tests' expected hash values changed accordingly. --- test/examples/lotr.git/logs/HEAD | 1 + test/examples/lotr.git/logs/refs/heads/master | 1 + .../56/3cc3701db990caf63e4ce9c3697a062890ca48 | Bin 0 -> 181 bytes .../7a/cc5626e5ab453dd82857bb1843793ea058fa2c | Bin 0 -> 417 bytes .../99/49601deb167a35ca444311d7372864f3e8e1b8 | Bin 0 -> 413 bytes test/examples/lotr.git/refs/heads/master | 2 +- test/test_committer.rb | 2 +- test/test_git_access.rb | 2 +- test/test_page.rb | 14 ++++++++++++++ test/test_wiki.rb | 2 +- 10 files changed, 20 insertions(+), 4 deletions(-) create mode 100644 test/examples/lotr.git/objects/56/3cc3701db990caf63e4ce9c3697a062890ca48 create mode 100644 test/examples/lotr.git/objects/7a/cc5626e5ab453dd82857bb1843793ea058fa2c create mode 100644 test/examples/lotr.git/objects/99/49601deb167a35ca444311d7372864f3e8e1b8 diff --git a/test/examples/lotr.git/logs/HEAD b/test/examples/lotr.git/logs/HEAD index 3259d5f7..6290f7a5 100644 --- a/test/examples/lotr.git/logs/HEAD +++ b/test/examples/lotr.git/logs/HEAD @@ -6,3 +6,4 @@ b16b3d9fad9d78e5a669e7f33d94c96da374eccd b0de6e794dfdc7ef3400e894225bfe23308aae5 b0de6e794dfdc7ef3400e894225bfe23308aae5c cfea406f5f77afc7fb673a43e97721234385b1bd Darren Oakley 1341830099 +0100 push cfea406f5f77afc7fb673a43e97721234385b1bd 629aa678272b017a4d136d35e77ac94d80b08dc2 Darren Oakley 1341830833 +0100 push 629aa678272b017a4d136d35e77ac94d80b08dc2 7d6aeab8b84c895f21f6c66b84a457b0fced9693 Daniel Kimsey 1352501984 -0500 push +7d6aeab8b84c895f21f6c66b84a457b0fced9693 563cc3701db990caf63e4ce9c3697a062890ca48 James Dabbs 1361843315 -0500 push diff --git a/test/examples/lotr.git/logs/refs/heads/master b/test/examples/lotr.git/logs/refs/heads/master index 3259d5f7..6290f7a5 100644 --- a/test/examples/lotr.git/logs/refs/heads/master +++ b/test/examples/lotr.git/logs/refs/heads/master @@ -6,3 +6,4 @@ b16b3d9fad9d78e5a669e7f33d94c96da374eccd b0de6e794dfdc7ef3400e894225bfe23308aae5 b0de6e794dfdc7ef3400e894225bfe23308aae5c cfea406f5f77afc7fb673a43e97721234385b1bd Darren Oakley 1341830099 +0100 push cfea406f5f77afc7fb673a43e97721234385b1bd 629aa678272b017a4d136d35e77ac94d80b08dc2 Darren Oakley 1341830833 +0100 push 629aa678272b017a4d136d35e77ac94d80b08dc2 7d6aeab8b84c895f21f6c66b84a457b0fced9693 Daniel Kimsey 1352501984 -0500 push +7d6aeab8b84c895f21f6c66b84a457b0fced9693 563cc3701db990caf63e4ce9c3697a062890ca48 James Dabbs 1361843315 -0500 push diff --git a/test/examples/lotr.git/objects/56/3cc3701db990caf63e4ce9c3697a062890ca48 b/test/examples/lotr.git/objects/56/3cc3701db990caf63e4ce9c3697a062890ca48 new file mode 100644 index 0000000000000000000000000000000000000000..d3c21036ded193074c46a6db21f61382f27e7da1 GIT binary patch literal 181 zcmV;m080OO0iBLPZUZ3@1asyU^MORLzyMJc<&cxFe!;-ZCRmHHcJcp>zu-%&tEG~< z^w#Qt#k;q$i$F>)p*AepU?A%YIp?e~9Bf!3y46Y)lcT!PF4qBpk%V&0(Uq9|x|kIU z;zV*jWW5&QgvlzpkN>{IiJBbnOF19#b$J3m`_Esax_y-1zQI^D(b*+Lc-LNQHP`uZ j$ZNJb-+JAqOf$wO5VJ7sm3b35`gR|+Uk~*F`!G>k{F+?s literal 0 HcmV?d00001 diff --git a/test/examples/lotr.git/objects/7a/cc5626e5ab453dd82857bb1843793ea058fa2c b/test/examples/lotr.git/objects/7a/cc5626e5ab453dd82857bb1843793ea058fa2c new file mode 100644 index 0000000000000000000000000000000000000000..45ccf1d0ed0208e0eace9b567f2aebf0f3129b4d GIT binary patch literal 417 zcmV;S0bc%i0ZmfNZrd;r?3rJ&AE4wI1kE8x+oZ@Lxx{VGl(-TXUXcd5vZ254P_~Pl zNbc-oW|qC?p6>4NzI{e-6n&+VvsJ<+m}0N2Zflglg&wdy5!cX~-JdazcwdxcALzi*4N6(e?^O(jJB)UzH@$ z>_sm-8T5=@r@csx&h4ULy^uT+c6`3I5y!lg`rZAI5^4uid^Mcs-O~tJ*wlmjojmkO z$*_Fe6?|h>03ZUj5ndyd6MV5uGkahk>emVjK$FTMsX?c-S&KRNfKjGM^X1o20C?rR LlbQbkO;zj+KIzZQ literal 0 HcmV?d00001 diff --git a/test/examples/lotr.git/objects/99/49601deb167a35ca444311d7372864f3e8e1b8 b/test/examples/lotr.git/objects/99/49601deb167a35ca444311d7372864f3e8e1b8 new file mode 100644 index 0000000000000000000000000000000000000000..ad47cd48486be60c0b53439677a55c0b78bed261 GIT binary patch literal 413 zcmV;O0b>4m0V^p=O;s>4vt%$dFfcPQQEYF!db67`ac%NP!Cv765^Et{jSigD5tv+XNdLiAWo41hqvJwGoc zzlb5vWA&e~u+Wm$c^q<2`_`q#dYmtW8sd?ko2plmT2YdjlgjYx`TJlO1?^pqnyc>! zv++)vesfAH#30}NB9KA6CmC~AY8>wkQCvAIcyr}eOHCy?s6oD!x&cM0$(i}3V0W+D zCjVk?*pEaXuExMyCO<9jy#18{RT-3-l9H2JtXGu6P<19u?dfV)+Z!6;yCs|}?G{A* z(t%hQlv$RVmy(*3!(etsGVAZ{J(IlF$o)wEFn2%W#D{HAlY$d-%QK5p72FeZ(^FIR za#K?>6U#HRGZ~geZZ5NK(!E*gk|cj&-+M8=#nmEEJ@Ib&`6a1Eps;;&%ZPQ~Lsx}W zTbJ)PD4xXTJ-M$LrphBVF$JQkc81K&mbDS{Y(DTdDv9&t*Jeak!c+xkrlck%;xr5Z H6aTgZJrm2U literal 0 HcmV?d00001 diff --git a/test/examples/lotr.git/refs/heads/master b/test/examples/lotr.git/refs/heads/master index f01a5091..546030a2 100644 --- a/test/examples/lotr.git/refs/heads/master +++ b/test/examples/lotr.git/refs/heads/master @@ -1 +1 @@ -7d6aeab8b84c895f21f6c66b84a457b0fced9693 +563cc3701db990caf63e4ce9c3697a062890ca48 diff --git a/test/test_committer.rb b/test/test_committer.rb index e9b2e17b..15b11231 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 = '7d6aeab8b84c895f21f6c66b84a457b0fced9693' + ref = '563cc3701db990caf63e4ce9c3697a062890ca48' 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 caaa37d5..6e62e663 100644 --- a/test/test_git_access.rb +++ b/test/test_git_access.rb @@ -18,7 +18,7 @@ context "GitAccess" do assert @access.ref_map.empty? assert @access.tree_map.empty? @access.tree 'master' - assert_equal({"master"=>"7d6aeab8b84c895f21f6c66b84a457b0fced9693"}, @access.ref_map) + assert_equal({"master"=>"563cc3701db990caf63e4ce9c3697a062890ca48"}, @access.ref_map) @access.tree '1db89ebba7e2c14d93b94ff98cfa3708a4f0d4e3' map = @access.tree_map['1db89ebba7e2c14d93b94ff98cfa3708a4f0d4e3'] diff --git a/test/test_page.rb b/test/test_page.rb index fc1c34a4..a2cd4c6c 100644 --- a/test/test_page.rb +++ b/test/test_page.rb @@ -236,4 +236,18 @@ if $METADATA end end +end + +context "with custom markup engines" do + setup do + Gollum::Markup.register(:redacted, "Redacted", :regexp => /rd/) { |content| content.gsub /\S/, '-' } + @wiki = Gollum::Wiki.new(testpath("examples/lotr.git")) + end + + test "should use the specified engine" do + page = @wiki.page('Riddles') + assert_equal :redacted, page.format + assert page.raw_data.include? 'Time' + assert page.raw_data =~ /^[\s\-]*$/ + end end \ No newline at end of file diff --git a/test/test_wiki.rb b/test/test_wiki.rb index 531c1200..af51ab06 100644 --- a/test/test_wiki.rb +++ b/test/test_wiki.rb @@ -61,7 +61,7 @@ context "Wiki" do test "list files" do files = @wiki.files assert_equal \ - ['Data.csv', 'eye.jpg', 'todo.txt'], + ['Data.csv', 'Riddles.rd', 'eye.jpg', 'todo.txt'], files.map { |p| p.filename }.sort end