X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F03legacy_uri.t;h=efc63c9babfdd17737ec1ff49dd1007d3e050d77;hb=460b079a490cc638ecdd666c63d8edc09b7a8bcc;hp=c85e931ddd44e73aeb757f0434f5cc7473fd9eee;hpb=ad6d2173f31725760889ab066327d0bf372ec6da;p=catagits%2FGitalist.git

diff --git a/t/03legacy_uri.t b/t/03legacy_uri.t
index c85e931..efc63c9 100644
--- a/t/03legacy_uri.t
+++ b/t/03legacy_uri.t
@@ -1,5 +1,12 @@
 #!/usr/bin/env perl
 use FindBin qw/$Bin/;
+BEGIN {
+    my $env = "$FindBin::Bin/../script/env";
+    if (-r $env) {
+        do $env or die $@;
+    }
+}
+
 use lib "$Bin/lib";
 use TestGitalist qw/request curry_test_uri done_testing ok is $TODO/;
 
@@ -7,10 +14,11 @@ ok( request('/')->is_success, 'Request should succeed' );
 
 sub test {
     my ($uri, $qs) = @_;
-    my $request = $uri; 
+    my $request = "/$uri";
+    $request =~ s{/+}{/}g;
     $request .= "?$qs" if defined $qs;
     my $response = request($request);
-    $uri = $response->header('Location');
+    $uri = $response->header('Location') || '';
     is($response->code, 301, "ok $request 301 to " . $uri)
         or return $response;
     $response = request($uri);
@@ -24,10 +32,10 @@ sub test {
 test('/', 'a=project_index');
 test('/', 'a=opml');
 
-{
-    local *test = curry_test_uri('repos1', \&test);
-    local $TODO = 'FIXME';
-
+no warnings 'redefine';
+local *test = curry_test_uri('repo1', \&test);
+test('/', 'a=project_index');
+test('/', 'a=opml');
 test('/', 'a=summary');
 test('/', 'a=heads');
 test('/', 'a=tags');
@@ -61,6 +69,7 @@ test('/', 'a=blob_plain;f=file1;hb=HEAD');
 test('/', 'a=blob_plain;f=file1;hb=master');
 test('/', 'a=blob_plain;f=file1;hb=refs/heads/master');
 
+
 test('/', 'a=blobdiff;f=file1;h=5716ca5987cbf97d6bb54920bea6adde242d87e6;hp=257cc5642cb1a054f08cc83f2d943e56fd3ebe99;hb=36c6c6708b8360d7023e8a1649c45bcf9b3bd818;hpb=3bc0634310b9c62222bb0e724c11ffdfb297b4ac');
 test('/', 'a=blobdiff;f=file1;h=5716ca5987cbf97d6bb54920bea6adde242d87e6;hp=257cc5642cb1a054f08cc83f2d943e56fd3ebe99;hb=3f7567c7bdf7e7ebf410926493b92d398333116e;hpb=3bc0634310b9c62222bb0e724c11ffdfb297b4ac');
 test('/', 'a=blobdiff;f=file1;h=5716ca5987cbf97d6bb54920bea6adde242d87e6;hp=257cc5642cb1a054f08cc83f2d943e56fd3ebe99;hb=HEAD;hpb=3bc0634310b9c62222bb0e724c11ffdfb297b4ac');
@@ -109,7 +118,6 @@ test('/', 'a=commitdiff_plain;h=master;hp=3f7567c7bdf7e7ebf410926493b92d39833311
 test('/', 'a=commitdiff_plain;h=refs/heads/master');
 test('/', 'a=commitdiff_plain;h=refs/heads/master;hp=3f7567c7bdf7e7ebf410926493b92d398333116e');
 
-
 test('/', 'a=history;f=dir1/file2;h=257cc5642cb1a054f08cc83f2d943e56fd3ebe99;hb=36c6c6708b8360d7023e8a1649c45bcf9b3bd818');
 test('/', 'a=history;f=dir1/file2;h=257cc5642cb1a054f08cc83f2d943e56fd3ebe99;hb=HEAD');
 test('/', 'a=history;f=dir1/file2;h=257cc5642cb1a054f08cc83f2d943e56fd3ebe99;hb=master');
@@ -213,7 +221,6 @@ test('/', 'a=tree;hb=HEAD');
 test('/', 'a=tree;hb=master');
 test('/', 'a=tree;hb=refs/heads/master');
 
-
 test('/', 'a=atom');
 test('/', 'a=atom;f=dir1');
 test('/', 'a=atom;f=dir1/file2');
@@ -254,7 +261,4 @@ test('/', 'a=blame;f=file1;h=5716ca5987cbf97d6bb54920bea6adde242d87e6;hb=refs/he
 test('/', 'a=blame;f=file1;hb=3bc0634310b9c62222bb0e724c11ffdfb297b4ac');
 test('/', 'a=blame;f=file1;hb=3f7567c7bdf7e7ebf410926493b92d398333116e');
 
-}
-
 done_testing;
-