X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fplack.t;h=1ae58731ec370bb2a8fe01547023db9861026748;hb=fdf9b900b8c35cb4259dbdf56400d44db61e7a9e;hp=568f09f00f4ac5c21d075bbd09002cf4a74bae11;hpb=474a987a2ba9183ceb9e143aeccdc49c7cb5f382;p=public-inbox.git

diff --git a/t/plack.t b/t/plack.t
index 568f09f0..1ae58731 100644
--- a/t/plack.t
+++ b/t/plack.t
@@ -98,9 +98,9 @@ EOF
 			my ($cb) = @_;
 			my $u = $pfx . "/blah%40example.com/$t";
 			my $res = $cb->(GET($u));
-			is(301, $res->code, "redirect for missing /");
+			is(301, $res->code, "redirect for legacy /f");
 			my $location = $res->header('Location');
-			like($location, qr!/\Q$t\E/\z!,
+			like($location, qr!/blah%40example\.com/\z!,
 				'redirected with missing /');
 		});
 	}
@@ -125,16 +125,22 @@ EOF
 			'atom feed generated correct URL');
 	});
 
-	foreach my $t (('', 'f/')) {
-		test_psgi($app, sub {
-			my ($cb) = @_;
-			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>!,
-				"HTML returned");
-		});
-	}
+	test_psgi($app, sub {
+		my ($cb) = @_;
+		my $path = '/blah%40example.com/';
+		my $res = $cb->(GET($pfx . $path));
+		is(200, $res->code, "success for $path");
+		like($res->content, qr!<title>hihi - Me</title>!,
+			"HTML returned");
+
+		$path .= 'f/';
+		$res = $cb->(GET($pfx . $path));
+		is(301, $res->code, "redirect for $path");
+		my $location = $res->header('Location');
+		like($location, qr!/blah%40example\.com/\z!,
+			'/$MESSAGE_ID/f/ redirected to /$MESSAGE_ID/');
+	});
+
 	test_psgi($app, sub {
 		my ($cb) = @_;
 		my $res = $cb->(GET($pfx . '/blah%40example.com/raw'));
@@ -156,7 +162,7 @@ EOF
 
 	my %umap = (
 		'm' => '',
-		'f' => 'f/',
+		'f' => '',
 		't' => 't/',
 	);
 	while (my ($t, $e) = each %umap) {