diff options
Diffstat (limited to 't')
| -rw-r--r-- | t/psgi_attach.t | 162 |
1 files changed, 92 insertions, 70 deletions
diff --git a/t/psgi_attach.t b/t/psgi_attach.t index 9a734f81..14d20adb 100644 --- a/t/psgi_attach.t +++ b/t/psgi_attach.t @@ -5,9 +5,8 @@ use warnings; use Test::More; use PublicInbox::TestCommon; my ($tmpdir, $for_destroy) = tmpdir(); -my $maindir = "$tmpdir/main.git"; +my $inboxdir = "$tmpdir/main.git"; my $addr = 'test-public@example.com'; -my $cfgpfx = "publicinbox.test"; my @mods = qw(HTTP::Request::Common Plack::Builder Plack::Test URI::Escape); require_mods(@mods); use_ok $_ foreach @mods; @@ -17,85 +16,108 @@ use PublicInbox::Git; use PublicInbox::Config; use PublicInbox::Eml; use_ok 'PublicInbox::WwwAttach'; -my $config = PublicInbox::Config->new(\<<EOF); -$cfgpfx.address=$addr -$cfgpfx.inboxdir=$maindir + +my $cfgpath = "$tmpdir/config"; +open my $fh, '>', $cfgpath or BAIL_OUT $!; +print $fh <<EOF or BAIL_OUT $!; +[publicinbox "test"] + address = $addr + inboxdir = $inboxdir EOF -my $git = PublicInbox::Git->new($maindir); +close $fh or BAIL_OUT $!; +my $config = PublicInbox::Config->new($cfgpath); +my $git = PublicInbox::Git->new($inboxdir); my $im = PublicInbox::Import->new($git, 'test', $addr); $im->init_bare; -{ - my $qp = "abcdef=g\n==blah\n"; - my $b64 = "b64\xde\xad\xbe\xef\n"; - my $txt = "plain\ntext\npass\nthrough\n"; - my $dot = "dotfile\n"; - $im->add(eml_load('t/psgi_attach.eml')); - $im->add(eml_load('t/data/message_embed.eml')); - $im->done; +my $qp = "abcdef=g\n==blah\n"; +my $b64 = "b64\xde\xad\xbe\xef\n"; +my $txt = "plain\ntext\npass\nthrough\n"; +my $dot = "dotfile\n"; +$im->add(eml_load('t/psgi_attach.eml')); +$im->add(eml_load('t/data/message_embed.eml')); +$im->done; + +my $www = PublicInbox::WWW->new($config); +my $client = sub { + my ($cb) = @_; + my $res; + $res = $cb->(GET('/test/Z%40B/')); + my @href = ($res->content =~ /^href="([^"]+)"/gms); + @href = grep(/\A[\d\.]+-/, @href); + is_deeply([qw(1-queue-pee 2-bayce-sixty-four 3-noop.txt + 4-a.txt)], + \@href, 'attachment links generated'); + + $res = $cb->(GET('/test/Z%40B/1-queue-pee')); + my $qp_res = $res->content; + ok(length($qp_res) >= length($qp), 'QP length is close'); + like($qp_res, qr/\n\z/s, 'trailing newline exists'); + # is(index($qp_res, $qp), 0, 'QP trailing newline is there'); + $qp_res =~ s/\r\n/\n/g; + is(index($qp_res, $qp), 0, 'QP trailing newline is there'); + + $res = $cb->(GET('/test/Z%40B/2-base-sixty-four')); + is(quotemeta($res->content), quotemeta($b64), + 'Base64 matches exactly'); - my $www = PublicInbox::WWW->new($config); - test_psgi(sub { $www->call(@_) }, sub { - my ($cb) = @_; - my $res; - $res = $cb->(GET('/test/Z%40B/')); - my @href = ($res->content =~ /^href="([^"]+)"/gms); - @href = grep(/\A[\d\.]+-/, @href); - is_deeply([qw(1-queue-pee 2-bayce-sixty-four 3-noop.txt - 4-a.txt)], - \@href, 'attachment links generated'); + $res = $cb->(GET('/test/Z%40B/3-noop.txt')); + my $txt_res = $res->content; + ok(length($txt_res) >= length($txt), + 'plain text almost matches'); + like($txt_res, qr/\n\z/s, 'trailing newline exists in text'); + is(index($txt_res, $txt), 0, 'plain text not truncated'); - $res = $cb->(GET('/test/Z%40B/1-queue-pee')); - my $qp_res = $res->content; - ok(length($qp_res) >= length($qp), 'QP length is close'); - like($qp_res, qr/\n\z/s, 'trailing newline exists'); - # is(index($qp_res, $qp), 0, 'QP trailing newline is there'); - $qp_res =~ s/\r\n/\n/g; - is(index($qp_res, $qp), 0, 'QP trailing newline is there'); + $res = $cb->(GET('/test/Z%40B/4-a.txt')); + my $dot_res = $res->content; + ok(length($dot_res) >= length($dot), 'dot almost matches'); + $res = $cb->(GET('/test/Z%40B/4-any-filename.txt')); + is($res->content, $dot_res, 'user-specified filename is OK'); - $res = $cb->(GET('/test/Z%40B/2-base-sixty-four')); - is(quotemeta($res->content), quotemeta($b64), - 'Base64 matches exactly'); + my $mid = '20200418222508.GA13918@dcvr'; + my $irt = '20200418222020.GA2745@dcvr'; + $res = $cb->(GET("/test/$mid/")); + unlike($res->content, qr! multipart/mixed, Size: 0 bytes!, + '0-byte download not offered'); + like($res->content, qr/\bhref="2-embed2x\.eml"/s, + 'href to message/rfc822 attachment visible'); + like($res->content, qr/\bhref="2\.1\.2-test\.eml"/s, + 'href to nested message/rfc822 attachment visible'); - $res = $cb->(GET('/test/Z%40B/3-noop.txt')); - my $txt_res = $res->content; - ok(length($txt_res) >= length($txt), - 'plain text almost matches'); - like($txt_res, qr/\n\z/s, 'trailing newline exists in text'); - is(index($txt_res, $txt), 0, 'plain text not truncated'); + $res = $cb->(GET("/test/$mid/2-embed2x.eml")); + my $eml = PublicInbox::Eml->new(\($res->content)); + is_deeply([ $eml->header_raw('Message-ID') ], [ "<$irt>" ], + 'got attached eml'); + my @subs = $eml->subparts; + is(scalar(@subs), 2, 'attachment had 2 subparts'); + like($subs[0]->body_str, qr/^testing embedded message\n*\z/sm, + '1st attachment is as expected'); + is($subs[1]->header('Content-Type'), 'message/rfc822', + '2nd attachment is as expected'); - $res = $cb->(GET('/test/Z%40B/4-a.txt')); - my $dot_res = $res->content; - ok(length($dot_res) >= length($dot), 'dot almost matches'); - $res = $cb->(GET('/test/Z%40B/4-any-filename.txt')); - is($res->content, $dot_res, 'user-specified filename is OK'); + $res = $cb->(GET("/test/$mid/2.1.2-test.eml")); + $eml = PublicInbox::Eml->new(\($res->content)); + is_deeply([ $eml->header_raw('Message-ID') ], + [ '<20200418214114.7575-1-e@yhbt.net>' ], + 'nested eml retrieved'); +}; - my $mid = '20200418222508.GA13918@dcvr'; - my $irt = '20200418222020.GA2745@dcvr'; - $res = $cb->(GET("/test/$mid/")); - unlike($res->content, qr! multipart/mixed, Size: 0 bytes!, - '0-byte download not offered'); - like($res->content, qr/\bhref="2-embed2x\.eml"/s, - 'href to message/rfc822 attachment visible'); - like($res->content, qr/\bhref="2\.1\.2-test\.eml"/s, - 'href to nested message/rfc822 attachment visible'); +test_psgi(sub { $www->call(@_) }, $client); +SKIP: { + diag 'testing with index indexed'; + require_mods('DBD::SQLite', 19); + my $env = { PI_CONFIG => $cfgpath }; + ok(run_script(['-index', $inboxdir], $env), 'indexed'); - $res = $cb->(GET("/test/$mid/2-embed2x.eml")); - my $eml = PublicInbox::Eml->new(\($res->content)); - is_deeply([ $eml->header_raw('Message-ID') ], [ "<$irt>" ], - 'got attached eml'); - my @subs = $eml->subparts; - is(scalar(@subs), 2, 'attachment had 2 subparts'); - like($subs[0]->body_str, qr/^testing embedded message\n*\z/sm, - '1st attachment is as expected'); - is($subs[1]->header('Content-Type'), 'message/rfc822', - '2nd attachment is as expected'); + test_psgi(sub { $www->call(@_) }, $client); - $res = $cb->(GET("/test/$mid/2.1.2-test.eml")); - $eml = PublicInbox::Eml->new(\($res->content)); - is_deeply([ $eml->header_raw('Message-ID') ], - [ '<20200418214114.7575-1-e@yhbt.net>' ], - 'nested eml retrieved'); - }); + require_mods(qw(Plack::Test::ExternalServer), 18); + my $sock = tcp_server() or die; + my ($out, $err) = map { "$inboxdir/std$_.log" } qw(out err); + my $cmd = [ qw(-httpd -W0), "--stdout=$out", "--stderr=$err" ]; + my $td = start_script($cmd, $env, { 3 => $sock }); + my ($h, $p) = ($sock->sockhost, $sock->sockport); + local $ENV{PLACK_TEST_EXTERNALSERVER_URI} = "http://$h:$p"; + Plack::Test::ExternalServer::test_psgi(client => $client); } done_testing(); |