rename {pi_config} fields to {pi_cfg}

[public-inbox.git] / t / nntp.t

diff --git a/t/nntp.t b/t/nntp.t
index 1db896cf46b5a6376929e8de6c501e28d8d0d6f0..b745886d062594f65613689027b24f2829478006 100644 (file)
--- 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,23 +99,26 @@ 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_cfg => bless {}, 'PublicInbox::Config',
+               },
+               ibx => $ibx,
        };
-       my $smsg = { num => 1, mid => $mid };
-       PublicInbox::NNTP::set_nntp_headers($mock_self, $hdr, $smsg);
+       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/>" ],
@@ -128,9 +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/';
+       $ibx->{-base_url} = 'http://mirror.example.com/m/';
        $smsg->{num} = 2;
-       PublicInbox::NNTP::set_nntp_headers($mock_self, $hdr, $smsg);
+       PublicInbox::NNTP::set_nntp_headers($hdr, $smsg);
        is_deeply([ $mime->header('Message-ID') ], [ "<$mid>" ],
                'Message-ID unchanged');
        is_deeply([ $mime->header('Archived-At') ],