X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fnntp.t;h=03c7f08361a25fd7107db1be733d565cf7469e4c;hb=4790a0dbd7b297e087713c6ff2e63bf7deee4d04;hp=5513c7bcd58a5be43e02876f374157d2707ad0b4;hpb=a0acd80571373595838617034540e1503f744737;p=public-inbox.git
diff --git a/t/nntp.t b/t/nntp.t
index 5513c7bc..03c7f083 100644
--- a/t/nntp.t
+++ b/t/nntp.t
@@ -1,5 +1,5 @@
-# Copyright (C) 2015 all contributors
-# License: AGPLv3 or later (https://www.gnu.org/licenses/agpl-3.0.txt)
+# Copyright (C) 2015-2018 all contributors
+# License: AGPL-3.0+
use strict;
use warnings;
use Test::More;
@@ -11,7 +11,7 @@ foreach my $mod (qw(DBD::SQLite Search::Xapian Danga::Socket)) {
}
use_ok 'PublicInbox::NNTP';
-use_ok 'PublicInbox::NewsGroup';
+use_ok 'PublicInbox::Inbox';
{
sub quote_str {
@@ -99,15 +99,20 @@ use_ok 'PublicInbox::NewsGroup';
{ # test setting NNTP headers in HEAD and ARTICLE requests
require Email::MIME;
my $u = 'https://example.com/a/';
- my $ng = PublicInbox::NewsGroup->new('test', 'test.git',
- 'a@example.com', '//example.com/a');
- is($ng->{url}, $u, 'URL expanded');
+ my $ng = PublicInbox::Inbox->new({ name => 'test',
+ mainrepo => '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');
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);
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');
@@ -118,12 +123,12 @@ use_ok 'PublicInbox::NewsGroup';
is_deeply([ $mime->header('Xref') ], [ 'example.com test:1' ],
'Xref: set');
- $ng->{url} = 'http://mirror.example.com/m/';
+ $ng->{-base_url} = 'http://mirror.example.com/m/';
PublicInbox::NNTP::set_nntp_headers($mime->header_obj, $ng, 2, $mid);
is_deeply([ $mime->header('Message-ID') ], [ "<$mid>" ],
'Message-ID unchanged');
is_deeply([ $mime->header('Archived-At') ],
- [ "<${u}a%40b/>", '' ],
+ [ "<${u}a\@b/>", '' ],
'Archived-At: appended');
is_deeply([ $mime->header('Xref') ], [ 'example.com test:2' ],
'Old Xref: clobbered');