Update VPIT::TestHelpers to 15e8aee3

[perl/modules/rgit.git] / t / 21-once.t

diff --git a/t/21-once.t b/t/21-once.t
index 410496c748ee0188889bfe00ef4ba834495de58d..51224ab8b5d38aa2442a1bcaba75434520b7acfb 100644 (file)
--- a/t/21-once.t
+++ b/t/21-once.t
@@ -3,30 +3,51 @@
 use strict;
 use warnings;
 
-use Cwd qw/abs_path/;
-use File::Temp qw/tempfile/;
+use Cwd        qw<abs_path>;
+use File::Temp qw<tempfile>;
 
-use Test::More tests => 8 * 4;
+use Test::More;
 
 use App::Rgit;
 
+use lib 't/lib';
+use App::Rgit::TestUtils qw<can_run_git>;
+
+my ($can_run, $reason) = can_run_git;
+if ($can_run) {
+ plan tests    => 9 * 5;
+} else {
+ plan skip_all => "Can't run the mock git executable on this system: $reason";
+}
+
 my @expected = (
- ([ [ qw/^n ^g ^w ^b ^^/ ] ]) x 4
+ ([ [ qw<%n %g %w %b %%> ] ]) x 5
 );
 
-for my $cmd (qw/version help daemon init/) {
+local $ENV{GIT_DIR}       = 't';
+local $ENV{GIT_EXEC_PATH} = 't/bin/git';
+
+for my $cmd (qw<daemon gui help init version>) {
  my ($fh, $filename) = tempfile(UNLINK => 1);
- my $exit = App::Rgit->new(
-  git  => abs_path('t/bin/git'),
-  root => 't',
+
+ my $ar = App::Rgit->new(
+  git  => $ENV{GIT_EXEC_PATH},
+  root => $ENV{GIT_DIR},
   cmd  => $cmd,
-  args => [ abs_path($filename), $cmd, qw/^n ^g ^w ^b ^^/ ]
- )->run;
- is($exit, 0, "once $cmd returned 0");
+  args => [ abs_path($filename), $cmd, qw<%n %g %w %b %%> ],
+ );
+ isa_ok $ar, 'App::Rgit', "once $cmd is an App::Rgit object";
+
+ my $exit = $ar->run;
+ is $exit, 0, "once $cmd returned 0";
+
  my @lines = sort split /\n/, do { local $/; <$fh> };
- is(@lines, 1, "once $cmd visited only one repo");
+ 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 ^^/ ];
- is($r->[$_], $e->[$_], "once $cmd argument $_ is ok")
-  for 0 .. 5;
+ my $e = [ $cmd, qw<%n %g %w %b %%> ];
+ s/[\r\n]*$// for @$r;
+ for (0 .. 5) {
+  is $r->[$_], $e->[$_], "once $cmd argument $_ is ok";
+ }
 }