1 files changed, 13 insertions, 30 deletions

diff --git a/t/plack.t b/t/plack.t
index 1ae58731..c8dd7bfe 100644
--- a/t/plack.t
+++ b/t/plack.t
@@ -5,36 +5,24 @@ use warnings;
 use Test::More;
 use Email::MIME;
 use File::Temp qw/tempdir/;
-use Cwd;
-use IPC::Run qw/run/;
 my $psgi = "examples/public-inbox.psgi";
-my $mda = "blib/script/public-inbox-mda";
 my $tmpdir = tempdir('pi-plack-XXXXXX', TMPDIR => 1, CLEANUP => 1);
-my $home = "$tmpdir/pi-home";
-my $pi_home = "$home/.public-inbox";
-my $pi_config = "$pi_home/config";
+my $pi_config = "$tmpdir/config";
 my $maindir = "$tmpdir/main.git";
-my $main_bin = getcwd()."/t/main-bin";
-my $main_path = "$main_bin:$ENV{PATH}"; # for spamc ham mock
 my $addr = 'test-public@example.com';
 my $cfgpfx = "publicinbox.test";
-my $failbox = "$home/fail.mbox";
-local $ENV{PI_EMERGENCY} = $failbox;
 my @mods = qw(HTTP::Request::Common Plack::Request Plack::Test
         Mail::Thread URI::Escape);
 foreach my $mod (@mods) {
         eval "require $mod";
         plan skip_all => "$mod missing for plack.t" if $@;
 }
+use_ok 'PublicInbox::Import';
+use_ok 'PublicInbox::Git';
 
 foreach my $mod (@mods) { use_ok $mod; }
 {
         ok(-f $psgi, "psgi example file found");
-        ok(-x "$main_bin/spamc",
-                "spamc ham mock found (run in top of source tree");
-        ok(-x $mda, "$mda is executable");
-        is(1, mkdir($home, 0755), "setup ~/ for testing");
-        is(1, mkdir($pi_home, 0755), "setup ~/.public-inbox");
         is(0, system(qw(git init -q --bare), $maindir), "git init (main)");
         open my $fh, '>', "$maindir/description" or die "open: $!\n";
         print $fh "test for public-inbox\n";
@@ -48,12 +36,9 @@ foreach my $mod (@mods) { use_ok $mod; }
                         "setup $k");
         }
 
-        local $ENV{HOME} = $home;
-        local $ENV{ORIGINAL_RECIPIENT} = $addr;
-
         # ensure successful message delivery
         {
-                my $simple = Email::Simple->new(<<EOF);
+                my $mime = Email::MIME->new(<<EOF);
 From: Me <me\@example.com>
 To: You <you\@example.com>
 Cc: $addr
@@ -63,13 +48,17 @@ Date: Thu, 01 Jan 1970 00:00:00 +0000
 
 zzzzzz
 EOF
-                my $in = $simple->as_string;
-                run_with_env({PATH => $main_path}, [$mda], \$in);
-                local $ENV{GIT_DIR} = $maindir;
-                my $rev = `git rev-list HEAD`;
+                my $git = PublicInbox::Git->new($maindir);
+                my $im = PublicInbox::Import->new($git, 'test', $addr);
+                $im->add($mime);
+                $im->done;
+                my $rev = `git --git-dir="$maindir" rev-list HEAD`;
                 like($rev, qr/\A[a-f0-9]{40}/, "good revision committed");
         }
-        my $app = require $psgi;
+        my $app = eval {
+                local $ENV{PI_CONFIG} = $pi_config;
+                require $psgi;
+        };
 
         # redirect with trailing /
         test_psgi($app, sub {
@@ -190,9 +179,3 @@ EOF
 }
 
 done_testing();
-
-sub run_with_env {
-        my ($env, @args) = @_;
-        my $init = sub { foreach my $k (keys %$env) { $ENV{$k} = $env->{$k} } };
-        run(@args, init => $init);
-}