git: move cloneurl + description reading here

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

diff --git a/t/solver_git.t b/t/solver_git.t
index 1baa012b1abeb56a77c98519e8a27b08697aafe9..e347c7115fbe7e23b23bcd640d69e82129d1fafa 100644 (file)
--- a/t/solver_git.t
+++ b/t/solver_git.t
@@ -1,5 +1,5 @@
 #!perl -w
-# Copyright (C) 2019-2021 all contributors <meta@public-inbox.org>
+# Copyright (C)  all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 use strict;
 use v5.10.1;
@@ -287,38 +287,35 @@ EOF
                while (my ($label, $size) = each %bin) {
                        $res = $cb->(GET("/$name/$oid{$label}/s/"));
                        is($res->code, 200, "$label binary file");
-                       ok(index($res->content, "blob $size bytes") >= 0,
+                       ok(index($res->content,
+                               "blob $oid{$label} $size bytes") >= 0,
                                "showed $label binary blob size");
                        $res = $cb->(GET("/$name/$oid{$label}/s/raw"));
                        is($res->code, 200, "$label raw binary download");
                        is($res->content, "\0" x $size,
                                "$label content matches");
                }
+               my $utf8 = 'e022d3377fd2c50fd9931bf96394728958a90bf3';
+               $res = $cb->(GET("/$name/$utf8/s/"));
+               is($res->code, 200, 'shows commit w/ utf8.eml');
+               like($res->content, qr/El&#233;anor/,
+                               'UTF-8 commit shown properly');
        };
        test_psgi(sub { $www->call(@_) }, $client);
+       my $env = { PI_CONFIG => $cfgpath, TMPDIR => $tmpdir };
+       test_httpd($env, $client, 7, sub {
        SKIP: {
-               require_mods(qw(Plack::Test::ExternalServer), 7);
-               my $env = { PI_CONFIG => $cfgpath };
-               my $sock = tcp_server() or die;
-               my ($out, $err) = map { "$tmpdir/std$_.log" } qw(out err);
-               my $cmd = [ qw(-httpd -W0), "--stdout=$out", "--stderr=$err" ];
-               my $td = start_script($cmd, $env, { 3 => $sock });
-               my ($h, $p) = tcp_host_port($sock);
-               my $url = "http://$h:$p";
-               local $ENV{PLACK_TEST_EXTERNALSERVER_URI} = $url;
-               Plack::Test::ExternalServer::test_psgi(client => $client);
                require_cmd('curl', 1) or skip 'no curl', 1;
-
                mkdir "$tmpdir/ext" // xbail "mkdir $!";
+               my $rurl = "$ENV{PLACK_TEST_EXTERNALSERVER_URI}/$name";
                test_lei({tmpdir => "$tmpdir/ext"}, sub {
-                       my $rurl = "$url/$name";
                        lei_ok(qw(blob --no-mail 69df7d5 -I), $rurl);
                        is(git_sha(1, \$lei_out)->hexdigest, $expect,
                                'blob contents output');
                        ok(!lei(qw(blob -I), $rurl, $non_existent),
                                        'non-existent blob fails');
                });
-       }
+       }});
 }
 
 done_testing();