From 6888420cc648aa1a95adcdb9985cdce0b024fe54 Mon Sep 17 00:00:00 2001 From: bootstraponline Date: Sat, 10 Nov 2012 12:08:05 -0700 Subject: [PATCH] Update file_view output --- lib/gollum/file_view.rb | 7 ++----- test/file_view/1_file.txt | 3 +-- test/file_view/1_file_1_folder.txt | 2 +- test/file_view/1_folder.txt | 2 +- test/file_view/2_files_2_folders.txt | 7 ++----- test/file_view/2_files_2_folders_1_root.txt | 10 +++------- test/file_view/nested_folders.txt | 17 +++++------------ test/test_file_view.rb | 4 ++++ 8 files changed, 19 insertions(+), 33 deletions(-) diff --git a/lib/gollum/file_view.rb b/lib/gollum/file_view.rb index 0d2379b9..79ab67b6 100644 --- a/lib/gollum/file_view.rb +++ b/lib/gollum/file_view.rb @@ -22,7 +22,7 @@ module Gollum def new_page page name = page.name url = url_for_page page - %Q(
  • #{name}
    • \n) + %Q(
  • #{name}
    • ) end def new_folder folder_path @@ -38,10 +38,7 @@ module Gollum end def end_folder - <<-HTML - - - HTML + "\n" end def url_for_page page diff --git a/test/file_view/1_file.txt b/test/file_view/1_file.txt index 30d1ec1d..6b87ac96 100644 --- a/test/file_view/1_file.txt +++ b/test/file_view/1_file.txt @@ -1,3 +1,2 @@
      -
    1. 0
      2. -
    +
  • 0
    • \ No newline at end of file diff --git a/test/file_view/1_file_1_folder.txt b/test/file_view/1_file_1_folder.txt index 33a3e47b..10255983 100644 --- a/test/file_view/1_file_1_folder.txt +++ b/test/file_view/1_file_1_folder.txt @@ -5,4 +5,4 @@
  • 0
    • - + \ No newline at end of file diff --git a/test/file_view/1_folder.txt b/test/file_view/1_folder.txt index 323443b3..69b71a6d 100644 --- a/test/file_view/1_folder.txt +++ b/test/file_view/1_folder.txt @@ -5,4 +5,4 @@
  • folder0
    • - + \ No newline at end of file diff --git a/test/file_view/2_files_2_folders.txt b/test/file_view/2_files_2_folders.txt index 1011235e..289c7053 100644 --- a/test/file_view/2_files_2_folders.txt +++ b/test/file_view/2_files_2_folders.txt @@ -2,11 +2,8 @@
    • -
    1. 0
      2. -
    -
    • +
  • 0
    • -
    1. 1
      2. -
    +
  • 1
    • \ No newline at end of file diff --git a/test/file_view/2_files_2_folders_1_root.txt b/test/file_view/2_files_2_folders_1_root.txt index 76b551f7..40b2cdb9 100644 --- a/test/file_view/2_files_2_folders_1_root.txt +++ b/test/file_view/2_files_2_folders_1_root.txt @@ -1,13 +1,9 @@
      -
    1. root
      2. -
    2. +
    3. root
      4. -
      1. 0
        2. -
      -
      5. +
    5. 0
    • -
    1. 1
      2. -
    +
  • 1
    • \ No newline at end of file diff --git a/test/file_view/nested_folders.txt b/test/file_view/nested_folders.txt index 39bf4ba6..a767869e 100644 --- a/test/file_view/nested_folders.txt +++ b/test/file_view/nested_folders.txt @@ -8,21 +8,14 @@
    • -
    1. 0
      2. -
    -
    • +
  • 0
    • -
    1. 1
      2. -
    -
    • - - - - +
  • 1
    • + +
    • -
    1. 2
      2. -
    +
  • 2
    • \ No newline at end of file diff --git a/test/test_file_view.rb b/test/test_file_view.rb index b943f52a..c3bcd9e3 100644 --- a/test/test_file_view.rb +++ b/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