X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fpsgi_v2.t;h=8f75a3fbf1958efa5d412f8cc6dee6c503136a8d;hb=0283273a14e1871955f6a9132f4f3f7884ec8a3f;hp=c7550e2d1e84355e6cc17c41e5ec3af80f98b2b1;hpb=d2786235a289a0286d96a9b853b7a0a30a6f6b5a;p=public-inbox.git diff --git a/t/psgi_v2.t b/t/psgi_v2.t index c7550e2d..8f75a3fb 100644 --- a/t/psgi_v2.t +++ b/t/psgi_v2.t @@ -1,24 +1,19 @@ -# Copyright (C) 2018-2019 all contributors +# Copyright (C) 2018-2020 all contributors # License: AGPL-3.0+ use strict; use warnings; use Test::More; -require './t/common.perl'; +use PublicInbox::TestCommon; require_git(2.6); -use File::Temp qw/tempdir/; -use PublicInbox::MIME; +use PublicInbox::Eml; use PublicInbox::Config; -use PublicInbox::WWW; use PublicInbox::MID qw(mids); -my @mods = qw(DBD::SQLite Search::Xapian HTTP::Request::Common Plack::Test - URI::Escape Plack::Builder); -foreach my $mod (@mods) { - eval "require $mod"; - plan skip_all => "$mod missing for psgi_v2_dupes.t" if $@; -} -use_ok($_) for @mods; +require_mods(qw(DBD::SQLite Search::Xapian HTTP::Request::Common Plack::Test + URI::Escape Plack::Builder)); +use_ok($_) for (qw(HTTP::Request::Common Plack::Test)); +use_ok 'PublicInbox::WWW'; use_ok 'PublicInbox::V2Writable'; -my $inboxdir = tempdir('pi-v2_dupes-XXXXXX', TMPDIR => 1, CLEANUP => 1); +my ($inboxdir, $for_destroy) = tmpdir(); my $ibx = { inboxdir => $inboxdir, name => 'test-v2writable', @@ -31,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::Eml->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"); @@ -53,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} @@ -63,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); @@ -125,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'); @@ -135,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'); @@ -145,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'); @@ -156,9 +162,19 @@ test_psgi(sub { $www->call(@_) }, sub { is($res->code, 200, 'success with threaded search'); my $raw = $res->content; ok($raw =~ s/\A.*>Results 1-3 of 3\b//s, 'got all results'); - my @over = ($raw =~ m/\d{4}-\d+-\d+\s+\d+:\d+ (.+)$/gm); + my @over = ($raw =~ m/\d{4}-\d+-\d+\s+\d+:\d+ +(?:\d+\% )?(.+)$/gm); is_deeply(\@over, [ '(GET('/v2test/?q=m:a-mid@b&x=A')); + is($res->code, 200, 'success with Atom search'); + SKIP: { + 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'; $res = $cb->(GET('/v2test/a-mid@b/')); $raw = $res->content; @@ -209,25 +225,7 @@ test_psgi(sub { $www->call(@_) }, sub { # ensure conflicted attachments can be resolved foreach my $body (qw(old new)) { - my $parts = [ - PublicInbox::MIME->create( - attributes => { content_type => 'text/plain' }, - body => 'blah', - ), - PublicInbox::MIME->create( - attributes => { - filename => 'attach.txt', - content_type => 'text/plain', - }, - body => $body - ) - ]; - $mime = PublicInbox::MIME->create( - parts => $parts, - header_str => [ From => 'root@z', - 'Message-ID' => '', - Subject => 'hi'] - ); + $mime = eml_load "t/psgi_v2-$body.eml"; ok($im->add($mime), "added attachment $body"); } $im->done; @@ -242,6 +240,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();