Use appropriate prototype depending on perl version in test.

[catagits/Gitalist.git] / t / 01app.t

diff --git a/t/01app.t b/t/01app.t
index d41e889..56f8799 100644 (file)
--- a/t/01app.t
+++ b/t/01app.t
@@ -1,15 +1,13 @@
 #!/usr/bin/env perl
-use strict;
-use warnings;
-use Test::More;
 use FindBin qw/$Bin/;
-use lib "$Bin/lib";
-
 BEGIN {
-    $ENV{GITALIST_CONFIG} = $Bin;
-    $ENV{GITALIST_REPO_DIR} = '';
-    use_ok 'Catalyst::Test', 'Gitalist';
+    my $env = "$FindBin::Bin/../script/env";
+    if (-r $env) {
+        do $env or die $@;
+    }
 }
+
+use lib "$Bin/lib";
 use TestGitalist;
 
 for my $p ('', qw{
@@ -23,43 +21,34 @@ for my $p ('', qw{
 my $response = request('/DoesNotExist');
 is $response->code, 404, 'invalid repository 404s';
 like $response->content, qr/Page not found/, 'invalid repository handled correctly';
-{
-  # URI tests for repo1
-  local *test = curry_test_uri('fragment/repo1');
-  test('');
-  test('shortlog');
-  test('log');
-  test('heads');
-  test('tags');
-  test('36c6c6708b8360d7023e8a1649c45bcf9b3bd818');
-  test('36c6c6708b8360d7023e8a1649c45bcf9b3bd818/tree');
-  test('36c6c6708b8360d7023e8a1649c45bcf9b3bd818/tree/dir1');
-  test('36c6c6708b8360d7023e8a1649c45bcf9b3bd818/diff');
-  test('36c6c6708b8360d7023e8a1649c45bcf9b3bd818/diff/plain');
-  #test('36c6c6708b8360d7023e8a1649c45bcf9b3bd818/shortlog/dir1');
-  test('36c6c6708b8360d7023e8a1649c45bcf9b3bd818/history/dir1');
-  test('36c6c6708b8360d7023e8a1649c45bcf9b3bd818/blame/file1');
-  test('36c6c6708b8360d7023e8a1649c45bcf9b3bd818/blob/file1');
+
+# URI tests for repo1
+foreach my $test (map {curry_test_uri($_)} ('fragment/repo1', 'repo1') ) {
+  $test->('');
+  $test->('shortlog');
+  $test->('log');
+  $test->('heads');
+  $test->('tags');
+  $test->('36c6c6708b8360d7023e8a1649c45bcf9b3bd818');
+  $test->('36c6c6708b8360d7023e8a1649c45bcf9b3bd818/tree');
+  $test->('36c6c6708b8360d7023e8a1649c45bcf9b3bd818/tree/dir1');
+  $test->('36c6c6708b8360d7023e8a1649c45bcf9b3bd818/diff');
+  $test->('36c6c6708b8360d7023e8a1649c45bcf9b3bd818/diff/plain');
+  $test->('36c6c6708b8360d7023e8a1649c45bcf9b3bd818/history/dir1');
+  $test->('36c6c6708b8360d7023e8a1649c45bcf9b3bd818/history/dir1');
+  $test->('36c6c6708b8360d7023e8a1649c45bcf9b3bd818/blame/file1');
+  $test->('36c6c6708b8360d7023e8a1649c45bcf9b3bd818/blob/file1');
 }
 
 {
   # URI tests for repo1
   local *test = curry_test_uri('repo1');
-  test('');
   test('search');
-  test('shortlog');
-  test('log');
-  test('reflog');
-  test('36c6c6708b8360d7023e8a1649c45bcf9b3bd818');
-  test('36c6c6708b8360d7023e8a1649c45bcf9b3bd818/tree');
-  test('36c6c6708b8360d7023e8a1649c45bcf9b3bd818/diff');
+
   test('36c6c6708b8360d7023e8a1649c45bcf9b3bd818/patch');
   test('36c6c6708b8360d7023e8a1649c45bcf9b3bd818/patches/1');
   test('36c6c6708b8360d7023e8a1649c45bcf9b3bd818/patches/2');
-  test('36c6c6708b8360d7023e8a1649c45bcf9b3bd818/history/dir1');
-  test('36c6c6708b8360d7023e8a1649c45bcf9b3bd818/blame/file1');
   test('36c6c6708b8360d7023e8a1649c45bcf9b3bd818/raw/file1');
-  test('36c6c6708b8360d7023e8a1649c45bcf9b3bd818/blob/file1');
 
   TODO: {
       local $TODO = "FIXME";