Merge branch 'master' into debian-jessie-backports

[git.ikiwiki.info.git] / t / pagespec_match_list.t

diff --git a/t/pagespec_match_list.t b/t/pagespec_match_list.t
index 244ad915991dfc622d01273f4cac6c2ad4fcdcc1..7ff178aad19c4b3a2285f60cc74a357308d4a582 100755 (executable)
--- a/t/pagespec_match_list.t
+++ b/t/pagespec_match_list.t
@@ -12,7 +12,7 @@ IkiWiki::checkconfig();
 {
        package IkiWiki::SortSpec;
 
 {
        package IkiWiki::SortSpec;
 

-       sub cmp_path { $a cmp $b }
+       sub cmp_raw_path { $a cmp $b }

 }
 
 %pagesources=(
 }
 
 %pagesources=(


@@ -53,7 +53,7 @@ is_deeply([pagespec_match_list("foo", "post/*", sort => "title", num => 50, reve
 is_deeply([pagespec_match_list("foo", "post/*", sort => "title",
                          filter => sub { $_[0] =~ /3/}) ],
        ["post/1", "post/2"]);
 is_deeply([pagespec_match_list("foo", "post/*", sort => "title",
                          filter => sub { $_[0] =~ /3/}) ],
        ["post/1", "post/2"]);

-is_deeply([pagespec_match_list("foo", "*", sort => "path", num => 2)],
+is_deeply([pagespec_match_list("foo", "*", sort => "raw_path", num => 2)],

        ["bar", "foo"]);
 is_deeply([pagespec_match_list("foo", "foo* or bar*",
                sort => "-age title")], # oldest first, break ties by title
        ["bar", "foo"]);
 is_deeply([pagespec_match_list("foo", "foo* or bar*",
                sort => "-age title")], # oldest first, break ties by title