diff --git a/lib/gollum/app.rb b/lib/gollum/app.rb index c26b3bb0..0292b127 100644 --- a/lib/gollum/app.rb +++ b/lib/gollum/app.rb @@ -450,6 +450,7 @@ module Precious wiki = Gollum::Wiki.new(settings.gollum_path, wiki_options) @results = wiki.pages @results += wiki.files if settings.wiki_options[:show_all] + @results = @results.sort_by { |p| p.name.downcase } # Sort Results alphabetically, fixes 922 @ref = wiki.ref mustache :pages end diff --git a/test/examples/lotr.git/logs/HEAD b/test/examples/lotr.git/logs/HEAD index 64e98b35..2b0e49e0 100644 --- a/test/examples/lotr.git/logs/HEAD +++ b/test/examples/lotr.git/logs/HEAD @@ -8,3 +8,4 @@ cfea406f5f77afc7fb673a43e97721234385b1bd 629aa678272b017a4d136d35e77ac94d80b08dc 629aa678272b017a4d136d35e77ac94d80b08dc2 7d6aeab8b84c895f21f6c66b84a457b0fced9693 Daniel Kimsey 1352501984 -0500 push 7d6aeab8b84c895f21f6c66b84a457b0fced9693 563cc3701db990caf63e4ce9c3697a062890ca48 James Dabbs 1361843315 -0500 push 563cc3701db990caf63e4ce9c3697a062890ca48 874f597a5659b4c3b153674ea04e406ff393975e Charles Pence 1363478075 -0400 push +874f597a5659b4c3b153674ea04e406ff393975e 7bdfe65face6f7cf9877d8c1d8c1dd974a63745e Nathan Lowe 1421012322 -0500 push diff --git a/test/examples/lotr.git/logs/refs/heads/master b/test/examples/lotr.git/logs/refs/heads/master index 64e98b35..2b0e49e0 100644 --- a/test/examples/lotr.git/logs/refs/heads/master +++ b/test/examples/lotr.git/logs/refs/heads/master @@ -8,3 +8,4 @@ cfea406f5f77afc7fb673a43e97721234385b1bd 629aa678272b017a4d136d35e77ac94d80b08dc 629aa678272b017a4d136d35e77ac94d80b08dc2 7d6aeab8b84c895f21f6c66b84a457b0fced9693 Daniel Kimsey 1352501984 -0500 push 7d6aeab8b84c895f21f6c66b84a457b0fced9693 563cc3701db990caf63e4ce9c3697a062890ca48 James Dabbs 1361843315 -0500 push 563cc3701db990caf63e4ce9c3697a062890ca48 874f597a5659b4c3b153674ea04e406ff393975e Charles Pence 1363478075 -0400 push +874f597a5659b4c3b153674ea04e406ff393975e 7bdfe65face6f7cf9877d8c1d8c1dd974a63745e Nathan Lowe 1421012322 -0500 push diff --git a/test/examples/lotr.git/objects/15/ffb242d2f9d49112afaac25aff0eaebc32ca04 b/test/examples/lotr.git/objects/15/ffb242d2f9d49112afaac25aff0eaebc32ca04 new file mode 100644 index 00000000..498640a0 Binary files /dev/null and b/test/examples/lotr.git/objects/15/ffb242d2f9d49112afaac25aff0eaebc32ca04 differ diff --git a/test/examples/lotr.git/objects/46/deec372646f3eb641c459b1a1a63599e20988b b/test/examples/lotr.git/objects/46/deec372646f3eb641c459b1a1a63599e20988b new file mode 100644 index 00000000..d5591af9 Binary files /dev/null and b/test/examples/lotr.git/objects/46/deec372646f3eb641c459b1a1a63599e20988b differ diff --git a/test/examples/lotr.git/objects/7b/dfe65face6f7cf9877d8c1d8c1dd974a63745e b/test/examples/lotr.git/objects/7b/dfe65face6f7cf9877d8c1d8c1dd974a63745e new file mode 100644 index 00000000..8053682c Binary files /dev/null and b/test/examples/lotr.git/objects/7b/dfe65face6f7cf9877d8c1d8c1dd974a63745e differ diff --git a/test/examples/lotr.git/objects/f5/9001ceaca4caaaa24fb1b8da3deaaf7f42893a b/test/examples/lotr.git/objects/f5/9001ceaca4caaaa24fb1b8da3deaaf7f42893a new file mode 100644 index 00000000..7e4dd7a9 --- /dev/null +++ b/test/examples/lotr.git/objects/f5/9001ceaca4caaaa24fb1b8da3deaaf7f42893a @@ -0,0 +1,3 @@ +x A + ֝ +\HN /f(xz*ˠ G%ςPCaHN?^Ѕ][m%QEvh \ No newline at end of file diff --git a/test/examples/lotr.git/refs/heads/master b/test/examples/lotr.git/refs/heads/master index 115b865a..81879653 100644 --- a/test/examples/lotr.git/refs/heads/master +++ b/test/examples/lotr.git/refs/heads/master @@ -1 +1 @@ -874f597a5659b4c3b153674ea04e406ff393975e +7bdfe65face6f7cf9877d8c1d8c1dd974a63745e diff --git a/test/test_app.rb b/test/test_app.rb index 68c590e9..f4f8c19e 100644 --- a/test/test_app.rb +++ b/test/test_app.rb @@ -619,6 +619,7 @@ context "Frontend with lotr" do assert !body.include?("Boromir"), "/pages should NOT include the page 'Boromir'" assert body.include?("Mordor"), "/pages should include the folder 'Mordor'" assert !body.include?("Eye Of Sauron"), "/pages should NOT include the page 'Eye Of Sauron'" + assert !body.match(/(Zamin).+(roast\-mutton)/m), "/pages should be sorted alphabetically" end test "/pages/Mordor/" do diff --git a/test/test_latest_changes_view.rb b/test/test_latest_changes_view.rb index 4883b223..fe6d08de 100644 --- a/test/test_latest_changes_view.rb +++ b/test/test_latest_changes_view.rb @@ -19,9 +19,10 @@ context "Precious::Views::LatestChanges" do test "displays_latest_changes" do get('/latest_changes') body = last_response.body + assert body.include?('Charles Pence'), "/latest_changes should include the Author Charles Pence" - assert body.include?('60f12f4'), "/latest_changes should include the :latest_changes_count commit" - assert !body.include?('0ed8cbe'), "/latest_changes should not include more than latest_changes_count commits" + assert body.include?('a8ad3c0'), "/latest_changes should include the :latest_changes_count commit" + assert !body.include?('60f12f4'), "/latest_changes should not include more than latest_changes_count commits" assert body.include?('Data-Two.csv'), "/latest_changes include links to modified files in #{body}" assert body.include?('Hobbit.md'), "/latest_changes should include links to modified pages in #{body}" end