X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fpsgi_bad_mids.t;h=f23680f85dcfe285123aa17520a7ecd9f1caf01d;hb=af0b0fb7a454470a32c452119d0392e0dedb3fe1;hp=b568786dfb4c3241810477a11402feee9e744eec;hpb=62f28026e624ed30d620063a0fa92cbedb7f6673;p=public-inbox.git

diff --git a/t/psgi_bad_mids.t b/t/psgi_bad_mids.t
index b568786d..f23680f8 100644
--- a/t/psgi_bad_mids.t
+++ b/t/psgi_bad_mids.t
@@ -1,13 +1,14 @@
-# Copyright (C) 2018-2019 all contributors <meta@public-inbox.org>
+# Copyright (C) 2018-2021 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 use strict;
 use warnings;
 use Test::More;
-use PublicInbox::MIME;
+use PublicInbox::Eml;
 use PublicInbox::Config;
 use PublicInbox::TestCommon;
 my @mods = qw(DBD::SQLite HTTP::Request::Common Plack::Test
 		URI::Escape Plack::Builder PublicInbox::WWW);
+require_git 2.6;
 require_mods(@mods);
 use_ok($_) for @mods;
 use_ok 'PublicInbox::WWW';
@@ -28,6 +29,7 @@ $im->{parallel} = 0;
 my $msgs = <<'';
 F1V5OR6NMF.3M649JTLO9IXD@tux.localdomain/hehe1"'<foo
 F1V5NB0PTU.3U0DCVGAJ750Z@tux.localdomain"'<>/foo
+F1V5NB0PTU.3U0DCVGAJ750Z@tux&.ampersand
 F1V5MIHGCU.2ABINKW6WBE8N@tux.localdomain/raw
 F1V5LF9D9C.2QT5PGXZQ050E@tux.localdomain/t.atom
 F1V58X3CMU.2DCCVAKQZGADV@tux.localdomain/../../../../foo
@@ -44,7 +46,7 @@ To: b\@example.com
 Date: Fri, 02 Oct 1993 00:00:0$i +0000
 
 
-	my $mime = PublicInbox::MIME->new(\$data);
+	my $mime = PublicInbox::Eml->new(\$data);
 	ok($im->add($mime), "added $mid");
 	$i++
 }
@@ -70,9 +72,13 @@ test_psgi(sub { $www->call(@_) }, sub {
 		'got escaped links to all messages');
 
 	@xmids = reverse @xmids;
+	my %uxs = ( gt => '>', lt => '<' );
 	foreach my $i (0..$#xmids) {
-		$res = $cb->(GET("/bad-mids/$xmids[$i]/raw"));
-		is($res->code, 200, 'got 200 OK raw message');
+		my $uri = $xmids[$i];
+		$uri =~ s/&#([0-9]+);/sprintf("%c", $1)/sge;
+		$uri =~ s/&(lt|gt);/$uxs{$1}/sge;
+		$res = $cb->(GET("/bad-mids/$uri/raw"));
+		is($res->code, 200, 'got 200 OK raw message '.$uri);
 		like($res->content, qr/Message-ID: <\Q$mids[$i]\E>/s,
 			'retrieved correct message');
 	}