]> Sergey Matveev's repositories - public-inbox.git/blobdiff - t/cgi.t
extmsg: use Xapian only for partial matches
[public-inbox.git] / t / cgi.t
diff --git a/t/cgi.t b/t/cgi.t
index a0f09c594a1127070d8f40ad7ed5e6b1ceca6b4a..bd92ca361047f886cbdbace18521774703863882 100644 (file)
--- a/t/cgi.t
+++ b/t/cgi.t
@@ -1,5 +1,5 @@
-# Copyright (C) 2014-2015 all contributors <meta@public-inbox.org>
-# License: AGPLv3 or later (https://www.gnu.org/licenses/agpl-3.0.txt)
+# Copyright (C) 2014-2018 all contributors <meta@public-inbox.org>
+# License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 # FIXME: this test is too slow and most non-CGI-requirements
 # should be moved over to things which use test_psgi
 use strict;
@@ -118,7 +118,7 @@ EOF
        like($res->{head}, qr/Status:\s*206/i, "info/refs partial past end OK");
        is($res->{body}, substr($orig, 5), 'partial body OK past end');
 }
-
+use Data::Dumper;
 # atom feeds
 {
        local $ENV{HOME} = $home;
@@ -126,7 +126,7 @@ EOF
        like($res->{body}, qr/<title>test for public-inbox/,
                "set title in XML feed");
        like($res->{body},
-               qr!http://test\.example\.com/test/blah%40example\.com/!,
+               qr!http://test\.example\.com/test/blah\@example\.com/!,
                "link id set");
        like($res->{body}, qr/what\?/, "reply included");
 }
@@ -148,39 +148,33 @@ EOF
        $im->add($reply);
        $im->done;
 
-       my $res = cgi_run("/test/slashy%2fasdf%40example.com/raw");
+       my $res = cgi_run("/test/slashy/asdf\@example.com/raw");
        like($res->{body}, qr/Message-Id: <\Q$slashy_mid\E>/,
                "slashy mid raw hit");
 
        $res = cgi_run("/test/blahblah\@example.com/raw");
        like($res->{body}, qr/Message-Id: <blahblah\@example\.com>/,
                "mid raw hit");
-       $res = cgi_run("/test/blahblah\@example.con/raw");
-       like($res->{head}, qr/Status: 300 Multiple Choices/, "mid raw miss");
 
        $res = cgi_run("/test/blahblah\@example.com/");
        like($res->{body}, qr/\A<html>/, "mid html hit");
        like($res->{head}, qr/Status: 200 OK/, "200 response");
-       $res = cgi_run("/test/blahblah\@example.con/");
-       like($res->{head}, qr/Status: 300 Multiple Choices/, "mid html miss");
 
        $res = cgi_run("/test/blahblah\@example.com/f/");
        like($res->{head}, qr/Status: 301 Moved/, "301 response");
        like($res->{head},
-               qr!^Location: http://[^/]+/test/blahblah%40example\.com/\r\n!ms,
+               qr!^Location: http://[^/]+/test/blahblah\@example\.com/\r\n!ms,
                '301 redirect location');
-       $res = cgi_run("/test/blahblah\@example.con/");
-       like($res->{head}, qr/Status: 300 Multiple Choices/, "mid html miss");
 
        $res = cgi_run("/test/new.html");
-       like($res->{body}, qr/slashy%2Fasdf%40example\.com/,
+       like($res->{body}, qr/slashy%2Fasdf\@example\.com/,
                "slashy URL generated correctly");
 }
 
 # retrieve thread as an mbox
 {
        local $ENV{HOME} = $home;
-       my $path = "/test/blahblah%40example.com/t.mbox.gz";
+       my $path = "/test/blahblah\@example.com/t.mbox.gz";
        my $res = cgi_run($path);
        like($res->{head}, qr/^Status: 501 /, "search not-yet-enabled");
        my $indexed = system($index, $maindir) == 0;
@@ -200,7 +194,7 @@ EOF
 
        my $have_xml_feed = eval { require XML::Feed; 1 } if $indexed;
        if ($have_xml_feed) {
-               $path = "/test/blahblah%40example.com/t.atom";
+               $path = "/test/blahblah\@example.com/t.atom";
                $res = cgi_run($path);
                like($res->{head}, qr/^Status: 200 /, "atom returned 200");
                like($res->{head}, qr!^Content-Type: application/atom\+xml!m,