X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fpsgi_attach.t;h=af0fbdd397727db319759e3906825906dc4577e7;hb=e39585ee2bdcbeaab7b6bd33b3568021042d0879;hp=43018e85d1ce6bf3fec6d41cfebc356aec822650;hpb=e197631142c0236e59460310aaecb38ccacfad2e;p=public-inbox.git
diff --git a/t/psgi_attach.t b/t/psgi_attach.t
index 43018e85..af0fbdd3 100644
--- a/t/psgi_attach.t
+++ b/t/psgi_attach.t
@@ -1,72 +1,35 @@
-# Copyright (C) 2016 all contributors
+# Copyright (C) 2016-2020 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,
-});
-is(0, system(qw(git init -q --bare), $maindir), "git init (main)");
+my $config = PublicInbox::Config->new(\<new($maindir);
my $im = PublicInbox::Import->new($git, 'test', $addr);
+$im->init_bare;
{
- open my $fh, '<', '/dev/urandom' or die "unable to open urandom: $!\n";
- sysread($fh, my $buf, 8);
- is(8, length($buf), 'read some random data');
my $qp = "abcdef=g\n==blah\n";
- my $b64 = 'b64'.$buf."\n";
+ my $b64 = "b64\xde\xad\xbe\xef\n";
my $txt = "plain\ntext\npass\nthrough\n";
- my $parts = [
- Email::MIME->create(
- attributes => {
- filename => 'queue-pee',
- content_type => 'text/plain',
- encoding => 'quoted-printable'
- },
- body => $qp),
- Email::MIME->create(
- attributes => {
- filename => 'bayce-sixty-four',
- content_type => 'appication/octet-stream',
- encoding => 'base64',
- },
- body => $b64),
- Email::MIME->create(
- attributes => {
- filename => 'noop.txt',
- content_type => 'text/plain',
- },
- body => $txt),
- ];
- my $mime = Email::MIME->create(
- parts => $parts,
- header_str => [ From => 'root@z', 'Message-Id' => '',
- Subject => 'hi']
- );
- $mime = $mime->as_string;
- $mime =~ s/\r\n/\n/g; # normalize to LF only
- $mime = Email::MIME->new($mime);
- $im->add($mime);
+ my $dot = "dotfile\n";
+ $im->add(mime_load('t/psgi_attach.eml'));
$im->done;
my $www = PublicInbox::WWW->new($config);
@@ -76,7 +39,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 +61,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();