update copyright headers and email addresses

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

diff --git a/t/feed.t b/t/feed.t
index 978e21563fa3efdd69df0ec4c36d90d56c562855..71cbb7356e7287b6b304330b70b15c6feec8b27c 100644 (file)
--- a/t/feed.t
+++ b/t/feed.t
@@ -1,4 +1,4 @@
-# Copyright (C) 2014, Eric Wong <normalperson@yhbt.net> and all contributors
+# Copyright (C) 2014-2015 all contributors <meta@public-inbox.org>
 # License: AGPLv3 or later (https://www.gnu.org/licenses/agpl-3.0.txt)
 use strict;
 use warnings;
@@ -9,6 +9,11 @@ use PublicInbox::Config;
 use IPC::Run qw/run/;
 use File::Temp qw/tempdir/;
 my $have_xml_feed = eval { require XML::Feed; 1 };
+require 't/common.perl';
+
+sub string_feed {
+       stream_to_string(PublicInbox::Feed::generate($_[0]));
+}
 
 my $tmpdir = tempdir(CLEANUP => 1);
 my $git_dir = "$tmpdir/gittest";
@@ -58,7 +63,7 @@ EOF
 {
        # check initial feed
        {
-               my $feed = PublicInbox::Feed->generate({
+               my $feed = string_feed({
                        git_dir => $git_dir,
                        max => 3
                });
@@ -72,7 +77,7 @@ EOF
                }
 
                unlike($feed, qr/drop me/, "long quoted text dropped");
-               like($feed, qr!/f/\d%40example\.com\.html\b!,
+               like($feed, qr!/\d%40example\.com/f/#q!,
                        "/f/ url generated for long quoted text");
                like($feed, qr/inline me here/, "short quoted text kept");
                like($feed, qr/keep me/, "unquoted text saved");
@@ -101,7 +106,7 @@ EOF
 
        # check spam shows up
        {
-               my $spammy_feed = PublicInbox::Feed->generate({
+               my $spammy_feed = string_feed({
                        git_dir => $git_dir,
                        max => 3
                });
@@ -123,7 +128,7 @@ EOF
 
        # spam no longer shows up
        {
-               my $feed = PublicInbox::Feed->generate({
+               my $feed = string_feed({
                        git_dir => $git_dir,
                        max => 3
                });
@@ -140,7 +145,7 @@ EOF
 # check pi_config
 {
        foreach my $addr (('a@example.com'), ['a@example.com','b@localhost']) {
-               my $feed = PublicInbox::Feed->generate({
+               my $feed = string_feed({
                        git_dir => $git_dir,
                        max => 3,
                        listname => 'asdf',