use Test::More;
use Email::MIME;
use File::Temp qw/tempdir/;
-use Cwd;
-use IPC::Run qw/run/;
my $psgi = "examples/public-inbox.psgi";
-my $mda = "blib/script/public-inbox-mda";
-my $tmpdir = tempdir(CLEANUP => 1);
-my $home = "$tmpdir/pi-home";
-my $pi_home = "$home/.public-inbox";
-my $pi_config = "$pi_home/config";
+my $tmpdir = tempdir('pi-plack-XXXXXX', TMPDIR => 1, CLEANUP => 1);
+my $pi_config = "$tmpdir/config";
my $maindir = "$tmpdir/main.git";
-my $main_bin = getcwd()."/t/main-bin";
-my $main_path = "$main_bin:$ENV{PATH}"; # for spamc ham mock
my $addr = 'test-public@example.com';
my $cfgpfx = "publicinbox.test";
-my $failbox = "$home/fail.mbox";
-local $ENV{PI_EMERGENCY} = $failbox;
+my @mods = qw(HTTP::Request::Common Plack::Request Plack::Test
+ Mail::Thread URI::Escape);
+foreach my $mod (@mods) {
+ eval "require $mod";
+ plan skip_all => "$mod missing for plack.t" if $@;
+}
+use_ok 'PublicInbox::Import';
+use_ok 'PublicInbox::Git';
-our $have_plack;
-eval {
- require Plack::Request;
- eval 'use Plack::Test; use HTTP::Request::Common';
- $have_plack = 1;
-};
-SKIP: {
- skip 'Plack not installed', 1 unless $have_plack;
+foreach my $mod (@mods) { use_ok $mod; }
+{
ok(-f $psgi, "psgi example file found");
- ok(-x "$main_bin/spamc",
- "spamc ham mock found (run in top of source tree");
- ok(-x $mda, "$mda is executable");
- is(1, mkdir($home, 0755), "setup ~/ for testing");
- is(1, mkdir($pi_home, 0755), "setup ~/.public-inbox");
is(0, system(qw(git init -q --bare), $maindir), "git init (main)");
open my $fh, '>', "$maindir/description" or die "open: $!\n";
print $fh "test for public-inbox\n";
my %cfg = (
"$cfgpfx.address" => $addr,
"$cfgpfx.mainrepo" => $maindir,
+ "$cfgpfx.url" => 'http://example.com/test/',
+ "$cfgpfx.newsgroup" => 'inbox.test',
);
while (my ($k,$v) = each %cfg) {
is(0, system(qw(git config --file), $pi_config, $k, $v),
"setup $k");
}
- local $ENV{HOME} = $home;
- local $ENV{ORIGINAL_RECIPIENT} = $addr;
-
# ensure successful message delivery
{
- my $simple = Email::Simple->new(<<EOF);
+ my $mime = Email::MIME->new(<<EOF);
From: Me <me\@example.com>
To: You <you\@example.com>
Cc: $addr
zzzzzz
EOF
- my $in = $simple->as_string;
- run_with_env({PATH => $main_path}, [$mda], \$in);
- local $ENV{GIT_DIR} = $maindir;
- my $rev = `git rev-list HEAD`;
+ my $git = PublicInbox::Git->new($maindir);
+ my $im = PublicInbox::Import->new($git, 'test', $addr);
+ $im->add($mime);
+ $im->done;
+ my $rev = `git --git-dir="$maindir" rev-list HEAD`;
like($rev, qr/\A[a-f0-9]{40}/, "good revision committed");
}
- my $app = require $psgi;
+ my $app = eval {
+ local $ENV{PI_CONFIG} = $pi_config;
+ require $psgi;
+ };
+
+ test_psgi($app, sub {
+ my ($cb) = @_;
+ foreach my $u (qw(robots.txt favicon.ico .well-known/foo)) {
+ my $res = $cb->(GET("http://example.com/$u"));
+ is($res->code, 404, "$u is missing");
+ }
+ });
+
+ # redirect with newsgroup
+ test_psgi($app, sub {
+ my ($cb) = @_;
+ my $from = 'http://example.com/inbox.test';
+ my $to = 'http://example.com/test/';
+ my $res = $cb->(GET($from));
+ is($res->code, 301, 'newsgroup name is permanent redirect');
+ is($to, $res->header('Location'), 'redirect location matches');
+ $from .= '/';
+ is($res->code, 301, 'newsgroup name/ is permanent redirect');
+ is($to, $res->header('Location'), 'redirect location matches');
+ });
# redirect with trailing /
test_psgi($app, sub {
is($to, $res->header('Location'), 'redirect location matches');
});
+ my $pfx = 'http://example.com/test';
+ foreach my $t (qw(t T)) {
+ test_psgi($app, sub {
+ my ($cb) = @_;
+ my $u = $pfx . "/blah%40example.com/$t";
+ my $res = $cb->(GET($u));
+ is(301, $res->code, "redirect for missing /");
+ my $location = $res->header('Location');
+ like($location, qr!/t/#u\z!,
+ 'redirected with missing /');
+ });
+ }
+ foreach my $t (qw(f)) {
+ test_psgi($app, sub {
+ my ($cb) = @_;
+ my $u = $pfx . "/blah%40example.com/$t";
+ my $res = $cb->(GET($u));
+ is(301, $res->code, "redirect for legacy /f");
+ my $location = $res->header('Location');
+ like($location, qr!/blah%40example\.com/\z!,
+ 'redirected with missing /');
+ });
+ }
+
test_psgi($app, sub {
my ($cb) = @_;
my $atomurl = 'http://example.com/test/new.atom';
'index generated');
});
- my $pfx = 'http://example.com/test';
test_psgi($app, sub {
my ($cb) = @_;
my $res = $cb->(GET($pfx . '/atom.xml'));
'atom feed generated correct URL');
});
- foreach my $t (('', 'f/')) {
- test_psgi($app, sub {
- my ($cb) = @_;
- my $path = "/blah%40example.com/$t";
- my $res = $cb->(GET($pfx . $path));
- is(200, $res->code, "success for $path");
- like($res->content, qr!<title>hihi - Me</title>!,
- "HTML returned");
- });
- }
+ test_psgi($app, sub {
+ my ($cb) = @_;
+ my $path = '/blah%40example.com/';
+ my $res = $cb->(GET($pfx . $path));
+ is(200, $res->code, "success for $path");
+ like($res->content, qr!<title>hihi - Me</title>!,
+ "HTML returned");
+
+ $path .= 'f/';
+ $res = $cb->(GET($pfx . $path));
+ is(301, $res->code, "redirect for $path");
+ my $location = $res->header('Location');
+ like($location, qr!/blah%40example\.com/\z!,
+ '/$MESSAGE_ID/f/ redirected to /$MESSAGE_ID/');
+ });
+
test_psgi($app, sub {
my ($cb) = @_;
my $res = $cb->(GET($pfx . '/blah%40example.com/raw'));
is(200, $res->code, 'success response received for /*/raw');
- like($res->content, qr!\AFrom !, "mbox returned");
+ like($res->content, qr!^From !sm, "mbox returned");
});
# legacy redirects
my %umap = (
'm' => '',
- 'f' => 'f/',
+ 'f' => '',
't' => 't/',
);
while (my ($t, $e) = each %umap) {
}
done_testing();
-
-sub run_with_env {
- my ($env, @args) = @_;
- my $init = sub { foreach my $k (keys %$env) { $ENV{$k} = $env->{$k} } };
- run(@args, init => $init);
-}