X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F02git_CollectionOfRepositories_FromDirectoryRecursive.t;h=e407aea23cb32160a005f653cfbf5fe3b88d6ed6;hb=411e6add0ce830c969c70f639e15b17de0ad4750;hp=dbaf46ecebce464ef120637045bc5a3b3382886c;hpb=e473ebf68b3c0f46ff946bafbf0d62a52995e854;p=catagits%2FGitalist.git

diff --git a/t/02git_CollectionOfRepositories_FromDirectoryRecursive.t b/t/02git_CollectionOfRepositories_FromDirectoryRecursive.t
index dbaf46e..e407aea 100644
--- a/t/02git_CollectionOfRepositories_FromDirectoryRecursive.t
+++ b/t/02git_CollectionOfRepositories_FromDirectoryRecursive.t
@@ -24,30 +24,30 @@ is($repo->repo_dir, $repo_dir, "repo->repo_dir is correct" );
 # 'bare.git' is a bare git repository in the repository dir
 
 my $repository_list = $repo->repositories;
-ok(scalar @{$repository_list} == 5, '->repositories is an array with the correct number of members' );
+is( scalar @{$repository_list}, 5, '->repositories is an array with the correct number of members' );
 isa_ok($repository_list->[0], 'Gitalist::Git::Repository');
-is($repository_list->[0]->{name}, 'bare.git', '->repositories has correct name for "bare.git" repo' );
+my @sorted_names = sort map { $_->{name} } @{$repository_list};
+is_deeply( \@sorted_names, [ qw( bare.git barerecursive.git nodescription repo1 scratch.git) ], 'Repositories are correctly loaded' );
 
 dies_ok {
-    my $repository = $repo->get_repository('NoSuchRepository');
+  my $repository = $repo->get_repository("$repo_dir/NoSuchRepository");
 } 'throws exception for invalid repository';
 
 dies_ok {
-    my $repository = $repo->get_repository();
+  my $repository = $repo->get_repository();
 } 'throws exception for no repository';
 
 dies_ok {
-    my $repository = $repo->get_repository('../../../');
-} 'throws exception for directory traversal';
+  my $repository = $repo->get_repository('../../../');
+} 'Relative directory not contained within repo_dir';
 
-my $repository = $repo->get_repository('repo1');
+my $repository = $repo->get_repository( "$repo_dir/repo1" );
 isa_ok($repository, 'Gitalist::Git::Repository');
 
-
 # check for bug where get_repository blew up if repo_dir
 # was a relative path
 lives_ok {
-    my $repo2_dir = "$Bin/lib/../lib/repositories";
-    my $repo2 = Gitalist::Git::CollectionOfRepositories::FromDirectoryRecursive->new( repo_dir => $repo2_dir );
-    my $repo2_proj = $repo2->get_repository('repo1');
+  my $repo2_dir = "$Bin/lib/../lib/repositories";
+  my $repo2 = Gitalist::Git::CollectionOfRepositories::FromDirectoryRecursive->new( repo_dir => $repo2_dir );
+  my $repo2_proj = $repo2->get_repository("$repo2_dir/repo1");
 } 'relative repo_dir properly handled';