config: support "inboxdir" in addition to "mainrepo"

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

diff --git a/t/edit.t b/t/edit.t
index 6b4e35c3a7751a9575a38f1aa3dacd6fd77cb07b..1e9597f1f98b8ae6d46785c04b3c1a30f2768579 100644 (file)
--- a/t/edit.t
+++ b/t/edit.t
@@ -21,9 +21,9 @@ IPC::Run->import(qw(run));
 
 my $cmd_pfx = 'blib/script/public-inbox';
 my $tmpdir = tempdir('pi-edit-XXXXXX', TMPDIR => 1, CLEANUP => 1);
-my $mainrepo = "$tmpdir/v2";
+my $inboxdir = "$tmpdir/v2";
 my $ibx = PublicInbox::Inbox->new({
-       mainrepo => $mainrepo,
+       inboxdir => $inboxdir,
        name => 'test-v2edit',
        version => 2,
        -primary_address => 'test@example.com',
@@ -41,12 +41,12 @@ 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_dir = "--git-dir=$ibx->{mainrepo}/git/0.git";
+my $__git_dir = "--git-dir=$ibx->{inboxdir}/git/0.git";
 
 $t = '-F FILE'; {
        $in = $out = $err = '';
        local $ENV{MAIL_EDITOR} = "$^X -i -p -e 's/boolean prefix/bool pfx/'";
-       $cmd = [ "$cmd_pfx-edit", "-F$file", $mainrepo ];
+       $cmd = [ "$cmd_pfx-edit", "-F$file", $inboxdir ];
        ok(run($cmd, \$in, \$out, \$err), "$t edit OK");
        $cur = PublicInbox::MIME->new($ibx->msg_by_mid($mid));
        like($cur->header('Subject'), qr/bool pfx/, "$t message edited");
@@ -56,7 +56,7 @@ $t = '-F FILE'; {
 $t = '-m MESSAGE_ID'; {
        $in = $out = $err = '';
        local $ENV{MAIL_EDITOR} = "$^X -i -p -e 's/bool pfx/boolean prefix/'";
-       $cmd = [ "$cmd_pfx-edit", "-m$mid", $mainrepo ];
+       $cmd = [ "$cmd_pfx-edit", "-m$mid", $inboxdir ];
        ok(run($cmd, \$in, \$out, \$err), "$t edit OK");
        $cur = PublicInbox::MIME->new($ibx->msg_by_mid($mid));
        like($cur->header('Subject'), qr/boolean prefix/, "$t message edited");
@@ -67,7 +67,7 @@ $t = 'no-op -m MESSAGE_ID'; {
        $in = $out = $err = '';
        my $before = `git $__git_dir rev-parse HEAD`;
        local $ENV{MAIL_EDITOR} = "$^X -i -p -e 's/bool pfx/boolean prefix/'";
-       $cmd = [ "$cmd_pfx-edit", "-m$mid", $mainrepo ];
+       $cmd = [ "$cmd_pfx-edit", "-m$mid", $inboxdir ];
        ok(run($cmd, \$in, \$out, \$err), "$t succeeds");
        my $prev = $cur;
        $cur = PublicInbox::MIME->new($ibx->msg_by_mid($mid));
@@ -84,7 +84,7 @@ $t = 'no-op -m MESSAGE_ID w/Status: header'; { # because mutt does it
        my $before = `git $__git_dir rev-parse HEAD`;
        local $ENV{MAIL_EDITOR} =
                        "$^X -i -p -e 's/^Subject:.*/Status: RO\\n\$&/'";
-       $cmd = [ "$cmd_pfx-edit", "-m$mid", $mainrepo ];
+       $cmd = [ "$cmd_pfx-edit", "-m$mid", $inboxdir ];
        ok(run($cmd, \$in, \$out, \$err), "$t succeeds");
        my $prev = $cur;
        $cur = PublicInbox::MIME->new($ibx->msg_by_mid($mid));
@@ -102,7 +102,7 @@ $t = '-m MESSAGE_ID can change Received: headers'; {
        my $before = `git $__git_dir rev-parse HEAD`;
        local $ENV{MAIL_EDITOR} =
                        "$^X -i -p -e 's/^Subject:.*/Received: x\\n\$&/'";
-       $cmd = [ "$cmd_pfx-edit", "-m$mid", $mainrepo ];
+       $cmd = [ "$cmd_pfx-edit", "-m$mid", $inboxdir ];
        ok(run($cmd, \$in, \$out, \$err), "$t succeeds");
        $cur = PublicInbox::MIME->new($ibx->msg_by_mid($mid));
        like($cur->header('Subject'), qr/boolean prefix/,
@@ -113,7 +113,7 @@ $t = '-m MESSAGE_ID can change Received: headers'; {
 $t = '-m miss'; {
        $in = $out = $err = '';
        local $ENV{MAIL_EDITOR} = "$^X -i -p -e 's/boolean/FAIL/'";
-       $cmd = [ "$cmd_pfx-edit", "-m$mid-miss", $mainrepo ];
+       $cmd = [ "$cmd_pfx-edit", "-m$mid-miss", $inboxdir ];
        ok(!run($cmd, \$in, \$out, \$err), "$t fails on invalid MID");
        like($err, qr/No message found/, "$t shows error");
 }
@@ -121,7 +121,7 @@ $t = '-m miss'; {
 $t = 'non-interactive editor failure'; {
        $in = $out = $err = '';
        local $ENV{MAIL_EDITOR} = "$^X -i -p -e 'END { exit 1 }'";
-       $cmd = [ "$cmd_pfx-edit", "-m$mid", $mainrepo ];
+       $cmd = [ "$cmd_pfx-edit", "-m$mid", $inboxdir ];
        ok(!run($cmd, \$in, \$out, \$err), "$t detected");
        like($err, qr/END \{ exit 1 \}' failed:/, "$t shows error");
 }
@@ -134,7 +134,7 @@ $t = 'mailEditor set in config'; {
        is($rc, 0, 'set publicinbox.mailEditor');
        local $ENV{MAIL_EDITOR};
        local $ENV{GIT_EDITOR} = 'echo should not run';
-       $cmd = [ "$cmd_pfx-edit", "-m$mid", $mainrepo ];
+       $cmd = [ "$cmd_pfx-edit", "-m$mid", $inboxdir ];
        ok(run($cmd, \$in, \$out, \$err), "$t edited message");
        $cur = PublicInbox::MIME->new($ibx->msg_by_mid($mid));
        like($cur->header('Subject'), qr/bool pfx/, "$t message edited");
@@ -144,20 +144,20 @@ $t = 'mailEditor set in config'; {
 $t = '--raw and mbox escaping'; {
        $in = $out = $err = '';
        local $ENV{MAIL_EDITOR} = "$^X -i -p -e 's/^\$/\\nFrom not mbox\\n/'";
-       $cmd = [ "$cmd_pfx-edit", "-m$mid", '--raw', $mainrepo ];
+       $cmd = [ "$cmd_pfx-edit", "-m$mid", '--raw', $inboxdir ];
        ok(run($cmd, \$in, \$out, \$err), "$t succeeds");
        $cur = PublicInbox::MIME->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 = [ "$cmd_pfx-edit", "-m$mid", $mainrepo ];
+       $cmd = [ "$cmd_pfx-edit", "-m$mid", $inboxdir ];
        ok(run($cmd, \$in, \$out, \$err), "$t succeeds with mbox escaping");
        $cur = PublicInbox::MIME->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 = [ "$cmd_pfx-edit", "-m$mid", '--raw', $mainrepo ];
+       $cmd = [ "$cmd_pfx-edit", "-m$mid", '--raw', $inboxdir ];
        ok(run($cmd, \$in, \$out, \$err), "$t succeeds again");
        $cur = PublicInbox::MIME->new($ibx->msg_by_mid($mid));
        unlike($cur->body, qr/^From not an mbox/sm, "$t restored body");
@@ -174,7 +174,7 @@ $t = 'reuse Message-ID'; {
 $t = 'edit ambiguous Message-ID with -m'; {
        $in = $out = $err = '';
        local $ENV{MAIL_EDITOR} = "$^X -i -p -e 's/bool pfx/boolean prefix/'";
-       $cmd = [ "$cmd_pfx-edit", "-m$mid", $mainrepo ];
+       $cmd = [ "$cmd_pfx-edit", "-m$mid", $inboxdir ];
        ok(!run($cmd, \$in, \$out, \$err), "$t fails w/o --force");
        like($err, qr/Multiple messages with different content found matching/,
                "$t shows matches");
@@ -184,7 +184,7 @@ $t = 'edit ambiguous Message-ID with -m'; {
 $t .= ' and --force'; {
        $in = $out = $err = '';
        local $ENV{MAIL_EDITOR} = "$^X -i -p -e 's/^Subject:.*/Subject:x/i'";
-       $cmd = [ "$cmd_pfx-edit", "-m$mid", '--force', $mainrepo ];
+       $cmd = [ "$cmd_pfx-edit", "-m$mid", '--force', $inboxdir ];
        ok(run($cmd, \$in, \$out, \$err), "$t succeeds");
        like($err, qr/Will edit all of them/, "$t notes all will be edited");
        my @dump = `git $__git_dir cat-file --batch --batch-all-objects`;