X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fpsgi_text.t;h=b7b5b2d456e1580c6576efe8d35175f99a39bdee;hb=e6b7a7f5f70fb89a54ff158bc6c8b564149947e5;hp=9979e7b3b0a0352b4f8857d1c4bd6a426c15e7ab;hpb=9bd675d33ad1e49bd2ebe12a1d216216e61380de;p=public-inbox.git

diff --git a/t/psgi_text.t b/t/psgi_text.t
index 9979e7b3..b7b5b2d4 100644
--- a/t/psgi_text.t
+++ b/t/psgi_text.t
@@ -1,31 +1,27 @@
-# Copyright (C) 2016-2019 all contributors <meta@public-inbox.org>
+# Copyright (C) 2016-2020 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 use strict;
 use warnings;
 use Test::More;
-use Email::MIME;
-use File::Temp qw/tempdir/;
-my $tmpdir = tempdir('psgi-text-XXXXXX', TMPDIR => 1, CLEANUP => 1);
+use PublicInbox::MIME;
+use PublicInbox::TestCommon;
+my ($tmpdir, $for_destroy) = tmpdir();
 my $maindir = "$tmpdir/main.git";
 my $addr = 'test-public@example.com';
 my $cfgpfx = "publicinbox.test";
-my @mods = qw(HTTP::Request::Common Plack::Test URI::Escape);
-foreach my $mod (@mods) {
-	eval "require $mod";
-	plan skip_all => "$mod missing for psgi_text.t" if $@;
-}
+my @mods = qw(HTTP::Request::Common Plack::Test URI::Escape Plack::Builder);
+require_mods(@mods);
 use_ok $_ foreach @mods;
 use PublicInbox::Import;
 use PublicInbox::Git;
 use PublicInbox::Config;
-use PublicInbox::WWW;
+use_ok 'PublicInbox::WWW';
 use_ok 'PublicInbox::WwwText';
-use Plack::Builder;
-my $config = PublicInbox::Config->new({
-	"$cfgpfx.address" => $addr,
-	"$cfgpfx.mainrepo" => $maindir,
-});
-is(0, system(qw(git init -q --bare), $maindir), "git init (main)");
+my $config = PublicInbox::Config->new(\<<EOF);
+$cfgpfx.address=$addr
+$cfgpfx.inboxdir=$maindir
+EOF
+PublicInbox::Import::init_bare($maindir);
 my $www = PublicInbox::WWW->new($config);
 
 test_psgi(sub { $www->call(@_) }, sub {
@@ -34,6 +30,13 @@ test_psgi(sub { $www->call(@_) }, sub {
 	$res = $cb->(GET('/test/_/text/help/'));
 	like($res->content, qr!<title>public-inbox help.*</title>!,
 		'default help');
+	$res = $cb->(GET('/test/_/text/config/raw'));
+	my $f = "$tmpdir/cfg";
+	open my $fh, '>', $f or die;
+	print $fh $res->content or die;
+	close $fh or die;
+	my $cfg = PublicInbox::Config->new($f);
+	is($cfg->{"$cfgpfx.address"}, $addr, 'got expected address in config');
 });
 
 done_testing();