X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fpsgi_v2.t;h=5d212ca6f7ca1bb126bef8f92d02123f01789891;hb=5d8dbb4aca5afcc6b98a4d951f03003fb7eaf356;hp=8c619cee08189ef00da350cfcf43ab2382268e7f;hpb=a5bd6a45e4d772e81e2dd4f76d4291f74fa15230;p=public-inbox.git diff --git a/t/psgi_v2.t b/t/psgi_v2.t index 8c619cee..5d212ca6 100644 --- a/t/psgi_v2.t +++ b/t/psgi_v2.t @@ -1,4 +1,4 @@ -# Copyright (C) 2018-2019 all contributors +# Copyright (C) 2018-2020 all contributors # License: AGPL-3.0+ use strict; use warnings; @@ -7,11 +7,11 @@ use PublicInbox::TestCommon; require_git(2.6); use PublicInbox::MIME; use PublicInbox::Config; -use PublicInbox::WWW; use PublicInbox::MID qw(mids); require_mods(qw(DBD::SQLite Search::Xapian HTTP::Request::Common Plack::Test - URI::Escape Plack::Builder)); + URI::Escape Plack::Builder Email::MIME)); use_ok($_) for (qw(HTTP::Request::Common Plack::Test)); +use_ok 'PublicInbox::WWW'; use_ok 'PublicInbox::V2Writable'; my ($inboxdir, $for_destroy) = tmpdir(); my $ibx = { @@ -26,16 +26,16 @@ my $new_mid; my $im = PublicInbox::V2Writable->new($ibx, 1); $im->{parallel} = 0; -my $mime = PublicInbox::MIME->create( - header => [ - From => 'a@example.com', - To => 'test@example.com', - Subject => 'this is a subject', - 'Message-ID' => '', - Date => 'Fri, 02 Oct 1993 00:00:00 +0000', - ], - body => "hello world\n", -); +my $mime = PublicInbox::MIME->new(<<'EOF'); +From oldbug-pre-a0c07cba0e5d8b6a Fri Oct 2 00:00:00 1993 +From: a@example.com +To: test@example.com +Subject: this is a subject +Message-ID: +Date: Fri, 02 Oct 1993 00:00:00 +0000 + +hello world +EOF ok($im->add($mime), 'added one message'); $mime->body_set("hello world!\n"); @@ -48,6 +48,10 @@ my $mids = mids($mime->header_obj); $new_mid = $mids->[1]; $im->done; +my $msg = $ibx->msg_by_mid('a-mid@b'); +like($$msg, qr/\AFrom oldbug/s, + '"From_" line stored to test old bug workaround'); + my $cfgpfx = "publicinbox.v2test"; my $cfg = <{-primary_address} @@ -58,8 +62,12 @@ my $www = PublicInbox::WWW->new($config); my ($res, $raw, @from_); test_psgi(sub { $www->call(@_) }, sub { my ($cb) = @_; + $res = $cb->(GET('/v2test/description')); + like($res->content, qr!\$INBOX_DIR/description missing!, + 'got v2 description missing message'); $res = $cb->(GET('/v2test/a-mid@b/raw')); $raw = $res->content; + unlike($raw, qr/^From oldbug/sm, 'buggy "From_" line omitted'); like($raw, qr/^hello world$/m, 'got first message'); like($raw, qr/^hello world!$/m, 'got second message'); @from_ = ($raw =~ m/^From /mg); @@ -120,6 +128,7 @@ test_psgi(sub { $www->call(@_) }, sub { my $out; my $in = $res->content; my $status = IO::Uncompress::Gunzip::gunzip(\$in => \$out); + unlike($out, qr/^From oldbug/sm, 'buggy "From_" line omitted'); like($out, qr/^hello world$/m, 'got first in t.mbox.gz'); like($out, qr/^hello world!$/m, 'got second in t.mbox.gz'); like($out, qr/^hello ghosts$/m, 'got third in t.mbox.gz'); @@ -130,6 +139,7 @@ test_psgi(sub { $www->call(@_) }, sub { $res = $cb->(POST('/v2test/?q=m:a-mid@b&x=m')); $in = $res->content; $status = IO::Uncompress::Gunzip::gunzip(\$in => \$out); + unlike($out, qr/^From oldbug/sm, 'buggy "From_" line omitted'); like($out, qr/^hello world$/m, 'got first in mbox POST'); like($out, qr/^hello world!$/m, 'got second in mbox POST'); like($out, qr/^hello ghosts$/m, 'got third in mbox POST'); @@ -140,6 +150,7 @@ test_psgi(sub { $www->call(@_) }, sub { $res = $cb->(GET('/v2test/all.mbox.gz')); $in = $res->content; $status = IO::Uncompress::Gunzip::gunzip(\$in => \$out); + unlike($out, qr/^From oldbug/sm, 'buggy "From_" line omitted'); like($out, qr/^hello world$/m, 'got first in all.mbox'); like($out, qr/^hello world!$/m, 'got second in all.mbox'); like($out, qr/^hello ghosts$/m, 'got third in all.mbox'); @@ -157,11 +168,11 @@ test_psgi(sub { $www->call(@_) }, sub { $res = $cb->(GET('/v2test/?q=m:a-mid@b&x=A')); is($res->code, 200, 'success with Atom search'); SKIP: { - require_mods(qw(XML::Feed), 2); - $raw = $res->content; - my $p = XML::Feed->parse(\$raw); - is($p->format, "Atom", "parsed atom feed"); - is(scalar $p->entries, 3, "parsed three entries"); + require_mods(qw(XML::TreePP), 2); + my $t = XML::TreePP->new->parse($res->content); + like($t->{feed}->{-xmlns}, qr/\bAtom\b/, + 'looks like an an Atom feed'); + is(scalar @{$t->{feed}->{entry}}, 3, 'parsed three entries'); }; local $SIG{__WARN__} = 'DEFAULT'; @@ -214,12 +225,13 @@ test_psgi(sub { $www->call(@_) }, sub { # ensure conflicted attachments can be resolved foreach my $body (qw(old new)) { + $mime = mime_load "t/psgi_v2-$body.eml", sub { my $parts = [ - PublicInbox::MIME->create( + Email::MIME->create( attributes => { content_type => 'text/plain' }, body => 'blah', ), - PublicInbox::MIME->create( + Email::MIME->create( attributes => { filename => 'attach.txt', content_type => 'text/plain', @@ -227,12 +239,12 @@ test_psgi(sub { $www->call(@_) }, sub { body => $body ) ]; - $mime = PublicInbox::MIME->create( + Email::MIME->create( parts => $parts, header_str => [ From => 'root@z', 'Message-ID' => '', Subject => 'hi'] - ); + )}; # mime_load sub ok($im->add($mime), "added attachment $body"); } $im->done; @@ -247,6 +259,8 @@ test_psgi(sub { $www->call(@_) }, sub { is($old->content, 'old', 'got expected old content'); is($new->content, 'new', 'got expected new content'); } + $res = $cb->(GET('/v2test/?t=1970'.'01'.'01'.'000000')); + is($res->code, 404, '404 for out-of-range t= param'); }); done_testing();