Add a new file and sub-directory - 'Rivendell/Elrond.md' so we can test Sidebar/Header/Footer inheritance from parent directory.

This commit is contained in:
Darren Oakley
2012-07-09 11:40:11 +01:00
parent 33f133b8b2
commit 19325930a2
14 changed files with 13 additions and 5 deletions
+2
View File
@@ -3,3 +3,5 @@
a8ad3c09dd842a3517085bfadd37718856dee813 1db89ebba7e2c14d93b94ff98cfa3708a4f0d4e3 Arran Cudbard-Bell <a.cudbardb@freeradius.org> 1309107565 +0200 commit: Test out whitespace with Sam a8ad3c09dd842a3517085bfadd37718856dee813 1db89ebba7e2c14d93b94ff98cfa3708a4f0d4e3 Arran Cudbard-Bell <a.cudbardb@freeradius.org> 1309107565 +0200 commit: Test out whitespace with Sam
1db89ebba7e2c14d93b94ff98cfa3708a4f0d4e3 b16b3d9fad9d78e5a669e7f33d94c96da374eccd kristi <kristi.dev@gmail.com> 1336983525 -0700 push 1db89ebba7e2c14d93b94ff98cfa3708a4f0d4e3 b16b3d9fad9d78e5a669e7f33d94c96da374eccd kristi <kristi.dev@gmail.com> 1336983525 -0700 push
b16b3d9fad9d78e5a669e7f33d94c96da374eccd b0de6e794dfdc7ef3400e894225bfe23308aae5c kristi <kristi.dev@gmail.com> 1336984025 -0700 push b16b3d9fad9d78e5a669e7f33d94c96da374eccd b0de6e794dfdc7ef3400e894225bfe23308aae5c kristi <kristi.dev@gmail.com> 1336984025 -0700 push
b0de6e794dfdc7ef3400e894225bfe23308aae5c cfea406f5f77afc7fb673a43e97721234385b1bd Darren Oakley <daz.oakley@gmail.com> 1341830099 +0100 push
cfea406f5f77afc7fb673a43e97721234385b1bd 629aa678272b017a4d136d35e77ac94d80b08dc2 Darren Oakley <daz.oakley@gmail.com> 1341830833 +0100 push
@@ -3,3 +3,5 @@
a8ad3c09dd842a3517085bfadd37718856dee813 1db89ebba7e2c14d93b94ff98cfa3708a4f0d4e3 Arran Cudbard-Bell <a.cudbardb@freeradius.org> 1309107565 +0200 commit: Test out whitespace with Sam a8ad3c09dd842a3517085bfadd37718856dee813 1db89ebba7e2c14d93b94ff98cfa3708a4f0d4e3 Arran Cudbard-Bell <a.cudbardb@freeradius.org> 1309107565 +0200 commit: Test out whitespace with Sam
1db89ebba7e2c14d93b94ff98cfa3708a4f0d4e3 b16b3d9fad9d78e5a669e7f33d94c96da374eccd kristi <kristi.dev@gmail.com> 1336983525 -0700 push 1db89ebba7e2c14d93b94ff98cfa3708a4f0d4e3 b16b3d9fad9d78e5a669e7f33d94c96da374eccd kristi <kristi.dev@gmail.com> 1336983525 -0700 push
b16b3d9fad9d78e5a669e7f33d94c96da374eccd b0de6e794dfdc7ef3400e894225bfe23308aae5c kristi <kristi.dev@gmail.com> 1336984025 -0700 push b16b3d9fad9d78e5a669e7f33d94c96da374eccd b0de6e794dfdc7ef3400e894225bfe23308aae5c kristi <kristi.dev@gmail.com> 1336984025 -0700 push
b0de6e794dfdc7ef3400e894225bfe23308aae5c cfea406f5f77afc7fb673a43e97721234385b1bd Darren Oakley <daz.oakley@gmail.com> 1341830099 +0100 push
cfea406f5f77afc7fb673a43e97721234385b1bd 629aa678272b017a4d136d35e77ac94d80b08dc2 Darren Oakley <daz.oakley@gmail.com> 1341830833 +0100 push
@@ -0,0 +1 @@
xMJ1F]ї)jя0Sю4(шZ№Te&ю 1Ѓ8Ї7pїёСуНPж55PNпД*jzAFђбЋЬDVѓЂ&cUlјi8S­GIцХpф0KдQмbВ>ви0аЅJzЫђwLз}љнЧВоУЈЭш4Ђбp#тап^йфМе?<2У%чУsЎec8гQ*|ІоvipbЉ;ЅќИzю{bёTП
@@ -0,0 +1,2 @@
xֻNֳ0EYח+f₪±„H°Fג&™כײjֱ׳cרvWW::g־כ*ׁװP 1¬־C˜„Y` &¶טח€ֱשמ"[¥‰ֱkװש€ט<3ֶא­ם§כ"
ךהZO¹׀³”ֶׁ«|ׁ½ֺק.םַד*iֽy} ד¼³wtֻ†¹ko«¬ר/=©ׂ[תְ¦X–‎ֻRע¦t‘#צ
@@ -0,0 +1 @@
xE▐╠Nд@ D╘В+FKRН$╗h:┴8яШ╡Nb²ЦE╩N─©gцT╤гР⌡ЯIС ВwWв8hи√B╦T|QеK. yю⌡╛l┴U;dЦMЯ┴1к8Ый╒\Й&fMmA▌б3┴q┌Xx∙■■wLе╖6C╪Б8I?▌╪гЁTм█фdЯ┐У
+1 -1
View File
@@ -1 +1 @@
b0de6e794dfdc7ef3400e894225bfe23308aae5c 629aa678272b017a4d136d35e77ac94d80b08dc2
+1 -1
View File
@@ -50,7 +50,7 @@ context "Wiki" do
end end
test "parents with default master ref" do test "parents with default master ref" do
ref = 'b0de6e794dfdc7ef3400e894225bfe23308aae5c' ref = '629aa678272b017a4d136d35e77ac94d80b08dc2'
committer = Gollum::Committer.new(@wiki) committer = Gollum::Committer.new(@wiki)
assert_equal ref, committer.parents.first.sha assert_equal ref, committer.parents.first.sha
end end
+1 -1
View File
@@ -18,7 +18,7 @@ context "GitAccess" do
assert @access.ref_map.empty? assert @access.ref_map.empty?
assert @access.tree_map.empty? assert @access.tree_map.empty?
@access.tree 'master' @access.tree 'master'
assert_equal({"master"=>"b0de6e794dfdc7ef3400e894225bfe23308aae5c"}, @access.ref_map) assert_equal({"master"=>"629aa678272b017a4d136d35e77ac94d80b08dc2"}, @access.ref_map)
@access.tree '1db89ebba7e2c14d93b94ff98cfa3708a4f0d4e3' @access.tree '1db89ebba7e2c14d93b94ff98cfa3708a4f0d4e3'
map = @access.tree_map['1db89ebba7e2c14d93b94ff98cfa3708a4f0d4e3'] map = @access.tree_map['1db89ebba7e2c14d93b94ff98cfa3708a4f0d4e3']
+2 -2
View File
@@ -54,7 +54,7 @@ context "Wiki" do
test "list pages" do test "list pages" do
pages = @wiki.pages pages = @wiki.pages
assert_equal \ 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 pages.map { |p| p.filename }.sort
end end
@@ -66,7 +66,7 @@ context "Wiki" do
end end
test "counts pages" do test "counts pages" do
assert_equal 6, @wiki.size assert_equal 7, @wiki.size
end end
test "text_data" do test "text_data" do