X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Ffeed.t;h=cc5ae277f7c1e397b59e98429aff85c87badfc50;hb=2f8d15b1170b137a0512a4f3163b236a5dcbf0b8;hp=ffd5ca7e71f86dc9a37ba5d1865dc38e11619f5a;hpb=4bebfa0c80ad7f4596a7dca98b39121470a42af0;p=public-inbox.git

diff --git a/t/feed.t b/t/feed.t
index ffd5ca7e..cc5ae277 100644
--- a/t/feed.t
+++ b/t/feed.t
@@ -1,14 +1,14 @@
-# Copyright (C) 2014-2020 all contributors <meta@public-inbox.org>
+#!perl -w
+# Copyright (C) 2014-2021 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;
-use Email::MIME;
+use v5.10.1;
+use PublicInbox::TestCommon;
+use PublicInbox::Eml;
 use PublicInbox::Feed;
-use PublicInbox::Import;
 use PublicInbox::Inbox;
 my $have_xml_treepp = eval { require XML::TreePP; 1 };
-use PublicInbox::TestCommon;
+my ($tmpdir, $for_destroy) = tmpdir();
 
 sub string_feed {
 	my $res = PublicInbox::Feed::generate($_[0]);
@@ -21,45 +21,18 @@ sub string_feed {
 	$str;
 }
 
-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');
-
-{
-	$im->init_bare;
-	local $ENV{GIT_DIR} = $git_dir;
-
+my $ibx = create_inbox 'v1', tmpdir => $git_dir, sub {
+	my ($im, $ibx) = @_;
 	foreach my $i (1..6) {
-		my $mime = Email::MIME->new(<<EOF);
+		$im->add(PublicInbox::Eml->new(<<EOF)) or BAIL_OUT;
 From: ME <me\@example.com>
 To: U <u\@example.com>
 Message-Id: <$i\@example.com>
 Subject: zzz #$i
 Date: Thu, 01 Jan 1970 00:00:00 +0000
 
-> This is a long multi line quote so it should not be allowed to
-> show up in its entirty in the Atom feed.  drop me
-> 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
-> I quote to much
+> drop me
 
 msg $i
 
@@ -68,16 +41,18 @@ msg $i
 
 keep me
 EOF
-		like($im->add($mime), qr/\A:\d+/, 'added');
 	}
-	$im->done;
-}
+};
+
+$ibx->{url} = [ 'http://example.com/test' ];
+$ibx->{feedmax} = 3;
+my $im = $ibx->importer(0);
 
 # spam check
 {
 	# check initial feed
 	{
-		my $feed = string_feed({ -inbox => $ibx });
+		my $feed = string_feed({ ibx => $ibx });
 		SKIP: {
 			skip 'XML::TreePP missing', 3 unless $have_xml_treepp;
 			my $t = XML::TreePP->new->parse($feed);
@@ -85,7 +60,7 @@ EOF
 				'looks like an an Atom feed');
 			is(scalar @{$t->{feed}->{entry}}, 3,
 				'parsed three entries');
-			is($t->{feed}->{id}, 'mailto:test@example',
+			is($t->{feed}->{id}, 'mailto:v1@example.com',
 				'id is set to default');
 		}
 
@@ -97,7 +72,7 @@ EOF
 	# add a new spam message
 	my $spam;
 	{
-		$spam = Email::MIME->new(<<EOF);
+		$spam = PublicInbox::Eml->new(<<EOF);
 From: SPAMMER <spammer\@example.com>
 To: U <u\@example.com>
 Message-Id: <this-is-spam\@example.com>
@@ -111,7 +86,7 @@ EOF
 
 	# check spam shows up
 	{
-		my $spammy_feed = string_feed({ -inbox => $ibx });
+		my $spammy_feed = string_feed({ ibx => $ibx });
 		SKIP: {
 			skip 'XML::TreePP missing', 2 unless $have_xml_treepp;
 			my $t = XML::TreePP->new->parse($spammy_feed);
@@ -129,7 +104,7 @@ EOF
 
 	# spam no longer shows up
 	{
-		my $feed = string_feed({ -inbox => $ibx });
+		my $feed = string_feed({ ibx => $ibx });
 		SKIP: {
 			skip 'XML::TreePP missing', 2 unless $have_xml_treepp;
 			my $t = XML::TreePP->new->parse($feed);
@@ -142,4 +117,4 @@ EOF
 	}
 }
 
-done_testing();
+done_testing;