X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=t%2F21-once.t;h=65accd21f74d428c7611dac9dc9bd60c9aff6b2e;hb=e24fcce942bbff836770d333a4a919a26872db6d;hp=4e0c4ac8219bb671e5e9de5e7e7a3b264c2940eb;hpb=11ce663f56d70cbc0373c27c6dbe146823106e90;p=perl%2Fmodules%2Frgit.git

diff --git a/t/21-once.t b/t/21-once.t
index 4e0c4ac..65accd2 100644
--- a/t/21-once.t
+++ b/t/21-once.t
@@ -11,16 +11,19 @@ use Test::More tests => 9 * 5;
 use App::Rgit;
 
 my @expected = (
- ([ [ qw/^n ^g ^w ^b ^^/ ] ]) x 5
+ ([ [ qw/%n %g %w %b %%/ ] ]) x 5
 );
 
+local $ENV{GIT_DIR} = 't';
+local $ENV{GIT_EXEC_PATH} = abs_path('t/bin/git');
+
 for my $cmd (qw/daemon gui help init version/) {
  my ($fh, $filename) = tempfile(UNLINK => 1);
  my $ar = App::Rgit->new(
-  git  => abs_path('t/bin/git'),
-  root => 't',
+  git  => $ENV{GIT_EXEC_PATH},
+  root => $ENV{GIT_DIR},
   cmd  => $cmd,
-  args => [ abs_path($filename), $cmd, qw/^n ^g ^w ^b ^^/ ]
+  args => [ abs_path($filename), $cmd, qw/%n %g %w %b %%/ ]
  );
  isnt($ar, undef, "once $cmd has a defined object");
  my $exit = $ar->run;
@@ -28,7 +31,8 @@ for my $cmd (qw/daemon gui help init version/) {
  my @lines = sort split /\n/, do { local $/; <$fh> };
  is(@lines, 1, "once $cmd visited only one repo");
  my $r = [ split /\|/, defined $lines[0] ? $lines[0] : '' ];
- my $e = [ $cmd, qw/^n ^g ^w ^b ^^/ ];
+ my $e = [ $cmd, qw/%n %g %w %b %%/ ];
+ s/[\r\n]*$// for @$r;
  is($r->[$_], $e->[$_], "once $cmd argument $_ is ok")
   for 0 .. 5;
 }