X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fcgi.t;h=97bdebd982a191e5cd96ec83620f097af7f721ae;hb=a3cf35c675217ea60a461dd9be7cc5b55c2d5280;hp=62cea49967d7fe0f9866eac0b15a803e929e614e;hpb=ad6f26f3b9f0e428020d05667987556f8fcbec2f;p=public-inbox.git

diff --git a/t/cgi.t b/t/cgi.t
index 62cea499..97bdebd9 100644
--- a/t/cgi.t
+++ b/t/cgi.t
@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2019 all contributors <meta@public-inbox.org>
+# Copyright (C) 2014-2020 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 # FIXME: this test is too slow and most non-CGI-requirements
 # should be moved over to things which use test_psgi
@@ -6,14 +6,14 @@ use strict;
 use warnings;
 use Test::More;
 use Email::MIME;
-require './t/common.perl';
+use PublicInbox::TestCommon;
+require_mods(qw(Plack::Handler::CGI Plack::Util));
 my ($tmpdir, $for_destroy) = tmpdir();
 my $home = "$tmpdir/pi-home";
 my $pi_home = "$home/.public-inbox";
 my $pi_config = "$pi_home/config";
 my $maindir = "$tmpdir/main.git";
 my $addr = 'test-public@example.com';
-my $cfgpfx = "publicinbox.test";
 
 {
 	is(1, mkdir($home, 0755), "setup ~/ for testing");
@@ -23,19 +23,16 @@ my $cfgpfx = "publicinbox.test";
 	open my $fh, '>', "$maindir/description" or die "open: $!\n";
 	print $fh "test for public-inbox\n";
 	close $fh or die "close: $!\n";
-	my %cfg = (
-		"$cfgpfx.address" => $addr,
-		"$cfgpfx.inboxdir" => $maindir,
-		"$cfgpfx.indexlevel" => 'basic',
-	);
-	while (my ($k,$v) = each %cfg) {
-		is(0, system(qw(git config --file), $pi_config, $k, $v),
-			"setup $k");
-	}
+	open $fh, '>>', $pi_config or die;
+	print $fh <<EOF or die;
+[publicinbox "test"]
+	address = $addr
+	inboxdir = $maindir
+	indexlevel = basic
+EOF
+	close $fh or die "close: $!\n";
 }
 
-use_ok 'PublicInbox::Git';
-use_ok 'PublicInbox::Import';
 use_ok 'PublicInbox::Inbox';
 use_ok 'PublicInbox::InboxWritable';
 use_ok 'PublicInbox::Config';
@@ -124,18 +121,19 @@ EOF
 		SKIP: { skip 'DBD::SQLite not available', 2 };
 	}
 
-	my $have_xml_feed = eval { require XML::Feed; 1 } if $indexed;
-	if ($have_xml_feed) {
+	my $have_xml_treepp = eval { require XML::TreePP; 1 } if $indexed;
+	if ($have_xml_treepp) {
 		$path = "/test/blahblah\@example.com/t.atom";
 		$res = cgi_run($path);
 		like($res->{head}, qr/^Status: 200 /, "atom returned 200");
 		like($res->{head}, qr!^Content-Type: application/atom\+xml!m,
 			"search returned atom");
-		my $p = XML::Feed->parse(\($res->{body}));
-		is($p->format, "Atom", "parsed atom feed");
-		is(scalar $p->entries, 3, "parsed three entries");
+		my $t = XML::TreePP->new->parse($res->{body});
+		is(scalar @{$t->{feed}->{entry}}, 3, "parsed three entries");
+		like($t->{feed}->{-xmlns}, qr/\bAtom\b/,
+				'looks like an an Atom feed');
 	} else {
-		SKIP: { skip 'DBD::SQLite or XML::Feed missing', 2 };
+		SKIP: { skip 'DBD::SQLite or XML::TreePP missing', 2 };
 	}
 }