config: simplify lookup* methods

[public-inbox.git] / t / psgi_attach.t

diff --git a/t/psgi_attach.t b/t/psgi_attach.t
index 535cd21d45998eeb7d8079fb9c4a7966c0bd4eba..f5140f44c308371e4971439833fa6919d8f4f49c 100644 (file)
--- a/t/psgi_attach.t
+++ b/t/psgi_attach.t
@@ -1,4 +1,4 @@
-# Copyright (C) 2016 all contributors <meta@public-inbox.org>
+# Copyright (C) 2016-2019 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 use strict;
 use warnings;
@@ -9,7 +9,7 @@ my $tmpdir = tempdir('psgi-attach-XXXXXX', TMPDIR => 1, CLEANUP => 1);
 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);
+my @mods = qw(HTTP::Request::Common Plack::Test URI::Escape);
 foreach my $mod (@mods) {
        eval "require $mod";
        plan skip_all => "$mod missing for plack.t" if $@;
@@ -21,10 +21,10 @@ 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(\<<EOF);
+$cfgpfx.address=$addr
+$cfgpfx.mainrepo=$maindir
+EOF
 is(0, system(qw(git init -q --bare), $maindir), "git init (main)");
 my $git = PublicInbox::Git->new($maindir);
 my $im = PublicInbox::Import->new($git, 'test', $addr);
@@ -36,6 +36,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 => {
@@ -53,10 +54,16 @@ my $im = PublicInbox::Import->new($git, 'test', $addr);
                        body => $b64),
                Email::MIME->create(
                        attributes => {
-                               filename => 'noop',
+                               filename => 'noop.txt',
                                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,
@@ -73,8 +80,14 @@ my $im = PublicInbox::Import->new($git, 'test', $addr);
        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/1-a.txt'));
+               $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');
@@ -82,15 +95,23 @@ my $im = PublicInbox::Import->new($git, 'test', $addr);
                $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-a.txt'));
+               $res = $cb->(GET('/test/Z%40B/2-base-sixty-four'));
                is(quotemeta($res->content), quotemeta($b64),
                        'Base64 matches exactly');
 
-               $res = $cb->(GET('/test/Z%40B/3-a.txt'));
+               $res = $cb->(GET('/test/Z%40B/3-noop.txt'));
                my $txt_res = $res->content;
-               ok(length($txt_res) >= length($txt), 'plain text almost matches');
+               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/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();