X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fpsgi_attach.t;h=1ef5318cd4799aab1a5469b7884572acaa4faae4;hb=62f28026e624ed30d620063a0fa92cbedb7f6673;hp=43018e85d1ce6bf3fec6d41cfebc356aec822650;hpb=e197631142c0236e59460310aaecb38ccacfad2e;p=public-inbox.git diff --git a/t/psgi_attach.t b/t/psgi_attach.t index 43018e85..1ef5318c 100644 --- a/t/psgi_attach.t +++ b/t/psgi_attach.t @@ -1,30 +1,26 @@ -# Copyright (C) 2016 all contributors +# Copyright (C) 2016-2019 all contributors # License: AGPL-3.0+ use strict; use warnings; use Test::More; use Email::MIME; -use File::Temp qw/tempdir/; -my $tmpdir = tempdir('psgi-attach-XXXXXX', TMPDIR => 1, CLEANUP => 1); +use PublicInbox::TestCommon; +my ($tmpdir, $for_destroy) = tmpdir(); my $maindir = "$tmpdir/main.git"; my $addr = 'test-public@example.com'; my $cfgpfx = "publicinbox.test"; -my @mods = qw(HTTP::Request::Common Plack::Request Plack::Test URI::Escape); -foreach my $mod (@mods) { - eval "require $mod"; - plan skip_all => "$mod missing for plack.t" if $@; -} +my @mods = qw(HTTP::Request::Common Plack::Builder Plack::Test URI::Escape); +require_mods(@mods); use_ok $_ foreach @mods; +use_ok 'PublicInbox::WWW'; use PublicInbox::Import; use PublicInbox::Git; use PublicInbox::Config; -use PublicInbox::WWW; use_ok 'PublicInbox::WwwAttach'; -use Plack::Builder; -my $config = PublicInbox::Config->new({ - "$cfgpfx.address" => $addr, - "$cfgpfx.mainrepo" => $maindir, -}); +my $config = PublicInbox::Config->new(\<new($maindir); my $im = PublicInbox::Import->new($git, 'test', $addr); @@ -36,6 +32,7 @@ my $im = PublicInbox::Import->new($git, 'test', $addr); my $qp = "abcdef=g\n==blah\n"; my $b64 = 'b64'.$buf."\n"; my $txt = "plain\ntext\npass\nthrough\n"; + my $dot = "dotfile\n"; my $parts = [ Email::MIME->create( attributes => { @@ -57,6 +54,12 @@ my $im = PublicInbox::Import->new($git, 'test', $addr); content_type => 'text/plain', }, body => $txt), + Email::MIME->create( + attributes => { + filename => '.dotfile', + content_type => 'text/plain', + }, + body => $dot), ]; my $mime = Email::MIME->create( parts => $parts, @@ -76,7 +79,8 @@ my $im = PublicInbox::Import->new($git, 'test', $addr); $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)], + 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')); @@ -97,6 +101,12 @@ my $im = PublicInbox::Import->new($git, 'test', $addr); '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/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'); }); } done_testing();