lei: help: show actual paths being operated on

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

diff --git a/t/lei.t b/t/lei.t
index 7ecadf7dcdba4dd7f353798fd45b122b54906b41..bdf6cc1c73731f784f877474250ce10041901cde 100644 (file)
--- a/t/lei.t
+++ b/t/lei.t
@@ -9,21 +9,28 @@ use PublicInbox::Config;
 use File::Path qw(rmtree);
 require_mods(qw(json DBD::SQLite Search::Xapian));
 my $LEI = 'lei';
+my $opt = { 1 => \(my $out = ''), 2 => \(my $err = '') };
 my $lei = sub {
        my ($cmd, $env, $opt) = @_;
+       $out = $err = '';
+       if (!ref($cmd)) {
+               ($env, $opt) = grep { (!defined) || ref } @_;
+               $cmd = [ grep { defined } @_ ];
+       }
        run_script([$LEI, @$cmd], $env, $opt);
 };
 
 my ($home, $for_destroy) = tmpdir();
-my $opt = { 1 => \(my $out = ''), 2 => \(my $err = '') };
 delete local $ENV{XDG_DATA_HOME};
 delete local $ENV{XDG_CONFIG_HOME};
 local $ENV{XDG_RUNTIME_DIR} = "$home/xdg_run";
 local $ENV{HOME} = $home;
 local $ENV{FOO} = 'BAR';
 mkdir "$home/xdg_run", 0700 or BAIL_OUT "mkdir: $!";
+my $home_trash = [ "$home/.local", "$home/.config" ];
+my $cleanup = sub { rmtree([@$home_trash, @_]) };
 
-my $test_lei_common = sub {
+my $test_help = sub {
        ok(!$lei->([], undef, $opt), 'no args fails');
        is($? >> 8, 1, '$? is 1');
        is($out, '', 'nothing in stdout');
@@ -43,17 +50,32 @@ my $test_lei_common = sub {
                isnt($err, '', 'something in stderr');
                is($out, '', 'nothing in stdout');
        }
+       ok($lei->(qw(init -h), undef, $opt), 'init -h');
+       like($out, qr! \Q$home\E/\.local/share/lei/store\b!,
+               'actual path shown in init -h');
+       ok($lei->(qw(init -h), { XDG_DATA_HOME => '/XDH' }, $opt),
+               'init with XDG_DATA_HOME');
+       like($out, qr! /XDH/lei/store\b!, 'XDG_DATA_HOME in init -h');
+       is($err, '', 'no errors from init -h');
+
+       ok($lei->(qw(config -h), undef, $opt), 'config-h');
+       like($out, qr! \Q$home\E/\.config/lei/config\b!,
+               'actual path shown in config -h');
+       ok($lei->(qw(config -h), { XDG_CONFIG_HOME => '/XDC' }, $opt),
+               'config with XDG_CONFIG_HOME');
+       like($out, qr! /XDC/lei/config\b!, 'XDG_CONFIG_HOME in config -h');
+       is($err, '', 'no errors from config -h');
+};
 
-       # init tests
-       $out = $err = '';
-       my $ok_err_info = sub {
-               my ($msg) = @_;
-               is(grep(!/^I:/, split(/^/, $err)), 0, $msg) or
-                       diag "$msg: err=$err";
-               $err = '';
-       };
-       my $home_trash = [ "$home/.local", "$home/.config" ];
-       rmtree($home_trash);
+my $ok_err_info = sub {
+       my ($msg) = @_;
+       is(grep(!/^I:/, split(/^/, $err)), 0, $msg) or
+               diag "$msg: err=$err";
+       $err = '';
+};
+
+my $test_init = sub {
+       $cleanup->();
        ok($lei->(['init'], undef, $opt), 'init w/o args');
        $ok_err_info->('after init w/o args');
        ok($lei->(['init'], undef, $opt), 'idempotent init w/o args');
@@ -63,17 +85,15 @@ my $test_lei_common = sub {
                'init conflict');
        is(grep(/^E:/, split(/^/, $err)), 1, 'got error on conflict');
        ok(!-e "$home/x", 'nothing created on conflict');
-       rmtree($home_trash);
+       $cleanup->();
 
-       $err = '';
        ok($lei->(['init', "$home/x"], undef, $opt), 'init conflict resolved');
        $ok_err_info->('init w/ arg');
        ok($lei->(['init', "$home/x"], undef, $opt), 'init idempotent w/ path');
        $ok_err_info->('init idempotent w/ arg');
        ok(-d "$home/x", 'created dir');
-       rmtree([ "$home/x", @$home_trash ]);
+       $cleanup->("$home/x");
 
-       $err = '';
        ok(!$lei->(['init', "$home/x", "$home/2" ], undef, $opt),
                'too many args fails');
        like($err, qr/too many/, 'noted excessive');
@@ -82,7 +102,26 @@ my $test_lei_common = sub {
                my $base = (split(m!/!, $d))[-1];
                ok(!-d $d, "$base not created");
        }
-       is($out, '', 'nothing in stdout');
+       is($out, '', 'nothing in stdout on init failure');
+};
+
+my $test_config = sub {
+       $cleanup->();
+       ok($lei->([qw(config a.b c)], undef, $opt), 'config set var');
+       is($out.$err, '', 'no output on var set');
+       ok($lei->([qw(config -l)], undef, $opt), 'config -l');
+       is($err, '', 'no errors on listing');
+       is($out, "a.b=c\n", 'got expected output');
+       ok(!$lei->([qw(config -f), "$home/.config/f", qw(x.y z)], undef, $opt),
+                       'config set var with -f fails');
+       like($err, qr/not supported/, 'not supported noted');
+       ok(!-f "$home/config/f", 'no file created');
+};
+
+my $test_lei_common = sub {
+       $test_help->();
+       $test_config->();
+       $test_init->();
 };
 
 my $test_lei_oneshot = $ENV{TEST_LEI_ONESHOT};