X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F02git_CollectionOfRepositories_FromDirectory.t;h=69c812773834262d6b4b61b809a3e8743b6e5a6a;hb=7b5bdee05283b67c7ee10d8c150ab19fec335541;hp=c1f1ac8292de91908d4de2346aa8e977112dc453;hpb=b5ce0e6a831a665b6921a64d971e8703fd5487a3;p=catagits%2FGitalist.git

diff --git a/t/02git_CollectionOfRepositories_FromDirectory.t b/t/02git_CollectionOfRepositories_FromDirectory.t
index c1f1ac8..69c8127 100644
--- a/t/02git_CollectionOfRepositories_FromDirectory.t
+++ b/t/02git_CollectionOfRepositories_FromDirectory.t
@@ -1,14 +1,22 @@
+use FindBin qw/$Bin/;
+BEGIN {
+    my $env = "$FindBin::Bin/../script/env";
+    if (-r $env) {
+        do $env or die $@;
+    }
+}
+
 use strict;
 use warnings;
-use FindBin qw/$Bin/;
 use Test::More qw/no_plan/;
 use Test::Exception;
 
+use Path::Class 'dir';
 use Data::Dumper;
 
 BEGIN { use_ok 'Gitalist::Git::CollectionOfRepositories::FromDirectory' }
 
-my $repo_dir = "$Bin/lib/repositories";
+my $repo_dir = dir( "$Bin/lib/repositories" );
 my $repo = Gitalist::Git::CollectionOfRepositories::FromDirectory->new( repo_dir => $repo_dir );
 isa_ok($repo, 'Gitalist::Git::CollectionOfRepositories::FromDirectory');
 
@@ -19,32 +27,29 @@ use Path::Class;
 my $repoBare = Path::Class::Dir->new('t/lib/repositories/bare.git');
 ok( $repo->_is_git_repo( $repoBare ), 'is_git_repo true for bare git repo' );
 
-# 'working' is a working copy w/ git repo in the repository dir
-my $repoWorking = Path::Class::Dir->new('t/lib/repositories/working');
-
 # 'empty.git' is an empty directory in the repository dir
 my $repoEmpty = Path::Class::Dir->new('t/lib/repositories/empty.git');
 ok( ! $repo->_is_git_repo( $repoEmpty ), 'is_git_repo is false for empty dir' );
 
-my $project_list = $repo->projects;
-ok(scalar @{$project_list} == 3, 'list_projects returns an array with the correct number of members' );
-isa_ok($project_list->[0], 'Gitalist::Git::Repository');
-is($project_list->[0]->{name}, 'bare.git', 'list_projects has correct name for "bare.git" repo' );
+my $repository_list = $repo->repositories;
+ok(scalar @{$repository_list} == 3, '->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' );
 
 dies_ok {
-    my $project = $repo->get_repository('NoSuchRepository');
-} 'throws exception for invalid project';
+    my $repository = $repo->get_repository('NoSuchRepository');
+} 'throws exception for invalid repository';
 
 dies_ok {
-    my $project = $repo->get_repository();
-} 'throws exception for no project';
+    my $repository = $repo->get_repository();
+} 'throws exception for no repository';
 
 dies_ok {
-    my $project = $repo->get_repository('../../../');
+    my $repository = $repo->get_repository('../../../');
 } 'throws exception for directory traversal';
 
-my $project = $repo->get_repository('repo1');
-isa_ok($project, 'Gitalist::Git::Repository');
+my $repository = $repo->get_repository('repo1');
+isa_ok($repository, 'Gitalist::Git::Repository');
 
 
 # check for bug where get_repository blew up if repo_dir
@@ -54,3 +59,13 @@ lives_ok {
     my $repo2 = Gitalist::Git::CollectionOfRepositories::FromDirectory->new( repo_dir => $repo2_dir );
     my $repo2_proj = $repo2->get_repository('repo1');
 } 'relative repo_dir properly handled';
+
+my $repo_eok = Gitalist::Git::CollectionOfRepositories::FromDirectory->new(
+    repo_dir  => $repo_dir,
+    export_ok => 'export-ok',
+);
+
+my @eok_repos = @{$repo_eok->repositories};
+
+is(1, @eok_repos, "Found the 1 export-ok repo");
+is('repo1', $eok_repos[0]->name, "Found repo1 export-ok repo");