Merge pull request #813 from gugod/replace-test-spec

Replace Testt::Spec with Test2::Tools::Spec
gugod · Aug 30, 2024 · 9a786cd · 9a786cd
2 parents 5907ab0 + 28b6437
commit 9a786cd
Show file tree

Hide file tree

Showing 17 changed files with 598 additions and 385 deletions.
diff --git a/META.json b/META.json
@@ -50,7 +50,6 @@
             "Test::NoWarnings" : "1.04",
             "Test::Output" : "1.03",
             "Test::Simple" : "1.001002",
-            "Test::Spec" : "0.49",
             "Test::TempDir::Tiny" : "0.016"
          }
       }

diff --git a/META.yml b/META.yml
@@ -13,7 +13,6 @@ build_requires:
   Test::NoWarnings: '1.04'
   Test::Output: '1.03'
   Test::Simple: '1.001002'
-  Test::Spec: '0.49'
   Test::TempDir::Tiny: '0.016'
 configure_requires:
   Module::Build::Tiny: '0.039'

diff --git a/cpanfile b/cpanfile
@@ -19,7 +19,6 @@ on test => sub {
     requires 'Test::NoWarnings'     => '1.04';
     requires 'Test::Output'         => '1.03';
     requires 'Test::Simple'         => '1.001002';
-    requires 'Test::Spec'           => '0.49';
     requires 'Test::TempDir::Tiny'  => '0.016';
     requires 'Test2::V0'            => '0.000163';
     requires 'Test2::Plugin::NoWarnings' => '0.10';

diff --git a/t/app-perlbrew-path-installation.t b/t/app-perlbrew-path-installation.t
@@ -1,12 +1,9 @@
 #!/usr/bin/env perl
-use strict;
-use warnings;
+use Test2::V0;
+use Test2::Tools::Spec;
 
 use File::Temp qw[];
 
-use Test::Spec;
-use Test::Deep;
-
 use App::Perlbrew::Path::Root;
 use App::Perlbrew::Path::Installation;
 use App::Perlbrew::Path::Installations;
@@ -19,30 +16,27 @@ sub arrange_installation;
 
 describe "App::Perlbrew::Path::Root" => sub {
     describe "perls()" => sub {
-        context "without parameters" => sub {
+        describe "without parameters" => sub {
             it "should return Instalations object" => sub {
                 local $ENV{HOME};
                 my $path = arrange_root->perls;
-
-                cmp_deeply $path, looks_like_perl_installations("~/.root/perls");
+                is $path, looks_like_perl_installations("~/.root/perls");
             };
         };
 
-        context "with one parameter" => sub {
+        describe "with one parameter" => sub {
             it "should return Installation object" => sub {
                 local $ENV{HOME};
                 my $path = arrange_root->perls('blead');
-
-                cmp_deeply $path, looks_like_perl_installation("~/.root/perls/blead");
+                is $path, looks_like_perl_installation("~/.root/perls/blead");
             };
         };
 
-        context "with multiple paramters" => sub {
+        describe "with multiple paramters" => sub {
             it "should return Path object" => sub {
                 local $ENV{HOME};
                 my $path = arrange_root->perls('blead', '.version');
-
-                cmp_deeply $path, looks_like_path("~/.root/perls/blead/.version");
+                is $path, looks_like_path("~/.root/perls/blead/.version");
             };
         }
     };
@@ -58,7 +52,7 @@ describe "App::Perlbrew::Path::Installations" => sub {
 
             my @list = $root->perls->list;
 
-            cmp_deeply \@list, [
+            is \@list, [
                 looks_like_perl_installation("~/.root/perls/perl-1"),
                 looks_like_perl_installation("~/.root/perls/perl-2"),
             ];
@@ -71,27 +65,24 @@ describe "App::Perlbrew::Path::Installation" => sub {
         it "should return installation name" => sub {
             local $ENV{HOME};
             my $installation = arrange_installation('foo-bar');
-
-            cmp_deeply $installation->name, 'foo-bar';
+            is $installation->name, 'foo-bar';
         };
 
         it "should provide path to perl" => sub {
             local $ENV{HOME};
             my $perl = arrange_installation('foo-bar')->perl;
-
-            cmp_deeply $perl->stringify_with_tilde, '~/.root/perls/foo-bar/bin/perl';
+            is $perl->stringify_with_tilde, '~/.root/perls/foo-bar/bin/perl';
         };
 
         it "should provide path to version file" => sub {
             local $ENV{HOME};
             my $file = arrange_installation('foo-bar')->version_file;
-
-            cmp_deeply $file->stringify_with_tilde, '~/.root/perls/foo-bar/.version';
+            is $file->stringify_with_tilde, '~/.root/perls/foo-bar/.version';
         };
     };
 };
 
-runtests unless caller;
+done_testing;
 
 sub looks_like_path {
     my ($path, @tests) = @_;
@@ -101,19 +92,18 @@ sub looks_like_path {
     : 'stringify'
     ;
 
-    all(
-        methods($method => $path),
-        Isa('App::Perlbrew::Path'),
-        @tests,
-    );
+    object {
+        call $method => $path;
+        prop isa => 'App::Perlbrew::Path';
+    };
 }
 
 sub looks_like_perl_installation {
-    looks_like_path(@_, Isa('App::Perlbrew::Path::Installation'));
+    looks_like_path(@_, object { prop isa => 'App::Perlbrew::Path::Installation' });
 }
 
 sub looks_like_perl_installations {
-    looks_like_path(@_, Isa('App::Perlbrew::Path::Installations'));
+    looks_like_path(@_, object { prop isa => 'App::Perlbrew::Path::Installation' });
 }
 
 sub arrange_root {

diff --git a/t/command-alias.t b/t/command-alias.t
@@ -1,24 +1,22 @@
 #!/usr/bin/env perl
-#!/usr/bin/env perl
-use strict;
-use warnings;
+use Test2::V0;
+use Test2::Tools::Spec;
 
 BEGIN { $ENV{SHELL} = "/bin/bash" }
 
 use FindBin;
 use lib $FindBin::Bin;
 use App::perlbrew;
-require "test_helpers.pl";
+require "test2_helpers.pl";
 
-use Test::Spec;
 use Test::Output;
 use Config;
 
 mock_perlbrew_install("perl-5.14.1");
 mock_perlbrew_lib_create('perl-5.14.1@nobita');
 
 describe "alias command," => sub {
-    before each => sub {
+    before_each 'cleanup env' => sub {
         delete $ENV{PERL_MB_OPT};
         delete $ENV{PERL_MM_OPT};
         delete $ENV{PERL_LOCAL_LIB_ROOT};
@@ -44,4 +42,4 @@ describe "alias command," => sub {
     };
 };
 
-runtests unless caller;
+done_testing;
diff --git a/t/command-available.t b/t/command-available.t
@@ -1,7 +1,6 @@
 #!/usr/bin/env perl
-use strict;
-use warnings;
-use Test::Spec;
+use Test2::V0;
+use Test2::Tools::Spec;
 use File::Temp qw( tempdir );
 use Test::Output;
 
@@ -28,13 +27,18 @@ my %available_perl_dists = (
 
 sub mocked_perlbrew {
     my $app = App::perlbrew->new( @_ );
-    $app->expects( 'available_perl_distributions' )->returns( \%available_perl_dists );
-    return $app;
+
+    my $mock = mock $app,
+        override => [
+            available_perl_distributions => sub { \%available_perl_dists }
+        ];
+
+    return ($mock, $app);
 }
 
 describe "available command output, when nothing installed locally," => sub {
     it "should display a list of perl versions" => sub {
-        my $app = mocked_perlbrew( "available", "--verbose" );
+        my ($mock, $app) = mocked_perlbrew( "available", "--verbose" );
 
         stdout_like sub {
             $app->run();
@@ -60,14 +64,16 @@ describe "available command output, when nothing installed locally," => sub {
 
 describe "available command output, when something installed locally," => sub {
     it "should display a list of perl versions, with markers on installed versions" => sub {
-        my $app = mocked_perlbrew( "available", "--verbose" );
+        my ($mock, $app) = mocked_perlbrew( "available", "--verbose" );
 
         my @installed_perls = (
             { name => "perl-5.24.0" },
             { name => "perl-5.20.3" }
         );
 
-        $app->expects("installed_perls")->returns(@installed_perls);
+        $mock->override(
+            "installed_perls" => sub  { @installed_perls }
+        );
 
         stdout_like sub {
             $app->run();
@@ -94,4 +100,4 @@ describe "available command output, when something installed locally," => sub {
     };
 };
 
-runtests unless caller;
+done_testing;
diff --git a/t/command-clone-modules.t b/t/command-clone-modules.t
@@ -1,15 +1,13 @@
 #!/usr/bin/env perl
-use strict;
-use warnings;
+use Test2::V0;
+use Test2::Tools::Spec;
 
 BEGIN { $ENV{SHELL} = "/bin/bash" }
 
 use FindBin;
 use lib $FindBin::Bin;
 use App::perlbrew;
-require "test_helpers.pl";
-
-use Test::Spec;
+require "test2_helpers.pl";
 
 mock_perlbrew_install("perl-5.14.1");
 mock_perlbrew_install("perl-5.16.0");
@@ -33,7 +31,7 @@ sub App::perlbrew::run_command_exec {
 use warnings;
 
 describe "clone-modules command," => sub {
-    before each => sub {
+    before_each 'cleanup env' => sub {
         delete $ENV{PERL_MB_OPT};
         delete $ENV{PERL_MM_OPT};
         delete $ENV{PERL_LOCAL_LIB_ROOT};
@@ -71,26 +69,30 @@ describe "clone-modules command," => sub {
     describe "when invoked with one argument X", sub {
         it "should display clone modules from current-perl to X", sub {
             my $app = App::perlbrew->new("clone-modules", "perl-5.14.1");
-            $app->expects("current_env")->returns("perl-5.16.0")->at_least(1);
+
+            my $mock = mocked($app)->expects("current_env")->returns("perl-5.16.0")->at_least(1);
             $app->run;
 
             is $__from, "perl-5.16.0";
             is $__to, "perl-5.14.1";
             ok(!defined($__notest));
+
+            $mock->verify;
         };
     };
 
     describe "when invoked with one argument X, with `--notest`", sub {
         it "should display clone modules from current-perl to X", sub {
             my $app = App::perlbrew->new("clone-modules", "--notest", "perl-5.14.1");
-            $app->expects("current_env")->returns("perl-5.16.0")->at_least(1);
+            my $mock = mocked($app)->expects("current_env")->returns("perl-5.16.0")->at_least(1);
             $app->run;
 
             is $__from, "perl-5.16.0";
             is $__to, "perl-5.14.1";
             ok(defined($__notest));
+            $mock->verify;
         };
     };
 };
 
-runtests unless caller;
+done_testing;
diff --git a/t/command-compgen.t b/t/command-compgen.t
@@ -1,13 +1,12 @@
 #!/usr/bin/env perl
-use strict;
-use warnings;
+use Test2::V0;
+use Test2::Tools::Spec;
 
 use FindBin;
 use lib $FindBin::Bin;
 use App::perlbrew;
-require "test_helpers.pl";
+require "test2_helpers.pl";
 
-use Test::Spec;
 use Test::Output qw( stdout_from );
 
 $ENV{PERLBREW_DEBUG_COMPLETION} = 0;
@@ -84,5 +83,4 @@ describe "compgen command," => sub {
     }
 };
 
-runtests unless caller;
-
+done_testing;
diff --git a/t/command-env.t b/t/command-env.t
@@ -1,23 +1,22 @@
 #!/usr/bin/env perl
-use strict;
-use warnings;
+use Test2::V0;
+use Test2::Tools::Spec;
 
 BEGIN { $ENV{SHELL} = "/bin/bash" }
 
 use FindBin;
 use lib $FindBin::Bin;
 use App::perlbrew;
-require "test_helpers.pl";
+require "test2_helpers.pl";
 
-use Test::Spec;
 use Test::Output;
 use Config;
 
 mock_perlbrew_install("perl-5.14.1");
 mock_perlbrew_lib_create('perl-5.14.1@nobita');
 
 describe "env command," => sub {
-    before each => sub {
+    before_each 'cleanup env' => sub {
         delete $ENV{PERL_MB_OPT};
         delete $ENV{PERL_MM_OPT};
         delete $ENV{PERL_LOCAL_LIB_ROOT};
@@ -98,4 +97,4 @@ OUT
     }
 };
 
-runtests unless caller;
+done_testing;