X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fnntp.t;h=aabfd4ffb46798f58240405f0cd70cb0d12fed79;hb=4821798351defce82c102e46d6f5f84f0cdc0e34;hp=de07abb0f38ea9a82b8560329dd9d17a703cdb16;hpb=3f779258173530ca88f31e1dc5332f951d2c44cd;p=public-inbox.git

diff --git a/t/nntp.t b/t/nntp.t
index de07abb0..aabfd4ff 100644
--- a/t/nntp.t
+++ b/t/nntp.t
@@ -1,11 +1,10 @@
-# Copyright (C) 2015 all contributors <meta@public-inbox.org>
-# License: AGPLv3 or later (https://www.gnu.org/licenses/agpl-3.0.txt)
+# Copyright (C) 2015-2019 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 Data::Dumper;
 
-foreach my $mod (qw(DBD::SQLite Search::Xapian Danga::Socket)) {
+foreach my $mod (qw(DBD::SQLite Data::Dumper)) {
 	eval "require $mod";
 	plan skip_all => "$mod missing for nntp.t" if $@;
 }
@@ -15,7 +14,7 @@ use_ok 'PublicInbox::Inbox';
 
 {
 	sub quote_str {
-		my (undef, $s) = split(/ = /, Dumper($_[0]), 2);
+		my (undef, $s) = split(/ = /, Data::Dumper::Dumper($_[0]), 2);
 		$s =~ s/;\n//;
 		$s;
 	}
@@ -100,7 +99,7 @@ use_ok 'PublicInbox::Inbox';
 	require Email::MIME;
 	my $u = 'https://example.com/a/';
 	my $ng = PublicInbox::Inbox->new({ name => 'test',
-					mainrepo => 'test.git',
+					inboxdir => 'test.git',
 					address => 'a@example.com',
 					-primary_address => 'a@example.com',
 					newsgroup => 'test',
@@ -109,10 +108,13 @@ use_ok 'PublicInbox::Inbox';
 	is($ng->base_url, $u, 'URL expanded');
 	my $mid = 'a@b';
 	my $mime = Email::MIME->new("Message-ID: <$mid>\r\n\r\n");
-	PublicInbox::NNTP::set_nntp_headers($mime->header_obj, $ng, 1, $mid);
+	my $hdr = $mime->header_obj;
+	my $mock_self = { nntpd => { grouplist => [], 
+				     servername => 'example.com' } };
+	PublicInbox::NNTP::set_nntp_headers($mock_self, $hdr, $ng, 1, $mid);
 	is_deeply([ $mime->header('Message-ID') ], [ "<$mid>" ],
 		'Message-ID unchanged');
-	is_deeply([ $mime->header('Archived-At') ], [ "<${u}a%40b/>" ],
+	is_deeply([ $mime->header('Archived-At') ], [ "<${u}a\@b/>" ],
 		'Archived-At: set');
 	is_deeply([ $mime->header('List-Archive') ], [ "<$u>" ],
 		'List-Archive: set');
@@ -124,11 +126,11 @@ use_ok 'PublicInbox::Inbox';
 		'Xref: set');
 
 	$ng->{-base_url} = 'http://mirror.example.com/m/';
-	PublicInbox::NNTP::set_nntp_headers($mime->header_obj, $ng, 2, $mid);
+	PublicInbox::NNTP::set_nntp_headers($mock_self, $hdr, $ng, 2, $mid);
 	is_deeply([ $mime->header('Message-ID') ], [ "<$mid>" ],
 		'Message-ID unchanged');
 	is_deeply([ $mime->header('Archived-At') ],
-		[ "<${u}a%40b/>", '<http://mirror.example.com/m/a%40b/>' ],
+		[ "<${u}a\@b/>", '<http://mirror.example.com/m/a@b/>' ],
 		'Archived-At: appended');
 	is_deeply([ $mime->header('Xref') ], [ 'example.com test:2' ],
 		'Old Xref: clobbered');