update copyrights for 2021

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

diff --git a/t/edit.t b/t/edit.t
index 89283291d839e6debcf65964d0e703792b0c13ff..0d57e6298d0521060c4f8ac3565959513ce3242e 100644 (file)
--- a/t/edit.t
+++ b/t/edit.t
@@ -1,4 +1,4 @@
-# Copyright (C) 2019 all contributors <meta@public-inbox.org>
+# Copyright (C) 2019-2021 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 # edit frontend behavior test (t/replace.t for backend)
 use strict;
@@ -24,11 +24,9 @@ my $ibx = PublicInbox::Inbox->new({
 $ibx = PublicInbox::InboxWritable->new($ibx, {nproc=>1});
 my $cfgfile = "$tmpdir/config";
 local $ENV{PI_CONFIG} = $cfgfile;
-my $file = 't/data/0001.patch';
-open my $fh, '<', $file or die "open: $!";
-my $raw = do { local $/; <$fh> };
 my $im = $ibx->importer(0);
-my $mime = PublicInbox::MIME->new($raw);
+my $file = 't/data/0001.patch';
+my $mime = eml_load($file);
 my $mid = mid_clean($mime->header('Message-Id'));
 ok($im->add($mime), 'add message to be edited');
 $im->done;
@@ -41,9 +39,9 @@ $t = '-F FILE'; {
        local $ENV{MAIL_EDITOR} = "$^X -i -p -e 's/boolean prefix/bool pfx/'";
        $cmd = [ '-edit', "-F$file", $inboxdir ];
        ok(run_script($cmd, undef, $opt), "$t edit OK");
-       $cur = PublicInbox::MIME->new($ibx->msg_by_mid($mid));
+       $cur = PublicInbox::Eml->new($ibx->msg_by_mid($mid));
        like($cur->header('Subject'), qr/bool pfx/, "$t message edited");
-       like($out, qr/[a-f0-9]{40}/, "$t shows commit on success");
+       like($out, qr/[a-f0-9]{40,}/, "$t shows commit on success");
 }
 
 $t = '-m MESSAGE_ID'; {
@@ -51,9 +49,9 @@ $t = '-m MESSAGE_ID'; {
        local $ENV{MAIL_EDITOR} = "$^X -i -p -e 's/bool pfx/boolean prefix/'";
        $cmd = [ '-edit', "-m$mid", $inboxdir ];
        ok(run_script($cmd, undef, $opt), "$t edit OK");
-       $cur = PublicInbox::MIME->new($ibx->msg_by_mid($mid));
+       $cur = PublicInbox::Eml->new($ibx->msg_by_mid($mid));
        like($cur->header('Subject'), qr/boolean prefix/, "$t message edited");
-       like($out, qr/[a-f0-9]{40}/, "$t shows commit on success");
+       like($out, qr/[a-f0-9]{40,}/, "$t shows commit on success");
 }
 
 $t = 'no-op -m MESSAGE_ID'; {
@@ -63,7 +61,7 @@ $t = 'no-op -m MESSAGE_ID'; {
        $cmd = [ '-edit', "-m$mid", $inboxdir ];
        ok(run_script($cmd, undef, $opt), "$t succeeds");
        my $prev = $cur;
-       $cur = PublicInbox::MIME->new($ibx->msg_by_mid($mid));
+       $cur = PublicInbox::Eml->new($ibx->msg_by_mid($mid));
        is_deeply($cur, $prev, "$t makes no change");
        like($cur->header('Subject'), qr/boolean prefix/,
                "$t does not change message");
@@ -79,7 +77,7 @@ $t = 'no-op -m MESSAGE_ID w/Status: header'; { # because mutt does it
        $cmd = [ '-edit', "-m$mid", $inboxdir ];
        ok(run_script($cmd, undef, $opt), "$t succeeds");
        my $prev = $cur;
-       $cur = PublicInbox::MIME->new($ibx->msg_by_mid($mid));
+       $cur = PublicInbox::Eml->new($ibx->msg_by_mid($mid));
        is_deeply($cur, $prev, "$t makes no change");
        like($cur->header('Subject'), qr/boolean prefix/,
                "$t does not change message");
@@ -94,7 +92,7 @@ $t = '-m MESSAGE_ID can change Received: headers'; {
        local $ENV{MAIL_EDITOR} = "$^X -i -p -e 's/^Subject:.*/Received: x\\n\$&/'";
        $cmd = [ '-edit', "-m$mid", $inboxdir ];
        ok(run_script($cmd, undef, $opt), "$t succeeds");
-       $cur = PublicInbox::MIME->new($ibx->msg_by_mid($mid));
+       $cur = PublicInbox::Eml->new($ibx->msg_by_mid($mid));
        like($cur->header('Subject'), qr/boolean prefix/,
                "$t does not change Subject");
        is($cur->header('Received'), 'x', 'added Received header');
@@ -118,7 +116,7 @@ $t = 'non-interactive editor failure'; {
 
 $t = 'mailEditor set in config'; {
        $in = $out = $err = '';
-       my $rc = system(qw(git config), "--file=$cfgfile",
+       my $rc = xsys(qw(git config), "--file=$cfgfile",
                        'publicinbox.maileditor',
                        "$^X -i -p -e 's/boolean prefix/bool pfx/'");
        is($rc, 0, 'set publicinbox.mailEditor');
@@ -127,7 +125,7 @@ $t = 'mailEditor set in config'; {
        local $ENV{GIT_EDITOR} = 'echo should not run';
        $cmd = [ '-edit', "-m$mid", $inboxdir ];
        ok(run_script($cmd, undef, $opt), "$t edited message");
-       $cur = PublicInbox::MIME->new($ibx->msg_by_mid($mid));
+       $cur = PublicInbox::Eml->new($ibx->msg_by_mid($mid));
        like($cur->header('Subject'), qr/bool pfx/, "$t message edited");
        unlike($out, qr/should not run/, 'did not run GIT_EDITOR');
 }
@@ -137,20 +135,20 @@ $t = '--raw and mbox escaping'; {
        local $ENV{MAIL_EDITOR} = "$^X -i -p -e 's/^\$/\\nFrom not mbox\\n/'";
        $cmd = [ '-edit', "-m$mid", '--raw', $inboxdir ];
        ok(run_script($cmd, undef, $opt), "$t succeeds");
-       $cur = PublicInbox::MIME->new($ibx->msg_by_mid($mid));
+       $cur = PublicInbox::Eml->new($ibx->msg_by_mid($mid));
        like($cur->body, qr/^From not mbox/sm, 'put "From " line into body');
 
        local $ENV{MAIL_EDITOR} = "$^X -i -p -e 's/^>From not/\$& an/'";
        $cmd = [ '-edit', "-m$mid", $inboxdir ];
        ok(run_script($cmd, undef, $opt), "$t succeeds with mbox escaping");
-       $cur = PublicInbox::MIME->new($ibx->msg_by_mid($mid));
+       $cur = PublicInbox::Eml->new($ibx->msg_by_mid($mid));
        like($cur->body, qr/^From not an mbox/sm,
                'changed "From " line unescaped');
 
        local $ENV{MAIL_EDITOR} = "$^X -i -p -e 's/^From not an mbox\\n//s'";
        $cmd = [ '-edit', "-m$mid", '--raw', $inboxdir ];
        ok(run_script($cmd, undef, $opt), "$t succeeds again");
-       $cur = PublicInbox::MIME->new($ibx->msg_by_mid($mid));
+       $cur = PublicInbox::Eml->new($ibx->msg_by_mid($mid));
        unlike($cur->body, qr/^From not an mbox/sm, "$t restored body");
 }