X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Flib%2FTestGitalist.pm;h=3a19af3e5009441c6ebbf059ff904a67210bb7b7;hb=460b079a490cc638ecdd666c63d8edc09b7a8bcc;hp=0dce3b450479d20715e3767910cd91e177528a3f;hpb=cd196b663bbfb27d97aecabd00d7f01891681b59;p=catagits%2FGitalist.git

diff --git a/t/lib/TestGitalist.pm b/t/lib/TestGitalist.pm
index 0dce3b4..3a19af3 100644
--- a/t/lib/TestGitalist.pm
+++ b/t/lib/TestGitalist.pm
@@ -1,20 +1,47 @@
 package TestGitalist;
 use strict;
 use warnings;
-use Exporter qw/import/;
+use Exporter ();
+use FindBin qw/$Bin/;
+BEGIN {
+    $ENV{GITALIST_CONFIG} = $Bin;
+    $ENV{GITALIST_REPO_DIR} = '';
+}
 use Catalyst::Test qw/Gitalist/;
 use Test::More;
+use Test::Exception;
 
-our @EXPORT = qw/
+our @EXPORT = (@Test::More::EXPORT, @Test::Exception::EXPORT, qw/
     test_uri
     curry_test_uri
-/;
+    MECH
+    request
+    get
+    ctx_request
+    content_like
+    action_ok
+    action_redirect
+    action_notfound
+    contenttype_is
+/);
+
+sub import {
+    my $into = caller();
+    strict->import;
+    warnings->import;
+    goto \&Exporter::import;
+}
 
 use constant ();
 BEGIN {
     my $mech = eval {
         require Test::WWW::Mechanize::Catalyst;
-        Test::WWW::Mechanize::Catalyst->new(catalyst_app => 'Gitalist')
+        require WWW::Mechanize::TreeBuilder;
+        my $mech = Test::WWW::Mechanize::Catalyst->new(catalyst_app => 'Gitalist');
+        WWW::Mechanize::TreeBuilder->meta->apply($mech,
+           tree_class => 'HTML::TreeBuilder::XPath',
+        );
+        return $mech;
     };
     constant->import('MECH', $mech );
 }
@@ -43,10 +70,10 @@ sub Test::WWW::Mechanize::Catalyst::page_links_ok {
 
 sub test_uri {
     my ($uri, $qs) = @_;
-    my $request = "/$uri"; 
+    my $request = "/$uri";
     $request .= "?$qs" if defined $qs;
     my $response = request($request);
-    ok($response->is_success, "ok $request");
+    ok($response->is_success || $response->is_redirect, "ok $request");
     if (MECH) {
         my $res = MECH()->get($request);
         ok $res->is_success, "ok mech $request (" . $res->code . ')';