X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fsolver_git.t;h=1baa012b1abeb56a77c98519e8a27b08697aafe9;hb=refs%2Fheads%2Fmaster;hp=5519fa1817e1d2971d9e34d0b8cdf2ebb41ff2ee;hpb=1c5e51b931fb2a00df28dd5e81d1766b63e389b3;p=public-inbox.git

diff --git a/t/solver_git.t b/t/solver_git.t
index 5519fa18..c65d9785 100644
--- a/t/solver_git.t
+++ b/t/solver_git.t
@@ -293,7 +293,7 @@ EOF
 		is($res->code, 404, 'failure with null OID');
 
 		$res = $cb->(GET("/$name/$non_existent/s/"));
-		is($res->code, 404, 'failure with null OID');
+		is($res->code, 404, 'failure with non-existent OID');
 
 		$res = $cb->(GET("/$name/$v1_0_0_tag/s/"));
 		is($res->code, 200, 'shows commit (unabbreviated)');
@@ -330,18 +330,16 @@ EOF
 		defined($ENV{PLACK_TEST_EXTERNALSERVER_URI}) or
 			open STDERR, '>&', $olderr or xbail "open: $!";
 		is($res->code, 200, 'coderepo summary (binfoo)');
-		if (ok(-s "$tmpdir/stderr.log")) {
-			open my $fh, '<', "$tmpdir/stderr.log" or xbail $!;
-			my $s = do { local $/; <$fh> };
-			open $fh, '>', "$tmpdir/stderr.log" or xbail $!;
-			ok($s =~ s/^fatal: your current branch.*?\n//sm,
-				'got current branch warning');
-			ok($s =~ s/^.*? exit status=[1-9]+ .*?\n//sm,
-				'got exit status warning');
-			is($s, '', 'no unexpected warnings on empty coderepo');
-		}
+		ok(!-s "$tmpdir/stderr.log");
 		$res = $cb->(GET('/public-inbox/'));
 		is($res->code, 200, 'coderepo summary (public-inbox)');
+
+		my $tip = 'invalid-'.int(rand(0xdeadbeef));
+		$res = $cb->(GET('/public-inbox/?h='.$tip));
+		is($res->code, 200, 'coderepo summary on dead branch');
+		like($res->content, qr/no commits in `\Q$tip\E', yet/,
+			'lack of commits noted');
+
 		$res = $cb->(GET('/public-inbox'));
 		is($res->code, 301, 'redirected');
 
@@ -379,15 +377,41 @@ EOF
 			ok($t->{feed}->{entry}, 'got entry');
 
 			$res = $cb->(GET('/public-inbox/atom/README.md'));
-			is($res->code, 404, '404 on non-existent file Atom feed');
+			is($res->code, 404, '404 on missing file Atom feed');
+
+			$res = $cb->(GET('/public-inbox/atom/?h=gone'));
+			is($res->code, 404, '404 on missing Atom feed branch');
 		}
 
 		$res = $cb->(GET('/public-inbox/tree/'));
-		is($res->code, 302, 'got redirect');
+		is($res->code, 200, 'got 200 for root listing');
+		$got = $res->content;
+		like($got, qr/\bgit ls-tree\b/, 'ls-tree help shown');
+
 		$res = $cb->(GET('/public-inbox/tree/README'));
-		is($res->code, 302, 'got redirect for regular file');
+		is($res->code, 200, 'got 200 for regular file');
+		$got = $res->content;
+		like($got, qr/\bgit show\b/, 'git show help shown');
+
 		$res = $cb->(GET('/public-inbox/tree/Documentation'));
-		is($res->code, 302, 'got redirect for directory');
+		is($res->code, 200, 'got 200 for a directory');
+		$got = $res->content;
+		like($got, qr/\bgit ls-tree\b/, 'ls-tree help shown');
+
+		$res = $cb->(GET('/public-inbox/tree/?h=no-branch'));
+		is($res->code, 404, 'got 404 for non-existent ref root');
+		$res = $cb->(GET('/public-inbox/tree/README?h=no-file'));
+		is($res->code, 404, 'got 404 for non-existent ref README');
+		$res = $cb->(GET('/public-inbox/tree/Documentation?h=no-dir'));
+		is($res->code, 404, 'got 404 for non-existent ref directory');
+
+		$res = $cb->(GET('/public-inbox/tags.atom'));
+		is($res->code, 200, 'Atom feed');
+		SKIP: {
+			require_mods('XML::TreePP', 1);
+			my $t = XML::TreePP->new->parse($res->content);
+			ok(scalar @{$t->{feed}->{entry}}, 'got tag entries');
+		}
 	};
 	test_psgi(sub { $www->call(@_) }, $client);
 	my $env = { PI_CONFIG => $cfgpath, TMPDIR => $tmpdir };