diff --git a/test/file_view/1_file.txt b/test/file_view/1_file.txt index 6b87ac96..d74f47ce 100644 --- a/test/file_view/1_file.txt +++ b/test/file_view/1_file.txt @@ -1,2 +1,5 @@
    -
  1. 0
\ No newline at end of file +
  • + 0 +
    • + diff --git a/test/file_view/1_file_1_folder.txt b/test/file_view/1_file_1_folder.txt index 10255983..54a50980 100644 --- a/test/file_view/1_file_1_folder.txt +++ b/test/file_view/1_file_1_folder.txt @@ -1,8 +1,11 @@
      -
    1. - -
        -
      1. 0
        2. -
      -
      2. -
    \ No newline at end of file +
  • + + +
      +
    1. + 0 +
      2. +
    +
    • + diff --git a/test/file_view/1_folder.txt b/test/file_view/1_folder.txt index 69b71a6d..04066def 100644 --- a/test/file_view/1_folder.txt +++ b/test/file_view/1_folder.txt @@ -1,8 +1,11 @@
      -
    1. - -
        -
      1. folder0
        2. -
      -
      2. -
    \ No newline at end of file +
  • + + +
      +
    1. + folder0 +
      2. +
    +
    • + diff --git a/test/file_view/2_files_2_folders.txt b/test/file_view/2_files_2_folders.txt index 289c7053..49cb39ee 100644 --- a/test/file_view/2_files_2_folders.txt +++ b/test/file_view/2_files_2_folders.txt @@ -1,9 +1,20 @@
      -
    1. - -
        -
      1. 0
      2. -
    2. - -
        -
      1. 1
      \ No newline at end of file +
    3. + + +
        +
      1. + 0 +
        2. +
      +
      4. +
    4. + + +
        +
      1. + 1 +
        2. +
      +
      5. +
    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 40b2cdb9..1ee732b2 100644 --- a/test/file_view/2_files_2_folders_1_root.txt +++ b/test/file_view/2_files_2_folders_1_root.txt @@ -1,9 +1,23 @@
      -
    1. root
    2. - -
        -
      1. 0
      3. -
    3. - -
        -
      1. 1
      \ No newline at end of file +
    4. + root +
      5. +
    5. + + +
        +
      1. + 0 +
        2. +
      +
      6. +
    6. + + +
        +
      1. + 1 +
        2. +
      +
      7. +
    diff --git a/test/file_view/nested_folders.txt b/test/file_view/nested_folders.txt index a767869e..5cb0703f 100644 --- a/test/file_view/nested_folders.txt +++ b/test/file_view/nested_folders.txt @@ -1,21 +1,41 @@
      +
    1. + + +
      1. - + +
          -
        1. - -
            -
          1. - -
              -
            1. 0
            2. -
          2. - -
              -
            1. 1
            3. -
          2. -
        2. -
      2. - -
          -
        1. 2
        \ No newline at end of file +
      3. + + +
          +
        1. + 0 +
          2. +
        +
        4. +
      4. + + +
          +
        1. + 1 +
          2. +
        +
        5. +
      +
      2. +
    + +
  • + + +
      +
    1. + 2 +
      2. +
    +
    • + diff --git a/test/test_file_view.rb b/test/test_file_view.rb index c3bcd9e3..76747bde 100644 --- a/test/test_file_view.rb +++ b/test/test_file_view.rb @@ -68,10 +68,22 @@ def write file, content end end +@@format_xslt = File.expand_path(File.join(File.dirname(__FILE__), 'format.xslt')) + +def to_html html + # Remove blank nodes for proper formatting + doc = Nokogiri.XML(html) do |cfg| + cfg.default_xml.noblanks + end + + # Save as XHTML + doc.to_xml( { :save_with => Nokogiri::XML::Node::SaveOptions::DEFAULT_XHTML, :indent => 2, :encoding => 'UTF-8' } ) +end + def check name, pages_array pages = FakePages.new pages_array expected = read name - actual = view pages + actual = to_html view pages # Uncomment when updating tests # write name, actual