X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fcgi.t;h=d3172bf74cbd1820e2ae2104ac95c712fd3ae328;hb=0b1de991a099b5e8b9a9e3e85b5eaaacc9362dbb;hp=a25d2eeb26bc7f7078d721233b83636da8c33c8c;hpb=bfcbbb30ef2001d18219079a7379eb9c99d16cdc;p=public-inbox.git diff --git a/t/cgi.t b/t/cgi.t index a25d2eeb..d3172bf7 100644 --- a/t/cgi.t +++ b/t/cgi.t @@ -7,12 +7,10 @@ use warnings; use Test::More; use Email::MIME; use File::Temp qw/tempdir/; -use Cwd; eval { require IPC::Run }; plan skip_all => "missing IPC::Run for t/cgi.t" if $@; use constant CGI => "blib/script/public-inbox.cgi"; -my $index = "blib/script/public-inbox-index"; my $tmpdir = tempdir('pi-cgi-XXXXXX', TMPDIR => 1, CLEANUP => 1); my $home = "$tmpdir/pi-home"; my $pi_home = "$home/.public-inbox"; @@ -32,6 +30,7 @@ my $cfgpfx = "publicinbox.test"; my %cfg = ( "$cfgpfx.address" => $addr, "$cfgpfx.mainrepo" => $maindir, + "$cfgpfx.indexlevel" => 'basic', ); while (my ($k,$v) = each %cfg) { is(0, system(qw(git config --file), $pi_config, $k, $v), @@ -41,9 +40,12 @@ my $cfgpfx = "publicinbox.test"; use_ok 'PublicInbox::Git'; use_ok 'PublicInbox::Import'; -use_ok 'Email::MIME'; -my $git = PublicInbox::Git->new($maindir); -my $im = PublicInbox::Import->new($git, 'test', $addr); +use_ok 'PublicInbox::Inbox'; +use_ok 'PublicInbox::V1Writable'; +use_ok 'PublicInbox::Config'; +my $cfg = PublicInbox::Config->new($pi_config); +my $ibx = $cfg->lookup_name('test'); +my $im = PublicInbox::V1Writable->new($ibx); { local $ENV{HOME} = $home; @@ -77,24 +79,9 @@ Me wrote: what? EOF $im->add($reply); - $im->done; -} - -# obvious failures, first -{ - local $ENV{HOME} = $home; - my $res = cgi_run("/", "", "PUT"); - like($res->{head}, qr/Status:\s*405/i, "PUT not allowed"); - - $res = cgi_run("/"); - like($res->{head}, qr/Status:\s*404/i, "index returns 404"); -} -# message-id pages -{ - local $ENV{HOME} = $home; my $slashy_mid = 'slashy/asdf@example.com'; - my $reply = Email::MIME->new(<new(< To: Me Cc: $addr @@ -104,30 +91,12 @@ Date: Thu, 01 Jan 1970 00:00:01 +0000 slashy EOF - $im->add($reply); + $im->add($slashy); $im->done; my $res = cgi_run("/test/slashy/asdf\@example.com/raw"); like($res->{body}, qr/Message-Id: <\Q$slashy_mid\E>/, "slashy mid raw hit"); - - $res = cgi_run("/test/blahblah\@example.com/raw"); - like($res->{body}, qr/Message-Id: /, - "mid raw hit"); - - $res = cgi_run("/test/blahblah\@example.com/"); - like($res->{body}, qr/\A/, "mid html hit"); - like($res->{head}, qr/Status: 200 OK/, "200 response"); - - $res = cgi_run("/test/blahblah\@example.com/f/"); - like($res->{head}, qr/Status: 301 Moved/, "301 response"); - like($res->{head}, - qr!^Location: http://[^/]+/test/blahblah\@example\.com/\r\n!ms, - '301 redirect location'); - - $res = cgi_run("/test/new.html"); - like($res->{body}, qr/slashy%2Fasdf\@example\.com/, - "slashy URL generated correctly"); } # retrieve thread as an mbox @@ -136,7 +105,14 @@ EOF my $path = "/test/blahblah\@example.com/t.mbox.gz"; my $res = cgi_run($path); like($res->{head}, qr/^Status: 501 /, "search not-yet-enabled"); - my $indexed = system($index, $maindir) == 0; + my $indexed; + eval { + require DBD::SQLite; + require PublicInbox::SearchIdx; + my $s = PublicInbox::SearchIdx->new($ibx, 1); + $s->index_sync; + $indexed = 1; + }; if ($indexed) { $res = cgi_run($path); like($res->{head}, qr/^Status: 200 /, "search returned mbox"); @@ -149,6 +125,7 @@ EOF }; } else { like($res->{head}, qr/^Status: 501 /, "search not available"); + SKIP: { skip 'DBD::SQLite not available', 2 }; } my $have_xml_feed = eval { require XML::Feed; 1 } if $indexed; @@ -161,6 +138,8 @@ EOF my $p = XML::Feed->parse(\($res->{body})); is($p->format, "Atom", "parsed atom feed"); is(scalar $p->entries, 3, "parsed three entries"); + } else { + SKIP: { skip 'DBD::SQLite or XML::Feed missing', 2 }; } }