update copyright headers and email addresses

[public-inbox.git] / t / plack.t

diff --git a/t/plack.t b/t/plack.t
index b3c87642ae6ecc6217942d06b2304d09cfaa4444..560080f0d9d9f881a879ed5fa99953be32555258 100644 (file)
--- a/t/plack.t
+++ b/t/plack.t
@@ -1,4 +1,4 @@
-# Copyright (C) 2014, Eric Wong <normalperson@yhbt.net> and all contributors
+# Copyright (C) 2014-2015 all contributors <meta@public-inbox.org>
 # License: AGPLv3 or later (https://www.gnu.org/licenses/agpl-3.0.txt)
 use strict;
 use warnings;
@@ -83,12 +83,12 @@ EOF
 
        test_psgi($app, sub {
                my ($cb) = @_;
-               my $atomurl = 'http://example.com/test/atom.xml';
+               my $atomurl = 'http://example.com/test/new.atom';
                my $res = $cb->(GET('http://example.com/test/'));
                is(200, $res->code, 'success response received');
                like($res->content, qr!href="\Q$atomurl\E"!,
                        'atom URL generated');
-               like($res->content, qr!href="m/blah%40example\.com/"!,
+               like($res->content, qr!href="blah%40example\.com/"!,
                        'index generated');
        });
 
@@ -98,14 +98,14 @@ EOF
                my $res = $cb->(GET($pfx . '/atom.xml'));
                is(200, $res->code, 'success response received for atom');
                like($res->content,
-                       qr!link\s+href="\Q$pfx\E/m/blah%40example\.com/"!s,
+                       qr!link\s+href="\Q$pfx\E/blah%40example\.com/"!s,
                        'atom feed generated correct URL');
        });
 
-       foreach my $t (qw(f m)) {
+       foreach my $t (('', 'f/')) {
                test_psgi($app, sub {
                        my ($cb) = @_;
-                       my $path = "/$t/blah%40example.com/";
+                       my $path = "/blah%40example.com/$t";
                        my $res = $cb->(GET($pfx . $path));
                        is(200, $res->code, "success for $path");
                        like($res->content, qr!<title>hihi - Me</title>!,
@@ -114,8 +114,8 @@ EOF
        }
        test_psgi($app, sub {
                my ($cb) = @_;
-               my $res = $cb->(GET($pfx . '/m/blah%40example.com/raw'));
-               is(200, $res->code, 'success response received for /m/*/raw');
+               my $res = $cb->(GET($pfx . '/blah%40example.com/raw'));
+               is(200, $res->code, 'success response received for /*/raw');
                like($res->content, qr!\AFrom !, "mbox returned");
        });
 
@@ -126,18 +126,25 @@ EOF
                        my $res = $cb->(GET($pfx . "/$t/blah%40example.com.txt"));
                        is(301, $res->code, "redirect for old $t .txt link");
                        my $location = $res->header('Location');
-                       like($location, qr!/$t/blah%40example\.com/raw\z!,
+                       like($location, qr!/blah%40example\.com/raw\z!,
                                ".txt redirected to /raw");
                });
        }
-       foreach my $t (qw(m f t)) {
+
+       my %umap = (
+               'm' => '',
+               'f' => 'f/',
+               't' => 't/',
+       );
+       while (my ($t, $e) = each %umap) {
                test_psgi($app, sub {
                        my ($cb) = @_;
                        my $res = $cb->(GET($pfx . "/$t/blah%40example.com.html"));
                        is(301, $res->code, "redirect for old $t .html link");
                        my $location = $res->header('Location');
-                       like($location, qr!/$t/blah%40example\.com/(?:#u)?\z!,
-                               ".html redirected to /raw");
+                       like($location,
+                               qr!/blah%40example\.com/$e(?:#u)?\z!,
+                               ".html redirected to new location");
                });
        }
        foreach my $sfx (qw(mbox mbox.gz)) {
@@ -146,8 +153,9 @@ EOF
                        my $res = $cb->(GET($pfx . "/t/blah%40example.com.$sfx"));
                        is(301, $res->code, 'redirect for old thread link');
                        my $location = $res->header('Location');
-                       like($location, qr!/t/blah%40example\.com/mbox\.gz\z!,
-                               "$sfx redirected to /mbox.gz");
+                       like($location,
+                            qr!/blah%40example\.com/t\.mbox(?:\.gz)?\z!,
+                            "$sfx redirected to /mbox.gz");
                });
        }
 }