X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fconfig.t;h=7e753cbe1bf2d5ad7a7afaf7389c040a4a73da5f;hb=7e4bd71efcf3bf61216ec1a7577e33be5f95b8a9;hp=fe6841069f944b31340c463fc43ff10cbf31a1b4;hpb=af0b0fb7a454470a32c452119d0392e0dedb3fe1;p=public-inbox.git
diff --git a/t/config.t b/t/config.t
index fe684106..7e753cbe 100644
--- a/t/config.t
+++ b/t/config.t
@@ -1,11 +1,12 @@
# Copyright (C) 2014-2021 all contributors
# License: AGPL-3.0+
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();
{
@@ -42,7 +43,6 @@ my ($tmpdir, $for_destroy) = tmpdir();
-primary_address => 'meta@public-inbox.org',
'name' => 'meta',
-httpbackend_limiter => undef,
- nntpserver => undef,
}, "lookup matches expected output");
is($cfg->lookup('blah@example.com'), undef,
@@ -59,7 +59,6 @@ my ($tmpdir, $for_destroy) = tmpdir();
'name' => 'test',
'url' => [ 'http://example.com/test' ],
-httpbackend_limiter => undef,
- nntpserver => undef,
}, "lookup matches expected output for test");
}
@@ -98,20 +97,31 @@ EOF
my $str = <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 = <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
@@ -159,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
@@ -175,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");
}
{
@@ -212,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');
}