diff --git a/lib/gollum/wiki.rb b/lib/gollum/wiki.rb index 5704cd1f..172aa9aa 100644 --- a/lib/gollum/wiki.rb +++ b/lib/gollum/wiki.rb @@ -221,9 +221,7 @@ module Gollum # # Returns an Array of Gollum::Page instances. def pages(treeish = nil) - tree_list(treeish || 'master').sort! do |x, y| - x.title.downcase <=> y.title.downcase - end + tree_list(treeish || 'master') end # Public: Returns the number of pages accessible from a commit diff --git a/test/examples/lotr.git/objects/30/8fdf72d89351bf53fa6eeb00884273047e07fa b/test/examples/lotr.git/objects/30/8fdf72d89351bf53fa6eeb00884273047e07fa deleted file mode 100644 index c32de7a4..00000000 --- a/test/examples/lotr.git/objects/30/8fdf72d89351bf53fa6eeb00884273047e07fa +++ /dev/null @@ -1,2 +0,0 @@ -x[ -0@QـyD$AH:=pᖾM$(UJ(ǹtqyv.EvVsUo 3Q9悞1!#~Vp*Fe䂟dᬣcOPa!m[@hrH \ No newline at end of file diff --git a/test/examples/lotr.git/objects/eb/578ff8ed46c6cc579d1a474fb2b94487f420fd b/test/examples/lotr.git/objects/eb/578ff8ed46c6cc579d1a474fb2b94487f420fd deleted file mode 100644 index ac381fc6..00000000 Binary files a/test/examples/lotr.git/objects/eb/578ff8ed46c6cc579d1a474fb2b94487f420fd and /dev/null differ diff --git a/test/examples/lotr.git/objects/ed/d74f8d7f6d025d66eb67411c5db60959ae16fd b/test/examples/lotr.git/objects/ed/d74f8d7f6d025d66eb67411c5db60959ae16fd deleted file mode 100644 index b0c2bb52..00000000 Binary files a/test/examples/lotr.git/objects/ed/d74f8d7f6d025d66eb67411c5db60959ae16fd and /dev/null differ diff --git a/test/examples/lotr.git/refs/heads/master b/test/examples/lotr.git/refs/heads/master index 96bb51f5..3f114d47 100644 --- a/test/examples/lotr.git/refs/heads/master +++ b/test/examples/lotr.git/refs/heads/master @@ -1 +1 @@ -308fdf72d89351bf53fa6eeb00884273047e07fa +60f12f4254f58801b9ee7db7bca5fa8aeefaa56b \ No newline at end of file diff --git a/test/test_wiki.rb b/test/test_wiki.rb index 5e769f43..51cd287b 100644 --- a/test/test_wiki.rb +++ b/test/test_wiki.rb @@ -32,15 +32,15 @@ context "Wiki" do assert_equal commits, @wiki.log(:page => 2).map { |c| c.id } end - test "list pages, sorted by title" do + test "list pages" do pages = @wiki.pages assert_equal \ - %w(bilbo.md Bilbo-Baggins.md Eye-Of-Sauron.md My-Precious.md Home.textile), - pages.map { |p| p.filename } + %w(Bilbo-Baggins.md Eye-Of-Sauron.md Home.textile My-Precious.md), + pages.map { |p| p.filename }.sort end test "counts pages" do - assert_equal 5, @wiki.size + assert_equal 4, @wiki.size end test "normalizes commit hash" do @@ -64,9 +64,9 @@ context "Wiki" do assert @wiki.ref_map.empty? assert @wiki.tree_map.empty? @wiki.tree_map_for 'master' - assert_equal({"master"=>"308fdf72d89351bf53fa6eeb00884273047e07fa"}, @wiki.ref_map) + assert_equal({"master"=>"60f12f4254f58801b9ee7db7bca5fa8aeefaa56b"}, @wiki.ref_map) - map = @wiki.tree_map['308fdf72d89351bf53fa6eeb00884273047e07fa'] + map = @wiki.tree_map['60f12f4254f58801b9ee7db7bca5fa8aeefaa56b'] assert_equal 'Bilbo-Baggins.md', map[0].path assert_equal '', map[0].dir assert_equal map[0].path, map[0].name @@ -77,10 +77,10 @@ context "Wiki" do test "#tree_map_for only caches tree for commit" do assert @wiki.tree_map.empty? - @wiki.tree_map_for '308fdf72d89351bf53fa6eeb00884273047e07fa' + @wiki.tree_map_for '60f12f4254f58801b9ee7db7bca5fa8aeefaa56b' assert @wiki.ref_map.empty? - entry = @wiki.tree_map['308fdf72d89351bf53fa6eeb00884273047e07fa'][0] + entry = @wiki.tree_map['60f12f4254f58801b9ee7db7bca5fa8aeefaa56b'][0] assert_equal 'Bilbo-Baggins.md', entry.path end end