Update file_view output

lib/gollum/file_view.rb

@@ -22,7 +22,7 @@ module Gollum
     def new_page page
       name = page.name
       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
 
     def new_folder folder_path
@@ -38,10 +38,7 @@ module Gollum
     end
 
     def end_folder
-      <<-HTML
-        </ol>
-      </li>
-      HTML
+      "</ol></li>\n"
     end
 
     def url_for_page page

test/file_view/1_file.txt

@@ -1,3 +1,2 @@
 <ol class="tree">
-  <li class="file"><a href="0"><span class="icon"></span>0</a></li>
-</ol>
+  <li class="file"><a href="0"><span class="icon"></span>0</a></li></ol>

test/file_view/1_file_1_folder.txt

@@ -5,4 +5,4 @@
             <li class="file"><a href="folder0/0"><span class="icon"></span>0</a></li>
          </ol>
         </li>
-</ol>
+</ol>

test/file_view/1_folder.txt

@@ -5,4 +5,4 @@
             <li class="file"><a href="folder0"><span class="icon"></span>folder0</a></li>
          </ol>
         </li>
-</ol>
+</ol>

test/file_view/2_files_2_folders.txt

@@ -2,11 +2,8 @@
       <li>
         <label>folder0</label> <input type="checkbox" checked />
         <ol>
-  <li class="file"><a href="folder0/0"><span class="icon"></span>0</a></li>
-        </ol>
-      </li>
+  <li class="file"><a href="folder0/0"><span class="icon"></span>0</a></li></ol></li>
       <li>
         <label>folder1</label> <input type="checkbox" checked />
         <ol>
-  <li class="file"><a href="folder1/1"><span class="icon"></span>1</a></li>
-</ol>
+  <li class="file"><a href="folder1/1"><span class="icon"></span>1</a></li></ol>

test/file_view/2_files_2_folders_1_root.txt

@@ -1,13 +1,9 @@
 <ol class="tree">
-  <li class="file"><a href="root"><span class="icon"></span>root</a></li>
-      <li>
+  <li class="file"><a href="root"><span class="icon"></span>root</a></li>      <li>
         <label>folder0</label> <input type="checkbox" checked />
         <ol>
-  <li class="file"><a href="folder0/0"><span class="icon"></span>0</a></li>
-        </ol>
-      </li>
+  <li class="file"><a href="folder0/0"><span class="icon"></span>0</a></li></ol></li>
       <li>
         <label>folder1</label> <input type="checkbox" checked />
         <ol>
-  <li class="file"><a href="folder1/1"><span class="icon"></span>1</a></li>
-</ol>
+  <li class="file"><a href="folder1/1"><span class="icon"></span>1</a></li></ol>

test/file_view/nested_folders.txt

@@ -8,21 +8,14 @@
       <li>
         <label>folder2</label> <input type="checkbox" checked />
         <ol>
-  <li class="file"><a href="folder0/folder1/folder2/0"><span class="icon"></span>0</a></li>
-        </ol>
-      </li>
+  <li class="file"><a href="folder0/folder1/folder2/0"><span class="icon"></span>0</a></li></ol></li>
       <li>
         <label>folder3</label> <input type="checkbox" checked />
         <ol>
-  <li class="file"><a href="folder0/folder1/folder3/1"><span class="icon"></span>1</a></li>
-        </ol>
-      </li>
-        </ol>
-      </li>
-        </ol>
-      </li>
+  <li class="file"><a href="folder0/folder1/folder3/1"><span class="icon"></span>1</a></li></ol></li>
+</ol></li>
+</ol></li>
       <li>
         <label>folder4</label> <input type="checkbox" checked />
         <ol>
-  <li class="file"><a href="folder4/2"><span class="icon"></span>2</a></li>
-</ol>
+  <li class="file"><a href="folder4/2"><span class="icon"></span>2</a></li></ol>

test/test_file_view.rb

@@ -72,6 +72,10 @@ def check name, pages_array
   pages = FakePages.new pages_array
   expected = read name
   actual = view pages
+
+  # Uncomment when updating tests
+  # write name, actual
+
   assert_equal expected, actual
 end