lei inspect: use LeiMailSync->match_imap_url

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

diff --git a/t/lei-import-imap.t b/t/lei-import-imap.t
index 3a1fff4c32162aecacddf427312e5d0baae96f63..d3935c828514c4895cc4f511419b10be88e7758b 100644 (file)
--- a/t/lei-import-imap.t
+++ b/t/lei-import-imap.t
@@ -22,10 +22,18 @@ test_lei({ tmpdir => $tmpdir }, sub {
        is_deeply(json_utf8->decode($lei_out), {}, 'no inspect stats, yet');
 
        lei_ok('import', $url);
+       lei_ok('inspect', $url);
+       my $res = json_utf8->decode($lei_out);
+       is(scalar keys %$res, 1, 'got one key in inspect URL');
+       my $re = qr!\Aimap://;AUTH=ANONYMOUS\@\Q$host_port\E
+                       /t\.v2\.0;UIDVALIDITY=\d+!x;
+       like((keys %$res)[0], qr/$re\z/, 'got expanded key');
+
        lei_ok 'ls-mail-sync';
-       like($lei_out, qr!\A\Q$url\E;UIDVALIDITY=\d+\n\z!, 'ls-mail-sync');
+       like($lei_out, qr!$re\n\z!, 'ls-mail-sync');
        chomp(my $u = $lei_out);
        lei_ok('import', $u, \'UIDVALIDITY match in URL');
+       $url = $u;
        $u =~ s/;UIDVALIDITY=(\d+)\s*/;UIDVALIDITY=9$1/s;
        ok(!lei('import', $u), 'UIDVALIDITY mismatch in URL rejected');
 
@@ -33,7 +41,7 @@ test_lei({ tmpdir => $tmpdir }, sub {
        my $inspect = json_utf8->decode($lei_out);
        my @k = keys %$inspect;
        is(scalar(@k), 1, 'one URL resolved');
-       like($k[0], qr!\A\Q$url\E;UIDVALIDITY=\d+\z!, 'inspect URL matches');
+       is($k[0], $url, 'inspect URL matches');
        my $stats = $inspect->{$k[0]};
        is_deeply([ sort keys %$stats ],
                [ qw(uid.count uid.max uid.min) ], 'keys match');
@@ -54,8 +62,9 @@ test_lei({ tmpdir => $tmpdir }, sub {
        lei_ok('inspect', "blob:$out->[5]->{blob}");
        my $x = json_utf8->decode($lei_out);
        is(ref($x->{'lei/store'}), 'ARRAY', 'lei/store in inspect');
-       is(ref($x->{sync}), 'HASH', 'sync in inspect');
-       is(ref($x->{sync}->{$k[0]}), 'ARRAY', 'UID arrays in inspect');
+       is(ref($x->{'mail-sync'}), 'HASH', 'sync in inspect');
+       is(ref($x->{'mail-sync'}->{$k[0]}), 'ARRAY', 'UID arrays in inspect')
+               or diag explain($x);
 
        my $psgi_attach = 'cfa3622cbeffc9bd6b0fc66c4d60d420ba74f60d';
        lei_ok('blob', $psgi_attach);