Stop using dztest

kentnl · Mar 3, 2017 · c92d181 · c92d181
1 parent d8b618b
commit c92d181
Show file tree

Hide file tree

Showing 9 changed files with 182 additions and 95 deletions.
diff --git a/Changes b/Changes
@@ -10,7 +10,10 @@ Release history for Dist-Zilla-Plugin-Author-KENTNL-RecommendFixes
  - Dependencies changed since 0.005002, see misc/*.deps* for details
  - develop: +1 ↑2
  - runtime: -1
- - test: ↓1
+ - test: ↓1 -1
+
+ [Tests]
+ - Stop using dztest
 
 0.005002 2016-09-10T06:01:15Z fa37013
  [Checks]

diff --git a/Makefile.PL b/Makefile.PL
@@ -29,7 +29,6 @@ my %WriteMakefileArgs = (
     "warnings" => 0
   },
   "TEST_REQUIRES" => {
-    "Dist::Zilla::Util::Test::KENTNL" => "1.0001002",
     "ExtUtils::MakeMaker" => 0,
     "File::Spec" => 0,
     "Test::DZil" => 0,
@@ -45,7 +44,6 @@ my %WriteMakefileArgs = (
 my %FallbackPrereqs = (
   "Data::DPath" => 0,
   "Dist::Zilla::Role::InstallTool" => 0,
-  "Dist::Zilla::Util::Test::KENTNL" => "1.0001002",
   "ExtUtils::MakeMaker" => 0,
   "File::Spec" => 0,
   "Generic::Assertions" => 0,

diff --git a/misc/Changes.deps b/misc/Changes.deps
@@ -7,6 +7,9 @@ This file contains changes in REQUIRED dependencies for standard CPAN phases (co
  [Removed / runtime requires]
  - constant
 
+ [Removed / test requires]
+ - Dist::Zilla::Util::Test::KENTNL 1.0001002
+
 0.005002 2016-09-10T06:01:15Z
 
 0.005001 2015-07-11T14:36:47Z

diff --git a/misc/Changes.deps.all b/misc/Changes.deps.all
@@ -14,6 +14,9 @@ This file contains ALL changes in dependencies in both REQUIRED / OPTIONAL depen
  [Removed / runtime requires]
  - constant
 
+ [Removed / test requires]
+ - Dist::Zilla::Util::Test::KENTNL 1.0001002
+
 0.005002 2016-09-10T06:01:15Z
  [Added / develop requires]
  - English

diff --git a/t/basic.t b/t/basic.t
@@ -2,29 +2,43 @@ use strict;
 use warnings;
 
 use Test::More;
-use Dist::Zilla::Util::Test::KENTNL 1.0001002 qw( dztest );
-use Test::DZil qw( simple_ini );
+use Path::Tiny qw( path );
+use Test::DZil qw( simple_ini Builder );
 
 # ABSTRACT: basic test
 
 my $ini = simple_ini( ['Author::KENTNL::RecommendFixes'] );
-my $dz = dztest();
+my $tzil = Builder->from_config(
+  { dist_root => 'invalid' },
+  {
+    'add_files' => {
+      path('source/dist.ini') => $ini
+    }
+  }
+);
+
+$tzil->chrome->logger->set_debug(1);
+$tzil->build;
 
-$dz->add_file( 'dist.ini', $ini );
-$dz->build_ok;
-$dz->has_messages(
-  [
-    [ qr/\.git does not exist/,           'Uninitialized git' ],
-    [ qr/dist\.ini\.meta does not exist/, 'Unbaked dist' ],
-    [ qr/weaver\.ini does not exist/,     'Ancient Pod::Weaver' ],
-    [ qr/travis\.yml does not exist/,     'No travis setup' ],
-    [ qr/perltidyrc does not exist/,      'No perltidy' ],
-    [ qr/Changes does not exist/,         'No Changes' ],
-    [ qr/LICENSE does not exist/,         'No LICENSE' ],
-    [ qr/Changes\.deps does not exist/,   'Diff changes' ],
-  ]
+my @messages = (
+  [ qr/\.git does not exist/,           'Uninitialized git' ],
+  [ qr/dist\.ini\.meta does not exist/, 'Unbaked dist' ],
+  [ qr/weaver\.ini does not exist/,     'Ancient Pod::Weaver' ],
+  [ qr/travis\.yml does not exist/,     'No travis setup' ],
+  [ qr/perltidyrc does not exist/,      'No perltidy' ],
+  [ qr/Changes does not exist/,         'No Changes' ],
+  [ qr/LICENSE does not exist/,         'No LICENSE' ],
+  [ qr/Changes\.deps does not exist/,   'Diff changes' ],
 );
+for my $message (@messages) {
+  ok(
+    do {
+      scalar grep { $_ =~ $message->[0] } @{ $tzil->log_messages };
+    },
+    "Has message for $message->[0]"
+  );
+}
 
-note explain $dz->builder->log_messages;
+note explain $tzil->log_messages;
 
 done_testing;
diff --git a/t/dummy_lib.t b/t/dummy_lib.t
@@ -2,29 +2,44 @@ use strict;
 use warnings;
 
 use Test::More;
-use Dist::Zilla::Util::Test::KENTNL 1.0001002 qw( dztest );
-use Test::DZil qw( simple_ini );
+use Path::Tiny qw( path );
+use Test::DZil qw( simple_ini Builder );
 
 # ABSTRACT: basic test
 
 my $ini = simple_ini( ['Author::KENTNL::RecommendFixes'] );
-my $dz = dztest();
-
-$dz->add_file( 'dist.ini',  $ini );
-$dz->add_file( 'lib/.keep', q[] );
-$dz->build_ok;
-$dz->has_messages(
-  [
-    [ qr/\.git does not exist/,           'Uninitialized git' ],
-    [ qr/dist\.ini\.meta does not exist/, 'Unbaked dist' ],
-    [ qr/weaver\.ini does not exist/,     'Ancient Pod::Weaver' ],
-    [ qr/perltidyrc does not exist/,      'No perltidy' ],
-    [ qr/Changes does not exist/,         'No Changes' ],
-    [ qr/LICENSE does not exist/,         'No LICENSE' ],
-    [ qr/Changes\.deps does not exist/,   'Diff changes' ],
-  ]
+my $tzil = Builder->from_config(
+  { dist_root => 'invalid' },
+  {
+    'add_files' => {
+      path('source/dist.ini')  => $ini,
+      path('source/lib/.keep') => q[],
+    },
+  }
 );
 
-note explain $dz->builder->log_messages;
+$tzil->chrome->logger->set_debug(1);
+$tzil->build;
+
+my @messages = (
+  [ qr/\.git does not exist/,           'Uninitialized git' ],
+  [ qr/dist\.ini\.meta does not exist/, 'Unbaked dist' ],
+  [ qr/weaver\.ini does not exist/,     'Ancient Pod::Weaver' ],
+  [ qr/perltidyrc does not exist/,      'No perltidy' ],
+  [ qr/Changes does not exist/,         'No Changes' ],
+  [ qr/LICENSE does not exist/,         'No LICENSE' ],
+  [ qr/Changes\.deps does not exist/,   'Diff changes' ],
+);
+
+for my $message (@messages) {
+  ok(
+    do {
+      scalar grep { $_ =~ $message->[0] } @{ $tzil->log_messages };
+    },
+    "Has message for $message->[0]"
+  );
+}
+
+note explain $tzil->log_messages;
 
 done_testing;
diff --git a/t/dummy_plugin.t b/t/dummy_plugin.t
@@ -2,32 +2,51 @@ use strict;
 use warnings;
 
 use Test::More;
-use Dist::Zilla::Util::Test::KENTNL 1.0001002 qw( dztest );
-use Test::DZil qw( simple_ini );
+use Path::Tiny qw( path );
+use Test::DZil qw( simple_ini Builder );
 
 # ABSTRACT: basic test
 
 my $ini = simple_ini( ['Author::KENTNL::RecommendFixes'] );
-my $dz = dztest();
-
-$dz->add_file( 'dist.ini',                         $ini );
-$dz->add_file( 'lib/Dist/Zilla/Plugin/Example.pm', q[] );
-$dz->add_file( 't/basic.t',                        q[] );
-$dz->add_file( 'maint/perlcritic.rc.gen.pl',       q[] );
-$dz->add_file( '.git/config',                      q[] );
-$dz->add_file( 'weaver.ini',                       q[] );
-$dz->add_file( 'dist.ini.meta',                    q[] );
-$dz->add_file( '.mailmap',                         q[] );
-$dz->build_ok;
-$dz->has_messages(
-  [
-    [ qr/perltidyrc does not exist/,    'No perltidy' ],
-    [ qr/Changes does not exist/,       'No Changes' ],
-    [ qr/LICENSE does not exist/,       'No LICENSE' ],
-    [ qr/Changes\.deps does not exist/, 'Diff changes' ],
-  ]
+my $tzil = Builder->from_config(
+  { dist_root => 'invalid' },
+  {
+    'add_files' => {
+      path('source/dist.ini') => $ini,
+      map { path( 'source', $_ ) => q[] }
+        qw{
+        lib/.keep
+        lib/Dist/Zilla/Plugin/Example.pm
+        t/basic.t
+        maint/perlcritic.rc.gen.pl
+        .git/config
+        weaver.ini
+        dist.ini.meta
+        .mailmap
+        }
+    },
+  }
 );
 
-note explain $dz->builder->log_messages;
+$tzil->chrome->logger->set_debug(1);
+$tzil->build;
+
+my @messages = (
+  [ qr/perltidyrc does not exist/,    'No perltidy' ],
+  [ qr/Changes does not exist/,       'No Changes' ],
+  [ qr/LICENSE does not exist/,       'No LICENSE' ],
+  [ qr/Changes\.deps does not exist/, 'Diff changes' ],
+);
+
+for my $message (@messages) {
+  ok(
+    do {
+      scalar grep { $_ =~ $message->[0] } @{ $tzil->log_messages };
+    },
+    "Has message for $message->[0]"
+  );
+}
+
+note explain $tzil->log_messages;
 
 done_testing;
diff --git a/t/dummy_pm.t b/t/dummy_pm.t
@@ -2,29 +2,44 @@ use strict;
 use warnings;
 
 use Test::More;
-use Dist::Zilla::Util::Test::KENTNL 1.0001002 qw( dztest );
-use Test::DZil qw( simple_ini );
+use Path::Tiny qw( path );
+use Test::DZil qw( simple_ini Builder );
 
 # ABSTRACT: basic test
 
 my $ini = simple_ini( ['Author::KENTNL::RecommendFixes'] );
-my $dz = dztest();
-
-$dz->add_file( 'dist.ini',       $ini );
-$dz->add_file( 'lib/Example.pm', q[] );
-$dz->build_ok;
-$dz->has_messages(
-  [
-    [ qr/\.git does not exist/,           'Uninitialized git' ],
-    [ qr/dist\.ini\.meta does not exist/, 'Unbaked dist' ],
-    [ qr/weaver\.ini does not exist/,     'Ancient Pod::Weaver' ],
-    [ qr/perltidyrc does not exist/,      'No perltidy' ],
-    [ qr/Changes does not exist/,         'No Changes' ],
-    [ qr/LICENSE does not exist/,         'No LICENSE' ],
-    [ qr/Changes\.deps does not exist/,   'Diff changes' ],
-  ]
+my $tzil = Builder->from_config(
+  { dist_root => 'invalid' },
+  {
+    'add_files' => {
+      path('source/dist.ini') => $ini,
+      path( 'source/Example.pm' ) => q[],
+    },
+  }
 );
 
-note explain $dz->builder->log_messages;
+$tzil->chrome->logger->set_debug(1);
+$tzil->build;
+
+my @messages = (
+  [ qr/\.git does not exist/,           'Uninitialized git' ],
+  [ qr/dist\.ini\.meta does not exist/, 'Unbaked dist' ],
+  [ qr/weaver\.ini does not exist/,     'Ancient Pod::Weaver' ],
+  [ qr/perltidyrc does not exist/,      'No perltidy' ],
+  [ qr/Changes does not exist/,         'No Changes' ],
+  [ qr/LICENSE does not exist/,         'No LICENSE' ],
+  [ qr/Changes\.deps does not exist/,   'Diff changes' ],
+);
+
+for my $message (@messages) {
+  ok(
+    do {
+      scalar grep { $_ =~ $message->[0] } @{ $tzil->log_messages };
+    },
+    "Has message for $message->[0]"
+  );
+}
+
+note explain $tzil->log_messages;
 
 done_testing;
diff --git a/t/dummy_travis.t b/t/dummy_travis.t
@@ -2,31 +2,48 @@ use strict;
 use warnings;
 
 use Test::More;
-use Dist::Zilla::Util::Test::KENTNL 1.0001002 qw( dztest );
-use Test::DZil qw( simple_ini );
+use Path::Tiny qw( path );
+use Test::DZil qw( simple_ini Builder );
 
 # ABSTRACT: basic test
 
 my $ini = simple_ini( ['Author::KENTNL::RecommendFixes'] );
-my $dz = dztest();
-
-$dz->add_file( 'dist.ini',    $ini );
-$dz->add_file( '.travis.yml', <<'EOF');
+my $yml = <<'EOF';
 language: perl
 EOF
-$dz->build_ok;
-$dz->has_messages(
-  [
-    [ qr/\.git does not exist/,           'Uninitialized git' ],
-    [ qr/dist\.ini\.meta does not exist/, 'Unbaked dist' ],
-    [ qr/weaver\.ini does not exist/,     'Ancient Pod::Weaver' ],
-    [ qr/perltidyrc does not exist/,      'No perltidy' ],
-    [ qr/Changes does not exist/,         'No Changes' ],
-    [ qr/LICENSE does not exist/,         'No LICENSE' ],
-    [ qr/Changes\.deps does not exist/,   'Diff changes' ],
-  ]
+
+my $tzil = Builder->from_config(
+  { dist_root => 'invalid' },
+  {
+    'add_files' => {
+      path('source/dist.ini')    => $ini,
+      path('source/.travis.yml') => $yml,
+    },
+  }
+);
+
+$tzil->chrome->logger->set_debug(1);
+$tzil->build;
+
+my @messages = (
+  [ qr/\.git does not exist/,           'Uninitialized git' ],
+  [ qr/dist\.ini\.meta does not exist/, 'Unbaked dist' ],
+  [ qr/weaver\.ini does not exist/,     'Ancient Pod::Weaver' ],
+  [ qr/perltidyrc does not exist/,      'No perltidy' ],
+  [ qr/Changes does not exist/,         'No Changes' ],
+  [ qr/LICENSE does not exist/,         'No LICENSE' ],
+  [ qr/Changes\.deps does not exist/,   'Diff changes' ],
 );
 
-note explain $dz->builder->log_messages;
+for my $message (@messages) {
+  ok(
+    do {
+      scalar grep { $_ =~ $message->[0] } @{ $tzil->log_messages };
+    },
+    "Has message for $message->[0]"
+  );
+}
+
+note explain $tzil->log_messages;
 
 done_testing;