Win32 can have git binaries with extensions, and non-/ path separators

[catagits/Gitalist.git] / t / 02git_util.t

diff --git a/t/02git_util.t b/t/02git_util.t
index 730754a..428677d 100644 (file)
--- a/t/02git_util.t
+++ b/t/02git_util.t
@@ -1,23 +1,32 @@
+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::More;
 
 use Data::Dumper;
 
-BEGIN { use_ok 'Gitalist::Git::Util' }
+BEGIN {
+    use_ok 'Gitalist::Git::Util';
+    use_ok 'Gitalist::Git::Repository';
+}
 
 use Path::Class;
 my $gitdir = dir("$Bin/lib/repositories/repo1");
 
-my $proj = Gitalist::Git::Util->new(
-    gitdir => $gitdir,
+my $proj = Gitalist::Git::Repository->new($gitdir);
+my $util = Gitalist::Git::Util->new(
+    repository => $proj,
 );
-isa_ok($proj, 'Gitalist::Git::Util');
-
-like( $proj->_git, qr#/git$#, 'git binary found');
-isa_ok($proj->_gpp, 'Git::PurePerl', 'gpp instance created');
-is($proj->gitdir, $gitdir, 'repository path is set');
-
+isa_ok($util, 'Gitalist::Git::Util');
 
+like( $util->_git, qr#\bgit(\.\w+)*$#, 'git binary found');
+isa_ok($util->gpp, 'Git::PurePerl', 'gpp instance created');
 
+done_testing;