From 19325930a26474554bded4b6271dfa2e941543a4 Mon Sep 17 00:00:00 2001 From: Darren Oakley Date: Mon, 9 Jul 2012 11:40:11 +0100 Subject: [PATCH] Add a new file and sub-directory - 'Rivendell/Elrond.md' so we can test Sidebar/Header/Footer inheritance from parent directory. --- test/examples/lotr.git/logs/HEAD | 2 ++ test/examples/lotr.git/logs/refs/heads/master | 2 ++ .../1c/79ddc69707f7b164bc2ea58beb5d8965ff6bd0 | Bin 0 -> 53 bytes .../27/680b0fce1abfbc528e7aa53d92645852d52eb6 | Bin 0 -> 378 bytes .../4e/023f460ce466e154ca09d8774c79ad5a53fc15 | Bin 0 -> 54 bytes .../62/9aa678272b017a4d136d35e77ac94d80b08dc2 | 1 + .../cf/ea406f5f77afc7fb673a43e97721234385b1bd | 2 ++ .../fb/c5dd7d807707b4a0a97c1182fecfef1eced5df | 1 + .../fc/3eee516ff72dc9099ba00d4611eb02e5c9e634 | Bin 0 -> 379 bytes .../ff/6f7de62644369380ba73b4e4297c1a2d6f0b66 | Bin 0 -> 210 bytes test/examples/lotr.git/refs/heads/master | 2 +- test/test_committer.rb | 2 +- test/test_git_access.rb | 2 +- test/test_wiki.rb | 4 ++-- 14 files changed, 13 insertions(+), 5 deletions(-) create mode 100644 test/examples/lotr.git/objects/1c/79ddc69707f7b164bc2ea58beb5d8965ff6bd0 create mode 100644 test/examples/lotr.git/objects/27/680b0fce1abfbc528e7aa53d92645852d52eb6 create mode 100644 test/examples/lotr.git/objects/4e/023f460ce466e154ca09d8774c79ad5a53fc15 create mode 100644 test/examples/lotr.git/objects/62/9aa678272b017a4d136d35e77ac94d80b08dc2 create mode 100644 test/examples/lotr.git/objects/cf/ea406f5f77afc7fb673a43e97721234385b1bd create mode 100644 test/examples/lotr.git/objects/fb/c5dd7d807707b4a0a97c1182fecfef1eced5df create mode 100644 test/examples/lotr.git/objects/fc/3eee516ff72dc9099ba00d4611eb02e5c9e634 create mode 100644 test/examples/lotr.git/objects/ff/6f7de62644369380ba73b4e4297c1a2d6f0b66 diff --git a/test/examples/lotr.git/logs/HEAD b/test/examples/lotr.git/logs/HEAD index 6cba614a..31a4e256 100644 --- a/test/examples/lotr.git/logs/HEAD +++ b/test/examples/lotr.git/logs/HEAD @@ -3,3 +3,5 @@ a8ad3c09dd842a3517085bfadd37718856dee813 1db89ebba7e2c14d93b94ff98cfa3708a4f0d4e3 Arran Cudbard-Bell 1309107565 +0200 commit: Test out whitespace with Sam 1db89ebba7e2c14d93b94ff98cfa3708a4f0d4e3 b16b3d9fad9d78e5a669e7f33d94c96da374eccd kristi 1336983525 -0700 push b16b3d9fad9d78e5a669e7f33d94c96da374eccd b0de6e794dfdc7ef3400e894225bfe23308aae5c kristi 1336984025 -0700 push +b0de6e794dfdc7ef3400e894225bfe23308aae5c cfea406f5f77afc7fb673a43e97721234385b1bd Darren Oakley 1341830099 +0100 push +cfea406f5f77afc7fb673a43e97721234385b1bd 629aa678272b017a4d136d35e77ac94d80b08dc2 Darren Oakley 1341830833 +0100 push diff --git a/test/examples/lotr.git/logs/refs/heads/master b/test/examples/lotr.git/logs/refs/heads/master index 6cba614a..31a4e256 100644 --- a/test/examples/lotr.git/logs/refs/heads/master +++ b/test/examples/lotr.git/logs/refs/heads/master @@ -3,3 +3,5 @@ a8ad3c09dd842a3517085bfadd37718856dee813 1db89ebba7e2c14d93b94ff98cfa3708a4f0d4e3 Arran Cudbard-Bell 1309107565 +0200 commit: Test out whitespace with Sam 1db89ebba7e2c14d93b94ff98cfa3708a4f0d4e3 b16b3d9fad9d78e5a669e7f33d94c96da374eccd kristi 1336983525 -0700 push b16b3d9fad9d78e5a669e7f33d94c96da374eccd b0de6e794dfdc7ef3400e894225bfe23308aae5c kristi 1336984025 -0700 push +b0de6e794dfdc7ef3400e894225bfe23308aae5c cfea406f5f77afc7fb673a43e97721234385b1bd Darren Oakley 1341830099 +0100 push +cfea406f5f77afc7fb673a43e97721234385b1bd 629aa678272b017a4d136d35e77ac94d80b08dc2 Darren Oakley 1341830833 +0100 push diff --git a/test/examples/lotr.git/objects/1c/79ddc69707f7b164bc2ea58beb5d8965ff6bd0 b/test/examples/lotr.git/objects/1c/79ddc69707f7b164bc2ea58beb5d8965ff6bd0 new file mode 100644 index 0000000000000000000000000000000000000000..415ae116725982154502419de6e427ceb4f720c1 GIT binary patch literal 53 zcmV-50LuS(0V^p=O;s>9XD~D{Ff%bxaLp;o&r8wEO=0+-U;9kW#cXoJuHr3EG;5@E L^SRRiPxlZ4Hn|s` literal 0 HcmV?d00001 diff --git a/test/examples/lotr.git/objects/27/680b0fce1abfbc528e7aa53d92645852d52eb6 b/test/examples/lotr.git/objects/27/680b0fce1abfbc528e7aa53d92645852d52eb6 new file mode 100644 index 0000000000000000000000000000000000000000..e0fb454fcf683c29417bfb879b4239304b469dd6 GIT binary patch literal 378 zcmV-=0fqi}0V^p=O;s>4He@g~FfcPQQEYF!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{F)AptEHy7BH7AF`kICMR=SkYbkW-vD%6%%=Mg{*7 zg_;(em|LD%oT}iSn46xOs+XIZl9^bZnVre7EOK+1b(8MRQkNw83;W)S=`F4nf$E8O z%g--KEdqtwn_EV#`yRR~tlGMKw?XkFHt)%O%`jCSsfj5NRkbr@ZnmtAm}m2Ww^2!) YC%-l$vJ$2$I5Q9XD~D{Ff%bxaLp;o&r8wEO=0+b^loiKIs29cD{BOs{+)j> Mckb$a0A#omZ86Oj&;S4c literal 0 HcmV?d00001 diff --git a/test/examples/lotr.git/objects/62/9aa678272b017a4d136d35e77ac94d80b08dc2 b/test/examples/lotr.git/objects/62/9aa678272b017a4d136d35e77ac94d80b08dc2 new file mode 100644 index 00000000..4b894d58 --- /dev/null +++ b/test/examples/lotr.git/objects/62/9aa678272b017a4d136d35e77ac94d80b08dc2 @@ -0,0 +1 @@ +xMJ1F])j0S4(ZTe& 187pP55PNߴ*jzAFDV&cUli8SGIp0KQb>0ХJ'zwL}ǕRއè4p#^?<2k%sec8Q*|vipb;z{bT\ \ No newline at end of file diff --git a/test/examples/lotr.git/objects/cf/ea406f5f77afc7fb673a43e97721234385b1bd b/test/examples/lotr.git/objects/cf/ea406f5f77afc7fb673a43e97721234385b1bd new file mode 100644 index 00000000..92192562 --- /dev/null +++ b/test/examples/lotr.git/objects/cf/ea406f5f77afc7fb673a43e97721234385b1bd @@ -0,0 +1,2 @@ +xN0EY+fjǏHF&jWcvWW::g*P 1΁CY` &"[k<3" ZOгѫ|ѽ.*iy} wtˆko/=[XRt# +}vt(Ŝ]-=)&)]/ \ No newline at end of file diff --git a/test/examples/lotr.git/objects/fb/c5dd7d807707b4a0a97c1182fecfef1eced5df b/test/examples/lotr.git/objects/fb/c5dd7d807707b4a0a97c1182fecfef1eced5df new file mode 100644 index 00000000..e931c46b --- /dev/null +++ b/test/examples/lotr.git/objects/fb/c5dd7d807707b4a0a97c1182fecfef1eced5df @@ -0,0 +1 @@ +xEN@ D+FKR$h:8NbENgTI wW8hɖBT|QK. ylU;dM18ʢ\&fMmA3qXxwLŧ6C8I?dzT͍d Tjf̱ 9]<7[ b#t'Ǭga.BaH\d%ܬ[ŧRv/b \ No newline at end of file diff --git a/test/examples/lotr.git/objects/fc/3eee516ff72dc9099ba00d4611eb02e5c9e634 b/test/examples/lotr.git/objects/fc/3eee516ff72dc9099ba00d4611eb02e5c9e634 new file mode 100644 index 0000000000000000000000000000000000000000..74cbd3c11782bfedd1846c5a85cde71301696e5d GIT binary patch literal 379 zcmV->0fhc|0V^p=O;s>4He@g~FfcPQQEYF!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{F)AptEHy7BH7AEbrtFnP(rtHyM+Wk7VGxdM= z1*mDkiMi#O#iisd~AoDVd4onc0~P%OW?ISvTq4EOkkezp(GUnBL-Q5vZPc zxBUE))FM!*y}4z?y6>T@!m6#ycN-K>V)LHd*9=qTk(!tSQB^xb=4Q*ptEP> zH{+9*6YlPBuMXHI9E)Cr4P(3LvYgNCY=O)!D}|I6-Mal7A4&t) Mn|;^)0Ccfn0$4a|wEzGB literal 0 HcmV?d00001 diff --git a/test/examples/lotr.git/refs/heads/master b/test/examples/lotr.git/refs/heads/master index bd1b8af0..a19ee561 100644 --- a/test/examples/lotr.git/refs/heads/master +++ b/test/examples/lotr.git/refs/heads/master @@ -1 +1 @@ -b0de6e794dfdc7ef3400e894225bfe23308aae5c +629aa678272b017a4d136d35e77ac94d80b08dc2 diff --git a/test/test_committer.rb b/test/test_committer.rb index 494b12f5..57d8c2b8 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 = 'b0de6e794dfdc7ef3400e894225bfe23308aae5c' + ref = '629aa678272b017a4d136d35e77ac94d80b08dc2' 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 3cd8d0ac..df49b17d 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"=>"b0de6e794dfdc7ef3400e894225bfe23308aae5c"}, @access.ref_map) + assert_equal({"master"=>"629aa678272b017a4d136d35e77ac94d80b08dc2"}, @access.ref_map) @access.tree '1db89ebba7e2c14d93b94ff98cfa3708a4f0d4e3' map = @access.tree_map['1db89ebba7e2c14d93b94ff98cfa3708a4f0d4e3'] diff --git a/test/test_wiki.rb b/test/test_wiki.rb index 63303f67..5fa7c0f6 100644 --- a/test/test_wiki.rb +++ b/test/test_wiki.rb @@ -54,7 +54,7 @@ context "Wiki" do test "list pages" do pages = @wiki.pages assert_equal \ - ['Bilbo-Baggins.md', 'Boromir.md', 'Eye-Of-Sauron.md', 'Home.textile', 'My-Precious.md', 'Samwise Gamgee.mediawiki'], + ['Bilbo-Baggins.md', 'Boromir.md', 'Elrond.md', 'Eye-Of-Sauron.md', 'Home.textile', 'My-Precious.md', 'Samwise Gamgee.mediawiki'], pages.map { |p| p.filename }.sort end @@ -66,7 +66,7 @@ context "Wiki" do end test "counts pages" do - assert_equal 6, @wiki.size + assert_equal 7, @wiki.size end test "text_data" do