X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Flei-import-maildir.t;h=1e7eddd571d8388aa5f59d6e5457a000a4301d4d;hb=4eee5af6011cc8cdefb66c9729952c7eff5c0b0b;hp=02fe43e1bc8880a8da232d39ce87c6da922a99d9;hpb=cb0e9d42b799c7489c3b8328cfcae1e1500bc7a0;p=public-inbox.git

diff --git a/t/lei-import-maildir.t b/t/lei-import-maildir.t
index 02fe43e1..1e7eddd5 100644
--- a/t/lei-import-maildir.t
+++ b/t/lei-import-maildir.t
@@ -10,12 +10,15 @@ test_lei(sub {
 	}
 	symlink(abs_path('t/data/0001.patch'), "$md/cur/x:2,S") or
 		BAIL_OUT "symlink $md $!";
-	lei_ok(qw(import), $md, \'import Maildir');
+	lei_ok(qw(import), "$md/", \'import Maildir');
 	my $imp_err = $lei_err;
 
 	my %i;
 	lei_ok('inspect', $md); $i{no_type} = $lei_out;
+	lei_ok('inspect', "$md/"); $i{no_type_tslash} = $lei_out;
 	lei_ok('inspect', "maildir:$md"), $i{with_type} = $lei_out;
+	lei_ok('inspect', "maildir:$md/"), $i{with_type_tslash} = $lei_out;
+	lei_ok('inspect', "MAILDIR:$md"), $i{ALLCAPS} = $lei_out;
 	lei_ok(['inspect', $md], undef, { -C => $ENV{HOME}, %$lei_opt });
 	$i{rel_no_type} = $lei_out;
 	lei_ok(['inspect', "maildir:$md"], undef,
@@ -25,7 +28,7 @@ test_lei(sub {
 	is(scalar(keys %v), 1, 'inspect handles relative and absolute paths');
 	my $inspect = json_utf8->decode([ keys %v ]->[0]);
 	is_deeply($inspect, {"maildir:$md" => { 'name.count' => 1 }},
-		'inspect maildir: path had expected output');
+		'inspect maildir: path had expected output') or xbail($inspect);
 
 	lei_ok(qw(q s:boolean));
 	my $res = json_utf8->decode($lei_out);
@@ -37,7 +40,7 @@ test_lei(sub {
 	lei_ok('inspect', "blob:$res->[0]->{blob}");
 	$inspect = json_utf8->decode($lei_out);
 	is(ref(delete $inspect->{"lei/store"}), 'ARRAY', 'lei/store IDs');
-	is_deeply($inspect, { sync => { "maildir:$md" => [ 'x:2,S' ] } },
+	is_deeply($inspect, { 'mail-sync' => { "maildir:$md" => [ 'x:2,S' ] } },
 		'maildir sync info as expected');
 
 	lei_ok qw(ls-mail-sync);
@@ -49,7 +52,7 @@ test_lei(sub {
 	my $r2 = json_utf8->decode($lei_out);
 	is_deeply($r2, $res, 'idempotent import')
 			or diag explain($imp_err, $res);
-	rename("$md/cur/x:2,S", "$md/cur/x:2,SR") or BAIL_OUT "rename: $!";
+	rename("$md/cur/x:2,S", "$md/cur/x:2,RS") or BAIL_OUT "rename: $!";
 	lei_ok('import', "maildir:$md", \'import Maildir after +answered');
 	lei_ok(qw(q -d none s:boolean), \'lei q after +answered');
 	$res = json_utf8->decode($lei_out);
@@ -65,5 +68,12 @@ test_lei(sub {
 	$res = json_utf8->decode($lei_out);
 	is_deeply($res, [ undef ], 'trashed message not imported')
 			or diag explain($imp_err, $res);
+
+	lei_ok qw(rm t/data/0001.patch);
+	lei_ok(qw(q s:boolean));
+	is($lei_out, "[null]\n", 'removed message gone from results');
+	my $g0 = "$ENV{HOME}/.local/share/lei/store/local/0.git";
+	my $x = xqx(['git', "--git-dir=$g0", qw(cat-file blob HEAD:d)]);
+	is($?, 0, "git cat-file shows file is `d'");
 });
 done_testing;