X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fnntp.t;h=3d2f524c4a7d4c704a0ee269256bfef8cd81dc52;hb=416d1c3f6d5e5a857760ffc1b679e86a070bdbd4;hp=9a482acba88eb91d95c45ad1475018b0144bbb1a;hpb=305d728977def1df9ab57778f9cad9dd834ce73d;p=public-inbox.git diff --git a/t/nntp.t b/t/nntp.t index 9a482acb..3d2f524c 100644 --- a/t/nntp.t +++ b/t/nntp.t @@ -8,6 +8,7 @@ use PublicInbox::Eml; require_mods(qw(DBD::SQLite Data::Dumper)); use_ok 'PublicInbox::NNTP'; use_ok 'PublicInbox::Inbox'; +use PublicInbox::Config; { sub quote_str { @@ -98,22 +99,25 @@ use_ok 'PublicInbox::Inbox'; { # test setting NNTP headers in HEAD and ARTICLE requests 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 = PublicInbox::Eml->new("Message-ID: <$mid>\r\n\r\n"); my $hdr = $mime->header_obj; my $mock_self = { - nntpd => { grouplist => [], servername => 'example.com' }, - ng => $ng, + nntpd => { + servername => 'example.com', + pi_config => bless {}, 'PublicInbox::Config', + }, + ibx => $ibx, }; - my $smsg = { num => 1, mid => $mid, nntp => $mock_self, -ibx => $ng }; + 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'); @@ -128,7 +132,7 @@ use_ok 'PublicInbox::Inbox'; is_deeply([ $mime->header('Xref') ], [ 'example.com test:1' ], 'Xref: set'); - $ng->{-base_url} = 'http://mirror.example.com/m/'; + $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>" ],