update copyrights for 2018

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

diff --git a/t/feed.t b/t/feed.t
index 26c4bce35ea81a91c4bb29f72d9c8b055a1fd75b..8f19352fdbc273383573ddaae11f5f66c1ddbf9a 100644 (file)
--- a/t/feed.t
+++ b/t/feed.t
@@ -1,5 +1,5 @@
-# Copyright (C) 2014-2015 all contributors <meta@public-inbox.org>
-# License: AGPLv3 or later (https://www.gnu.org/licenses/agpl-3.0.txt)
+# Copyright (C) 2014-2018 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;
@@ -8,9 +8,10 @@ use PublicInbox::Feed;
 use PublicInbox::Git;
 use PublicInbox::Import;
 use PublicInbox::Config;
+use PublicInbox::Inbox;
 use File::Temp qw/tempdir/;
 my $have_xml_feed = eval { require XML::Feed; 1 };
-require 't/common.perl';
+require './t/common.perl';
 
 sub string_feed {
        stream_to_string(PublicInbox::Feed::generate($_[0]));
@@ -40,8 +41,15 @@ sub rand_use ($) {
 
 my $tmpdir = tempdir('pi-feed-XXXXXX', TMPDIR => 1, CLEANUP => 1);
 my $git_dir = "$tmpdir/gittest";
-my $git = PublicInbox::Git->new($git_dir);
-my $im = PublicInbox::Import->new($git, 'testbox', 'test@example');
+my $ibx = PublicInbox::Inbox->new({
+       address => 'test@example',
+       name => 'testbox',
+       mainrepo => $git_dir,
+       url => 'http://example.com/test',
+       feedmax => 3,
+});
+my $git = $ibx->git;
+my $im = PublicInbox::Import->new($git, $ibx->{name}, 'test@example');
 
 {
        is(0, system(qw(git init -q --bare), $git_dir), "git init");
@@ -94,16 +102,13 @@ EOF
 {
        # check initial feed
        {
-               my $feed = string_feed({
-                       git_dir => $git_dir,
-                       max => 3
-               });
+               my $feed = string_feed({ -inbox => $ibx });
                SKIP: {
                        skip 'XML::Feed missing', 2 unless $have_xml_feed;
                        my $p = XML::Feed->parse(\$feed);
                        is($p->format, "Atom", "parsed atom feed");
                        is(scalar $p->entries, 3, "parsed three entries");
-                       is($p->id, 'mailto:public-inbox@example.com',
+                       is($p->id, 'mailto:test@example',
                                "id is set to default");
                }
 
@@ -135,10 +140,7 @@ EOF
 
        # check spam shows up
        {
-               my $spammy_feed = string_feed({
-                       git_dir => $git_dir,
-                       max => 3
-               });
+               my $spammy_feed = string_feed({ -inbox => $ibx });
                SKIP: {
                        skip 'XML::Feed missing', 2 unless $have_xml_feed;
                        my $p = XML::Feed->parse(\$spammy_feed);
@@ -160,10 +162,7 @@ EOF
 
        # spam no longer shows up
        {
-               my $feed = string_feed({
-                       git_dir => $git_dir,
-                       max => 3
-               });
+               my $feed = string_feed({ -inbox => $ibx });
                SKIP: {
                        skip 'XML::Feed missing', 2 unless $have_xml_feed;
                        my $p = XML::Feed->parse(\$feed);
@@ -174,26 +173,4 @@ EOF
        }
 }
 
-# check pi_config
-{
-       foreach my $addr (('a@example.com'), ['a@example.com','b@localhost']) {
-               my $feed = string_feed({
-                       git_dir => $git_dir,
-                       max => 3,
-                       inbox => 'asdf',
-                       pi_config => bless({
-                               'publicinbox.asdf.address' => $addr,
-                       }, 'PublicInbox::Config'),
-               });
-               SKIP: {
-                       skip 'XML::Feed missing', 3 unless $have_xml_feed;
-                       my $p = XML::Feed->parse(\$feed);
-                       is($p->id, 'mailto:a@example.com',
-                               "ID is set correctly");
-                       is($p->format, "Atom", "parsed atom feed");
-                       is(scalar $p->entries, 3, "parsed three entries");
-               }
-       }
-}
-
 done_testing();