wiki.ohea.xyz/gollum
10
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Update file_view output

Browse Source
This commit is contained in:
bootstraponline
2012-11-10 12:08:05 -07:00
parent c5631f5b7d
commit 6888420cc6
8 changed files with 19 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/gollum/file_view.rb
+2 -5
View File
@@ -22,7 +22,7 @@ module Gollum
def new_page page def new_page page
name = page.name name = page.name
url = url_for_page page url = url_for_page page
%Q( <li class="file"><a href="#{url}"><span class="icon"></span>#{name}</a></li>\n) %Q( <li class="file"><a href="#{url}"><span class="icon"></span>#{name}</a></li>)
end end
def new_folder folder_path def new_folder folder_path
@@ -38,10 +38,7 @@ module Gollum
end end
def end_folder def end_folder
<<-HTML "</ol></li>\n"
</ol>
</li>
HTML
end end
def url_for_page page def url_for_page page
test/file_view/1_file.txt
+1 -2
View File
@@ -1,3 +1,2 @@
<ol class="tree"> <ol class="tree">
<li class="file"><a href="0"><span class="icon"></span>0</a></li> <li class="file"><a href="0"><span class="icon"></span>0</a></li></ol>
</ol>
test/file_view/1_file_1_folder.txt
+1 -1
View File
@@ -5,4 +5,4 @@
<li class="file"><a href="folder0/0"><span class="icon"></span>0</a></li> <li class="file"><a href="folder0/0"><span class="icon"></span>0</a></li>
</ol> </ol>
</li> </li>
</ol> </ol>
test/file_view/1_folder.txt
+1 -1
View File
@@ -5,4 +5,4 @@
<li class="file"><a href="folder0"><span class="icon"></span>folder0</a></li> <li class="file"><a href="folder0"><span class="icon"></span>folder0</a></li>
</ol> </ol>
</li> </li>
</ol> </ol>
test/file_view/2_files_2_folders.txt
+2 -5
View File
@@ -2,11 +2,8 @@
<li> <li>
<label>folder0</label> <input type="checkbox" checked /> <label>folder0</label> <input type="checkbox" checked />
<ol> <ol>
<li class="file"><a href="folder0/0"><span class="icon"></span>0</a></li> <li class="file"><a href="folder0/0"><span class="icon"></span>0</a></li></ol></li>
</ol>
</li>
<li> <li>
<label>folder1</label> <input type="checkbox" checked /> <label>folder1</label> <input type="checkbox" checked />
<ol> <ol>
<li class="file"><a href="folder1/1"><span class="icon"></span>1</a></li> <li class="file"><a href="folder1/1"><span class="icon"></span>1</a></li></ol>
</ol>
test/file_view/2_files_2_folders_1_root.txt
+3 -7
View File
@@ -1,13 +1,9 @@
<ol class="tree"> <ol class="tree">
<li class="file"><a href="root"><span class="icon"></span>root</a></li> <li class="file"><a href="root"><span class="icon"></span>root</a></li> <li>
<li>
<label>folder0</label> <input type="checkbox" checked /> <label>folder0</label> <input type="checkbox" checked />
<ol> <ol>
<li class="file"><a href="folder0/0"><span class="icon"></span>0</a></li> <li class="file"><a href="folder0/0"><span class="icon"></span>0</a></li></ol></li>
</ol>
</li>
<li> <li>
<label>folder1</label> <input type="checkbox" checked /> <label>folder1</label> <input type="checkbox" checked />
<ol> <ol>
<li class="file"><a href="folder1/1"><span class="icon"></span>1</a></li> <li class="file"><a href="folder1/1"><span class="icon"></span>1</a></li></ol>
</ol>
test/file_view/nested_folders.txt
+5 -12
View File
@@ -8,21 +8,14 @@
<li> <li>
<label>folder2</label> <input type="checkbox" checked /> <label>folder2</label> <input type="checkbox" checked />
<ol> <ol>
<li class="file"><a href="folder0/folder1/folder2/0"><span class="icon"></span>0</a></li> <li class="file"><a href="folder0/folder1/folder2/0"><span class="icon"></span>0</a></li></ol></li>
</ol>
</li>
<li> <li>
<label>folder3</label> <input type="checkbox" checked /> <label>folder3</label> <input type="checkbox" checked />
<ol> <ol>
<li class="file"><a href="folder0/folder1/folder3/1"><span class="icon"></span>1</a></li> <li class="file"><a href="folder0/folder1/folder3/1"><span class="icon"></span>1</a></li></ol></li>
</ol> </ol></li>
</li> </ol></li>
</ol>
</li>
</ol>
</li>
<li> <li>
<label>folder4</label> <input type="checkbox" checked /> <label>folder4</label> <input type="checkbox" checked />
<ol> <ol>
<li class="file"><a href="folder4/2"><span class="icon"></span>2</a></li> <li class="file"><a href="folder4/2"><span class="icon"></span>2</a></li></ol>
</ol>
test/test_file_view.rb
+4
View File
@@ -72,6 +72,10 @@ def check name, pages_array
pages = FakePages.new pages_array pages = FakePages.new pages_array
expected = read name expected = read name
actual = view pages actual = view pages
# Uncomment when updating tests
# write name, actual
assert_equal expected, actual assert_equal expected, actual
end end