X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Ffeed.t;h=5ad90a07c1c8c1bd0f346f661b7170567f473965;hb=256b3566e4d57a64bb349a7b896da10381a2a363;hp=71cbb7356e7287b6b304330b70b15c6feec8b27c;hpb=f76f265a851944b5dedcc3be5f3b5224b6ebda89;p=public-inbox.git
diff --git a/t/feed.t b/t/feed.t
index 71cbb735..5ad90a07 100644
--- a/t/feed.t
+++ b/t/feed.t
@@ -1,29 +1,42 @@
-# Copyright (C) 2014-2015 all contributors
-# License: AGPLv3 or later (https://www.gnu.org/licenses/agpl-3.0.txt)
+# Copyright (C) 2014-2020 all contributors
+# License: AGPL-3.0+
use strict;
use warnings;
use Test::More;
-use Email::Simple;
+use PublicInbox::Eml;
use PublicInbox::Feed;
-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';
+use PublicInbox::Import;
+use PublicInbox::Inbox;
+my $have_xml_treepp = eval { require XML::TreePP; 1 };
+use PublicInbox::TestCommon;
sub string_feed {
- stream_to_string(PublicInbox::Feed::generate($_[0]));
+ my $res = PublicInbox::Feed::generate($_[0]);
+ my $body = $res->[2];
+ my $str = '';
+ while (defined(my $chunk = $body->getline)) {
+ $str .= $chunk;
+ }
+ $body->close;
+ $str;
}
-my $tmpdir = tempdir(CLEANUP => 1);
+my ($tmpdir, $for_destroy) = tmpdir();
my $git_dir = "$tmpdir/gittest";
+my $ibx = PublicInbox::Inbox->new({
+ address => 'test@example',
+ name => 'testbox',
+ inboxdir => $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");
- local $ENV{GIT_DIR} = $git_dir;
-
+ $im->init_bare;
foreach my $i (1..6) {
- my $simple = Email::Simple->new(<new(<
To: U
Message-Id: <$i\@example.com>
@@ -53,32 +66,28 @@ msg $i
keep me
EOF
- my $str = $simple->as_string;
- run(['ssoma-mda', $git_dir], \$str) or
- die "mda failed: $?\n";
+ like($im->add($mime), qr/\A:\d+/, 'added');
}
+ $im->done;
}
# spam check
{
# 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',
- "id is set to default");
+ skip 'XML::TreePP missing', 3 unless $have_xml_treepp;
+ my $t = XML::TreePP->new->parse($feed);
+ like($t->{feed}->{-xmlns}, qr/\bAtom\b/,
+ 'looks like an an Atom feed');
+ is(scalar @{$t->{feed}->{entry}}, 3,
+ 'parsed three entries');
+ is($t->{feed}->{id}, 'mailto:test@example',
+ 'id is set to default');
}
- unlike($feed, qr/drop me/, "long quoted text dropped");
- like($feed, qr!/\d%40example\.com/f/#q!,
- "/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");
}
@@ -86,13 +95,7 @@ EOF
# add a new spam message
my $spam;
{
- my $pid = open(my $pipe, "|-");
- defined $pid or die "fork/pipe failed: $!\n";
- if ($pid == 0) {
- exec("ssoma-mda", $git_dir);
- }
-
- $spam = Email::Simple->new(<new(<
To: U
Message-Id:
@@ -100,68 +103,41 @@ Subject: SPAM!!!!!!!!
Date: Thu, 01 Jan 1970 00:00:00 +0000
EOF
- print $pipe $spam->as_string or die "print failed: $!\n";
- close $pipe or die "close pipe failed: $!\n";
+ $im->add($spam);
+ $im->done;
}
# 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);
- is($p->format, "Atom", "parsed atom feed");
- is(scalar $p->entries, 3, "parsed three entries");
+ skip 'XML::TreePP missing', 2 unless $have_xml_treepp;
+ my $t = XML::TreePP->new->parse($spammy_feed);
+ like($t->{feed}->{-xmlns}, qr/\bAtom\b/,
+ 'looks like an an Atom feed');
+ is(scalar @{$t->{feed}->{entry}}, 3,
+ 'parsed three entries');
}
like($spammy_feed, qr/SPAM/s, "spam showed up :<");
}
# nuke spam
- {
- my $spam_str = $spam->as_string;
- run(["ssoma-rm", $git_dir], \$spam_str) or
- die "ssoma-rm failed: $?\n";
- }
+ $im->remove($spam);
+ $im->done;
# 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);
- is($p->format, "Atom", "parsed atom feed");
- is(scalar $p->entries, 3, "parsed three entries");
+ skip 'XML::TreePP missing', 2 unless $have_xml_treepp;
+ my $t = XML::TreePP->new->parse($feed);
+ like($t->{feed}->{-xmlns}, qr/\bAtom\b/,
+ 'looks like an an Atom feed');
+ is(scalar @{$t->{feed}->{entry}}, 3,
+ 'parsed three entries');
}
unlike($feed, qr/SPAM/, "spam gone :>");
}
}
-# check pi_config
-{
- foreach my $addr (('a@example.com'), ['a@example.com','b@localhost']) {
- my $feed = string_feed({
- git_dir => $git_dir,
- max => 3,
- listname => '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();