www: stop generating /$MESSAGE_ID/f/ links

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

diff --git a/t/feed.t b/t/feed.t
index a6bffdcd830a0e3c18a63d7a641b83f77af3b0b1..2096b73ef403c5e20656cafc0a000fb597a8e3d9 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,8 +9,13 @@ 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';
 
-my $tmpdir = tempdir(CLEANUP => 1);
+sub string_feed {
+       stream_to_string(PublicInbox::Feed::generate($_[0]));
+}
+
+my $tmpdir = tempdir('pi-feed-XXXXXX', TMPDIR => 1, CLEANUP => 1);
 my $git_dir = "$tmpdir/gittest";
 
 {
@@ -31,6 +36,15 @@ Date: Thu, 01 Jan 1970 00:00:00 +0000
 > I quote to much
 > I quote to much
 > I quote to much
+> I quote to much
+> I quote to much
+> I quote to much
+> I quote to much
+> I quote to much
+> I quote to much
+> I quote to much
+> I quote to much
+> I quote to much
 
 msg $i
 
@@ -49,7 +63,7 @@ EOF
 {
        # check initial feed
        {
-               my $feed = PublicInbox::Feed->generate({
+               my $feed = string_feed({
                        git_dir => $git_dir,
                        max => 3
                });
@@ -58,13 +72,11 @@ EOF
                        my $p = XML::Feed->parse(\$feed);
                        is($p->format, "Atom", "parsed atom feed");
                        is(scalar $p->entries, 3, "parsed three entries");
-                       is($p->id, 'public-inbox@example.com',
+                       is($p->id, 'mailto:public-inbox@example.com',
                                "id is set to default");
                }
 
-               unlike($feed, qr/drop me/, "long quoted text dropped");
-               like($feed, qr!/f/\d%40example\.com\.html\b!,
-                       "/f/ url generated for long quoted text");
+               like($feed, qr/drop me/, "long quoted text kept");
                like($feed, qr/inline me here/, "short quoted text kept");
                like($feed, qr/keep me/, "unquoted text saved");
        }
@@ -92,7 +104,7 @@ EOF
 
        # check spam shows up
        {
-               my $spammy_feed = PublicInbox::Feed->generate({
+               my $spammy_feed = string_feed({
                        git_dir => $git_dir,
                        max => 3
                });
@@ -114,7 +126,7 @@ EOF
 
        # spam no longer shows up
        {
-               my $feed = PublicInbox::Feed->generate({
+               my $feed = string_feed({
                        git_dir => $git_dir,
                        max => 3
                });
@@ -131,7 +143,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',
@@ -142,7 +154,8 @@ EOF
                SKIP: {
                        skip 'XML::Feed missing', 3 unless $have_xml_feed;
                        my $p = XML::Feed->parse(\$feed);
-                       is($p->id, 'a@example.com', "ID is set correctly");
+                       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");
                }