X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fedit.t;h=e6e0f9cfe48b7b46ac79a68968e5bfaa047c48d4;hb=4eee5af6011cc8cdefb66c9729952c7eff5c0b0b;hp=09e0cdddf4cb7e0c8bd0c4b4c364008f2282dd92;hpb=6f23376be94dd81cb8f3046189811057519a0175;p=public-inbox.git diff --git a/t/edit.t b/t/edit.t index 09e0cddd..e6e0f9cf 100644 --- a/t/edit.t +++ b/t/edit.t @@ -1,43 +1,26 @@ -# Copyright (C) 2019 all contributors +#!perl -w +# Copyright (C) 2019-2021 all contributors # License: AGPL-3.0+ # edit frontend behavior test (t/replace.t for backend) use strict; -use warnings; -use Test::More; -use File::Temp qw/tempdir/; -require './t/common.perl'; -require_git(2.6); -require PublicInbox::Inbox; -require PublicInbox::InboxWritable; -require PublicInbox::Config; +use v5.10.1; +use PublicInbox::TestCommon; use PublicInbox::MID qw(mid_clean); +require_git(2.6); -my @mods = qw(DBI DBD::SQLite); -foreach my $mod (@mods) { - eval "require $mod"; - plan skip_all => "missing $mod for $0" if $@; -}; - -my $tmpdir = tempdir('pi-edit-XXXXXX', TMPDIR => 1, CLEANUP => 1); +require_mods('DBD::SQLite'); +my ($tmpdir, $for_destroy) = tmpdir(); my $inboxdir = "$tmpdir/v2"; -my $ibx = PublicInbox::Inbox->new({ - inboxdir => $inboxdir, - name => 'test-v2edit', - version => 2, - -primary_address => 'test@example.com', - indexlevel => 'basic', -}); -$ibx = PublicInbox::InboxWritable->new($ibx, {nproc=>1}); +my $file = 't/data/0001.patch'; +my $eml = eml_load($file); +my $mid = mid_clean($eml->header('Message-ID')); +my $ibx = create_inbox 'v2edit', indexlevel => 'basic', version => 2, + tmpdir => $inboxdir, sub { + my ($im, $ibx) = @_; + $im->add($eml) or BAIL_OUT; +}; 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 $mid = mid_clean($mime->header('Message-Id')); -ok($im->add($mime), 'add message to be edited'); -$im->done; my ($in, $out, $err, $cmd, $cur, $t); my $git = PublicInbox::Git->new("$ibx->{inboxdir}/git/0.git"); my $opt = { 0 => \$in, 1 => \$out, 2 => \$err }; @@ -47,9 +30,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'; { @@ -57,9 +40,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'; { @@ -69,7 +52,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"); @@ -85,7 +68,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"); @@ -100,7 +83,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'); @@ -124,17 +107,16 @@ $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'); local $ENV{MAIL_EDITOR}; delete $ENV{MAIL_EDITOR}; - delete local $ENV{MAIL_EDITOR}; 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'); } @@ -144,27 +126,28 @@ $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"); } $t = 'reuse Message-ID'; { my @warn; local $SIG{__WARN__} = sub { push @warn, @_ }; - ok($im->add($mime), "$t and re-add"); + my $im = $ibx->importer(0); + ok($im->add($eml), "$t and re-add"); $im->done; like($warn[0], qr/reused for mismatched content/, "$t got warning"); }