X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fnntp.t;h=b745886d062594f65613689027b24f2829478006;hb=0d38f65c490466837ae091afa7a7b6f59d04ce7c;hp=ff72ec6a001cabc92d725154608a7bda2956702a;hpb=95bdac7f09c69036efed537a4d03d5bdd2ae4eb6;p=public-inbox.git

diff --git a/t/nntp.t b/t/nntp.t
index ff72ec6a..b745886d 100644
--- a/t/nntp.t
+++ b/t/nntp.t
@@ -4,9 +4,11 @@ use strict;
 use warnings;
 use Test::More;
 use PublicInbox::TestCommon;
+use PublicInbox::Eml;
 require_mods(qw(DBD::SQLite Data::Dumper));
 use_ok 'PublicInbox::NNTP';
 use_ok 'PublicInbox::Inbox';
+use PublicInbox::Config;
 
 {
 	sub quote_str {
@@ -96,22 +98,27 @@ use_ok 'PublicInbox::Inbox';
 }
 
 { # test setting NNTP headers in HEAD and ARTICLE requests
-	require Email::MIME;
 	my $u = 'https://example.com/a/';
-	my $ng = PublicInbox::Inbox->new({ name => 'test',
+	my $ibx = PublicInbox::Inbox->new({ name => 'test',
 					inboxdir => 'test.git',
 					address => 'a@example.com',
 					-primary_address => 'a@example.com',
 					newsgroup => 'test',
 					domain => 'example.com',
 					url => [ '//example.com/a' ]});
-	is($ng->base_url, $u, 'URL expanded');
+	is($ibx->base_url, $u, 'URL expanded');
 	my $mid = 'a@b';
-	my $mime = Email::MIME->new("Message-ID: <$mid>\r\n\r\n");
+	my $mime = PublicInbox::Eml->new("Message-ID: <$mid>\r\n\r\n");
 	my $hdr = $mime->header_obj;
-	my $mock_self = { nntpd => { grouplist => [], 
-				     servername => 'example.com' } };
-	PublicInbox::NNTP::set_nntp_headers($mock_self, $hdr, $ng, 1, $mid);
+	my $mock_self = {
+		nntpd => {
+			servername => 'example.com',
+			pi_cfg => bless {}, 'PublicInbox::Config',
+		},
+		ibx => $ibx,
+	};
+	my $smsg = { num => 1, mid => $mid, nntp => $mock_self, -ibx => $ibx };
+	PublicInbox::NNTP::set_nntp_headers($hdr, $smsg);
 	is_deeply([ $mime->header('Message-ID') ], [ "<$mid>" ],
 		'Message-ID unchanged');
 	is_deeply([ $mime->header('Archived-At') ], [ "<${u}a\@b/>" ],
@@ -125,8 +132,9 @@ use_ok 'PublicInbox::Inbox';
 	is_deeply([ $mime->header('Xref') ], [ 'example.com test:1' ],
 		'Xref: set');
 
-	$ng->{-base_url} = 'http://mirror.example.com/m/';
-	PublicInbox::NNTP::set_nntp_headers($mock_self, $hdr, $ng, 2, $mid);
+	$ibx->{-base_url} = 'http://mirror.example.com/m/';
+	$smsg->{num} = 2;
+	PublicInbox::NNTP::set_nntp_headers($hdr, $smsg);
 	is_deeply([ $mime->header('Message-ID') ], [ "<$mid>" ],
 		'Message-ID unchanged');
 	is_deeply([ $mime->header('Archived-At') ],