www: drop --subject from "git send-email" instructions

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

diff --git a/t/config.t b/t/config.t
index 204fc79024f10f7da15d254f654adccaae7150ac..7e753cbe1bf2d5ad7a7afaf7389c040a4a73da5f 100644 (file)
--- a/t/config.t
+++ b/t/config.t
@@ -1,11 +1,12 @@
-# Copyright (C) 2014-2020 all contributors <meta@public-inbox.org>
+# Copyright (C) 2014-2021 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 PublicInbox::Config;
+use v5.10.1;
 use PublicInbox::TestCommon;
 use PublicInbox::Import;
+use_ok 'PublicInbox';
+ok(defined(eval('$PublicInbox::VERSION')), 'VERSION defined');
+use_ok 'PublicInbox::Config';
 my ($tmpdir, $for_destroy) = tmpdir();
 
 {
@@ -41,9 +42,7 @@ my ($tmpdir, $for_destroy) = tmpdir();
                'url' => [ 'http://example.com/meta' ],
                -primary_address => 'meta@public-inbox.org',
                'name' => 'meta',
-               feedmax => 25,
                -httpbackend_limiter => undef,
-               nntpserver => undef,
        }, "lookup matches expected output");
 
        is($cfg->lookup('blah@example.com'), undef,
@@ -58,10 +57,8 @@ my ($tmpdir, $for_destroy) = tmpdir();
                'inboxdir' => '/home/pi/test-main.git',
                'domain' => 'public-inbox.org',
                'name' => 'test',
-               feedmax => 25,
                'url' => [ 'http://example.com/test' ],
                -httpbackend_limiter => undef,
-               nntpserver => undef,
        }, "lookup matches expected output for test");
 }
 
@@ -100,20 +97,31 @@ EOF
        my $str = <<EOF;
 $pfx.address=test\@example.com
 $pfx.inboxdir=/path/to/non/existent
+$pfx.newsgroup=inbox.test
 publicinbox.nntpserver=news.example.com
 EOF
        my $cfg = PublicInbox::Config->new(\$str);
        my $ibx = $cfg->lookup_name('test');
-       is($ibx->{nntpserver}, 'news.example.com', 'global NNTP server');
+       is_deeply($ibx->nntp_url({ www => { pi_cfg => $cfg }}),
+               [ 'nntp://news.example.com/inbox.test' ],
+               'nntp_url uses global NNTP server');
 
        $str = <<EOF;
 $pfx.address=test\@example.com
 $pfx.inboxdir=/path/to/non/existent
+$pfx.newsgroup=inbox.test
 $pfx.nntpserver=news.alt.example.com
+publicinbox.nntpserver=news.example.com
+publicinbox.imapserver=imaps://mail.example.com
 EOF
        $cfg = PublicInbox::Config->new(\$str);
        $ibx = $cfg->lookup_name('test');
-       is($ibx->{nntpserver}, 'news.alt.example.com','per-inbox NNTP server');
+       is_deeply($ibx->nntp_url({ www => { pi_cfg => $cfg }}),
+               [ 'nntp://news.alt.example.com/inbox.test' ],
+               'nntp_url uses per-inbox NNTP server');
+       is_deeply($ibx->imap_url({ www => { pi_cfg => $cfg }}),
+               [ 'imaps://mail.example.com/inbox.test' ],
+               'nntp_url uses per-inbox NNTP server');
 }
 
 # no obfuscate domains
@@ -161,7 +169,7 @@ my $xre = join('|', keys %X);
 for my $s (@invalid) {
        my $d = $s;
        $d =~ s/($xre)/$X{$1}/g;
-       ok(!PublicInbox::Config::valid_inbox_name($s), "`$d' name rejected");
+       ok(!PublicInbox::Config::valid_foo_name($s), "`$d' name rejected");
 }
 
 # obviously-valid examples
@@ -177,7 +185,7 @@ my @valid = qw(a a@example a@example.com);
 # '!', '$', '=', '+'
 push @valid, qw[bang! ca$h less< more> 1% (parens) &more eql= +plus], '#hash';
 for my $s (@valid) {
-       ok(PublicInbox::Config::valid_inbox_name($s), "`$s' name accepted");
+       ok(PublicInbox::Config::valid_foo_name($s), "`$s' name accepted");
 }
 
 {
@@ -214,7 +222,7 @@ EOF
        my $cfg = PublicInbox::Config->new(\$str);
        my $t1 = $cfg->lookup_name('test1');
        my $t2 = $cfg->lookup_name('test2');
-       is($t1->{-repo_objs}->[0], $t2->{-repo_objs}->[0],
+       is($cfg->repo_objs($t1)->[0], $cfg->repo_objs($t2)->[0],
                'inboxes share ::Git object');
 }