X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F01app.t;h=256c2ed43fa46f3c8125132a26007721086865f4;hb=ade777e57a93cbf76e27268c1fe45835eb14ba48;hp=267e80537e5944cf2653a58b860018143f66ac5b;hpb=f2338f4f3142b64ccd1994ddb3565ee34b3b7a5f;p=catagits%2FGitalist.git

diff --git a/t/01app.t b/t/01app.t
index 267e805..256c2ed 100644
--- a/t/01app.t
+++ b/t/01app.t
@@ -1,47 +1,64 @@
 #!/usr/bin/env perl
 use strict;
 use warnings;
-use Test::More qw/no_plan/;
+use Test::More;
+use FindBin qw/$Bin/;
 
-BEGIN { use_ok 'Catalyst::Test', 'Gitalist' }
+BEGIN {
+    $ENV{GITALIST_CONFIG} = $Bin;
+    $ENV{GITALIST_REPO_DIR} = '';
+    use_ok 'Catalyst::Test', 'Gitalist';
+}
+
+ok( request('/')->is_success, 'Request should succeed' );
 
-# Full tests are only run if the APP_TEST env var is set.
-# This is needed to load the test configuration.
-diag("*** SKIPPING app tests.
-*** Set APP_TEST for the tests to run fully") if !$ENV{APP_TEST};
-SKIP: {
-  skip "Set APP_TEST for the tests to run fully",
-    1 if !$ENV{APP_TEST};
+for my $p (qw/ repo1 nodescription bare.git opml /) {
+    my $path = '/' . $p;
+    ok( request($path)->is_success, "$path should succeed");
+}
 
-  ok( request('/')->is_success, 'Request should succeed' );
+my $response = request('/DoesNotExist');
+is $response->code, 404, 'invalid repository 404s';
+like $response->content, qr/Page not found/, 'invalid repository handled correctly';
 
+is request('/../../../')->code, 404, 'directory traversal failed';
+is request('/..%2F..%2F../')->code, 404, 'directory traversal failed';
 
+{
   # URI tests for repo1
-  use Data::Dumper;
-  my $test_repo1 = curry_test_uri('repo1');
-  &$test_repo1('/summary');
-  &$test_repo1('/shortlog');
-  &$test_repo1('/log');
-  &$test_repo1('/commit');
-  &$test_repo1('/commitdiff', 'h=36c6c6708b8360d7023e8a1649c45bcf9b3bd818');
-  &$test_repo1('/tree', 'h=145dc3ef5d307be84cb9b325d70bd08aeed0eceb;hb=36c6c6708b8360d7023e8a1649c45bcf9b3bd818');
-#  &$test_repo1('/', 'a=blob;f=file1');
-
-} # Close APP_TEST skip
+  local *test = curry_test_uri('repo1');
+  test('/summary');
+  test('/shortlog');
+  test('/log');
+  test('/reflog');
+  test('/commit');
+  test('/commitdiff', 'h=36c6c6708b8360d7023e8a1649c45bcf9b3bd818');
+  test('/tree', 'h=145dc3ef5d307be84cb9b325d70bd08aeed0eceb;hb=36c6c6708b8360d7023e8a1649c45bcf9b3bd818');
+  test('/search', 'h=36c6c6708b8360d7023e8a1649c45bcf9b3bd818&f=&type=commit&text=added');
+  test('/blobdiff', 'f=file1;h=5716ca5987cbf97d6bb54920bea6adde242d87e6;hp=257cc5642cb1a054f08cc83f2d943e56fd3ebe99;hb=refs/heads/master;hpb=3bc0634310b9c62222bb0e724c11ffdfb297b4ac');
+  test('/blob', 'f=dir1/file2;hb=36c6c6708b8360d7023e8a1649c45bcf9b3bd818');
+  test('/patch');
+  test('/patch', 'h=3f7567c7bdf7e7ebf410926493b92d398333116e');
+  test('/patch', 'h=3f7567c7bdf7e7ebf410926493b92d398333116e;hp=3bc0634310b9c62222bb0e724c11ffdfb297b4ac');
+  test('/patches');
+  test('/patches', 'h=3f7567c7bdf7e7ebf410926493b92d398333116e');
+  test('/patches', 'h=3f7567c7bdf7e7ebf410926493b92d398333116e;hp=3bc0634310b9c62222bb0e724c11ffdfb297b4ac');
+}
+
+done_testing;
 
 sub test_uri {
     my ($p, $uri, $qs) = @_;
     $qs ||= '';
     my $request = "$uri?p=repo1;$qs";
-    warn("request: $request");
     my $response = request($request);
-    ok($response->is_success, "ok $p - $uri");
+    ok($response->is_success, "ok $p - $uri - $qs");
 }
 
 sub curry_test_uri {
     my $p = shift;
     sub {
-        my $uri = shift;
-        test_uri($p, $uri);
+        my ($uri, $qs) = @_;
+        test_uri($p, $uri, $qs);
     };
 };