X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fpsgi_attach.t;h=af0fbdd397727db319759e3906825906dc4577e7;hb=e39585ee2bdcbeaab7b6bd33b3568021042d0879;hp=5a7129f91ba35bc38f7299c663a2e5c0d4f88300;hpb=3c313f9034aac96182e2efdc2f92c40803626f32;p=public-inbox.git

diff --git a/t/psgi_attach.t b/t/psgi_attach.t
index 5a7129f9..af0fbdd3 100644
--- a/t/psgi_attach.t
+++ b/t/psgi_attach.t
@@ -1,79 +1,35 @@
-# Copyright (C) 2016-2019 all contributors <meta@public-inbox.org>
+# Copyright (C) 2016-2020 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 use strict;
 use warnings;
 use Test::More;
-use Email::MIME;
 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::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(\<<EOF);
 $cfgpfx.address=$addr
 $cfgpfx.inboxdir=$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);
+$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 $dot = "dotfile\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),
-		Email::MIME->create(
-			attributes => {
-				filename => '.dotfile',
-				content_type => 'text/plain',
-			},
-			body => $dot),
-	];
-	my $mime = Email::MIME->create(
-		parts => $parts,
-		header_str => [ From => 'root@z', 'Message-Id' => '<Z@B>',
-			Subject => 'hi']
-	);
-	$mime = $mime->as_string;
-	$mime =~ s/\r\n/\n/g; # normalize to LF only
-	$mime = Email::MIME->new($mime);
-	$im->add($mime);
+	$im->add(mime_load('t/psgi_attach.eml'));
 	$im->done;
 
 	my $www = PublicInbox::WWW->new($config);
@@ -111,7 +67,6 @@ my $im = PublicInbox::Import->new($git, 'test', $addr);
 		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();