lei <q|up>: set \Recent on non-empty mbox and Maildir

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

diff --git a/t/lei-q-save.t b/t/lei-q-save.t
index 170f7ce5642067d2cc8e2c974b3120a1b28cda00..aed38a51e62e129c0a033a593d7ea96cee77a45d 100644 (file)
--- a/t/lei-q-save.t
+++ b/t/lei-q-save.t
@@ -23,25 +23,26 @@ test_lei(sub {
        my $home = $ENV{HOME};
        my $in = $doc1->as_string;
        lei_ok [qw(import -q -F eml -)], undef, { 0 => \$in, %$lei_opt };
-       lei_ok qw(q -q --save z:0.. d:last.week..), '-o', "$home/md/";
+       lei_ok qw(q -q --save z:0.. d:last.week..), '-o', "MAILDIR:$home/md/";
        my %before = map { $_ => 1 } glob("$home/md/cur/*");
        is_deeply(eml_load((keys %before)[0]), $doc1, 'doc1 matches');
+       lei_ok qw(ls-mail-sync);
+       is($lei_out, "maildir:$home/md\n", 'canonicalized mail sync name');
 
        my @s = glob("$home/.local/share/lei/saved-searches/md-*");
        is(scalar(@s), 1, 'got one saved search');
        my $cfg = PublicInbox::Config->new("$s[0]/lei.saved-search");
+       is($cfg->{'lei.q.output'}, "maildir:$home/md", 'canonicalized output');
        is_deeply($cfg->{'lei.q'}, ['z:0..', 'd:last.week..'],
                'store relative time, not parsed (absolute) timestamp');
 
        # ensure "lei up" works, since it compliments "lei q --save"
        $in = $doc2->as_string;
        lei_ok [qw(import -q -F eml -)], undef, { 0 => \$in, %$lei_opt };
-       opendir my $dh, '.' or xbail "opendir .: $!";
        lei_ok qw(up -q md -C), $home;
        lei_ok qw(up -q . -C), "$home/md";
        lei_ok qw(up -q), "/$home/md";
-       chdir($dh) or xbail "fchdir . $!";
-       my %after = map { $_ => 1 } glob("$home/md/cur/*");
+       my %after = map { $_ => 1 } glob("$home/md/{new,cur}/*");
        is(delete $after{(keys(%before))[0]}, 1, 'original message kept');
        is(scalar(keys %after), 1, 'one new message added');
        is_deeply(eml_load((keys %after)[0]), $doc2, 'doc2 matches');
@@ -68,14 +69,14 @@ test_lei(sub {
        lei_ok qw(ls-search); my @d = split(/\n/, $lei_out);
        lei_ok qw(ls-search -z); my @z = split(/\0/, $lei_out);
        is_deeply(\@d, \@z, '-z output matches non-z');
-       is_deeply(\@d, [ "$home/mbcl2", "$home/md/" ],
+       is_deeply(\@d, [ "$home/mbcl2", "$home/md" ],
                'ls-search output alphabetically sorted');
        lei_ok qw(ls-search -l);
        my $json = PublicInbox::Config->json->decode($lei_out);
        ok($json && $json->[0]->{output}, 'JSON has output');
        lei_ok qw(_complete lei up);
        like($lei_out, qr!^\Q$home/mbcl2\E$!sm, 'complete got mbcl2 output');
-       like($lei_out, qr!^\Q$home/md/\E$!sm, 'complete got maildir output');
+       like($lei_out, qr!^\Q$home/md\E$!sm, 'complete got maildir output');
 
        unlink("$home/mbcl2") or xbail "unlink $!";
        lei_ok qw(_complete lei up);
@@ -89,7 +90,6 @@ test_lei(sub {
        print $mb $pre_existing;
        close $mb or xbail "close: $!";
        lei_ok(qw(q --save -o mboxrd:mbrd m:qp@example.com -C), $home);
-       chdir($dh) or xbail "fchdir . $!";
        open $mb, '<', "$home/mbrd" or xbail "open $!";
        is_deeply([grep(/pre-existing/, <$mb>)], [],
                'pre-existing messsage gone w/o augment');
@@ -103,7 +103,6 @@ test_lei(sub {
        print $mb $pre_existing;
        close $mb or xbail "close: $!";
        lei_ok(qw(q -a --save -o mboxrd:mbrd-aug m:qp@example.com -C), $home);
-       chdir($dh) or xbail "fchdir . $!";
        open $mb, '<', "$home/mbrd-aug" or xbail "open $!";
        $mb = do { local $/; <$mb> };
        like($mb, qr/pre-existing/, 'pre-existing message preserved w/ -a');
@@ -156,7 +155,7 @@ test_lei(sub {
        $im->add(PublicInbox::Eml->new($diff));
        $im->done;
        lei_ok('up', $o);
-       @m = glob("$o/cur/*");
+       @m = glob("$o/{new,cur}/*");
        is(scalar(@m), 2, 'got 2nd result due to different OID');
 
        SKIP: {