import: init_bare: allow use as method, use in tests

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

diff --git a/t/www_listing.t b/t/www_listing.t
index 75698ee53c2ee744f37175d361aa28c6db5e32a7..c132edbc00b3bf1d34c9ff0ee05998efbf8fed37 100644 (file)
--- a/t/www_listing.t
+++ b/t/www_listing.t
@@ -1,4 +1,4 @@
-# Copyright (C) 2019 all contributors <meta@public-inbox.org>
+# Copyright (C) 2019-2020 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 # manifest.js.gz generation and grok-pull integration test
 use strict;
@@ -6,21 +6,20 @@ use warnings;
 use Test::More;
 use PublicInbox::Spawn qw(which);
 use PublicInbox::TestCommon;
-my @mods = qw(URI::Escape Plack::Builder Digest::SHA
-               IO::Compress::Gzip IO::Uncompress::Gunzip HTTP::Tiny);
-foreach my $mod (@mods) {
-       eval("require $mod") or plan skip_all => "$mod missing for $0";
-}
-
+use PublicInbox::Import;
+require_mods(qw(URI::Escape Plack::Builder Digest::SHA
+               IO::Compress::Gzip IO::Uncompress::Gunzip HTTP::Tiny));
 require PublicInbox::WwwListing;
-my $json = eval { PublicInbox::WwwListing::_json() };
-plan skip_all => "JSON module missing: $@" if $@;
+my $json = do {
+       no warnings 'once';
+       $PublicInbox::WwwListing::json;
+} or plan skip_all => "JSON module missing";
 
 use_ok 'PublicInbox::Git';
 
 my ($tmpdir, $for_destroy) = tmpdir();
 my $bare = PublicInbox::Git->new("$tmpdir/bare.git");
-is(system(qw(git init -q --bare), $bare->{git_dir}), 0, 'git init --bare');
+PublicInbox::Import::init_bare($bare->{git_dir});
 is(PublicInbox::WwwListing::fingerprint($bare), undef,
        'empty repo has no fingerprint');
 {
@@ -35,7 +34,10 @@ like(PublicInbox::WwwListing::fingerprint($bare), qr/\A[a-f0-9]{40}\z/,
 sub tiny_test {
        my ($json, $host, $port) = @_;
        my $http = HTTP::Tiny->new;
-       my $res = $http->get("http://$host:$port/manifest.js.gz");
+       my $res = $http->get("http://$host:$port/");
+       is($res->{status}, 200, 'got HTML listing');
+       like($res->{content}, qr!</html>!si, 'listing looks like HTML');
+       $res = $http->get("http://$host:$port/manifest.js.gz");
        is($res->{status}, 200, 'got manifest');
        my $tmp;
        IO::Uncompress::Gunzip::gunzip(\(delete $res->{content}) => \$tmp);
@@ -76,6 +78,7 @@ SKIP: {
        my @clone = qw(git clone -q -s --bare);
        is(system(@clone, $bare->{git_dir}, $alt), 0, 'clone shared repo');
 
+       PublicInbox::Import::init_bare("$v2/all.git");
        for my $i (0..2) {
                is(system(@clone, $alt, "$v2/git/$i.git"), 0, "clone epoch $i");
        }
@@ -88,6 +91,8 @@ SKIP: {
        ok(unlink("$bare->{git_dir}/description"), 'removed bare/description');
        open $fh, '>', $cfgfile or die;
        print $fh <<"" or die;
+[publicinbox]
+       wwwlisting = all
 [publicinbox "bare"]
        inboxdir = $bare->{git_dir}
        url = http://$host/bare