[libdist-zilla-util-configdumper-perl] 04/05: remove use of Test::KENTNL
Florian Schlichting
fsfs at moszumanska.debian.org
Sat Nov 11 15:44:10 UTC 2017
This is an automated email from the git hooks/post-receive script.
fsfs pushed a commit to annotated tag 0.003009-source
in repository libdist-zilla-util-configdumper-perl.
commit 9e71844d43f7a688e3f82e30a018e487b7d094c0
Author: Kent Fredric <kentfredric at gmail.com>
Date: Sat Mar 18 20:41:21 2017 +1300
remove use of Test::KENTNL
---
Changes | 3 +++
Makefile.PL | 2 --
dist.ini | 1 -
dist.ini.meta | 1 -
misc/Changes.deps | 2 ++
misc/Changes.deps.all | 3 +++
t/attr_lazy.t | 43 ++++++++++++++++++++++++-------------------
t/bang_on_ref.t | 24 ++++++++++++++++--------
t/basic.t | 26 ++++++++++++--------------
t/basic_inherit_attr.t | 31 ++++++++++++++-----------------
t/basic_role_attr.t | 30 +++++++++++++-----------------
t/callback.t | 27 ++++++++++++---------------
t/failattr.t | 27 ++++++++++++---------------
13 files changed, 111 insertions(+), 109 deletions(-)
diff --git a/Changes b/Changes
index e21427a..d3fc5be 100644
--- a/Changes
+++ b/Changes
@@ -1,9 +1,12 @@
Release history for Dist-Zilla-Util-ConfigDumper
{{$NEXT}}
+ - Remove use of Test::KENTNL/dztest
+
[Dependencies::Stats]
- Dependencies changed since 0.003008, see misc/*.deps* for details
- develop: (suggests: ↑2)
+ - test: -1
0.003008 2017-03-01T22:26:39Z fb86583
[Bugfix]
diff --git a/Makefile.PL b/Makefile.PL
index 125710d..522834a 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -28,7 +28,6 @@ my %WriteMakefileArgs = (
"Dist::Zilla::Plugin::GatherDir" => 0,
"Dist::Zilla::Plugin::MetaConfig" => 0,
"Dist::Zilla::Role::Plugin" => 0,
- "Dist::Zilla::Util::Test::KENTNL" => "1.003001",
"ExtUtils::MakeMaker" => 0,
"File::Spec" => 0,
"Moose" => 0,
@@ -48,7 +47,6 @@ my %FallbackPrereqs = (
"Dist::Zilla::Plugin::GatherDir" => 0,
"Dist::Zilla::Plugin::MetaConfig" => 0,
"Dist::Zilla::Role::Plugin" => 0,
- "Dist::Zilla::Util::Test::KENTNL" => "1.003001",
"ExtUtils::MakeMaker" => 0,
"File::Spec" => 0,
"Moose" => 0,
diff --git a/dist.ini b/dist.ini
index 32cd174..9df0358 100644
--- a/dist.ini
+++ b/dist.ini
@@ -240,5 +240,4 @@ Dist::Zilla::Plugin::UploadToCPAN = 0
[Prereqs]
-phase = test
-Dist::Zilla::Util::Test::KENTNL = 1.003001
Dist::Zilla::Plugin::Bootstrap::lib = 1.000003
diff --git a/dist.ini.meta b/dist.ini.meta
index 9735272..c59c2c1 100644
--- a/dist.ini.meta
+++ b/dist.ini.meta
@@ -21,5 +21,4 @@ twitter_extra_hash_tags = #distzilla
[Prereqs]
-phase = test
-Dist::Zilla::Util::Test::KENTNL = 1.003001
Dist::Zilla::Plugin::Bootstrap::lib = 1.000003 ; >= 0.04 works with the newer role, but only 1.(0x5)3 depends on the newer role.
diff --git a/misc/Changes.deps b/misc/Changes.deps
index 5d720d0..026361e 100644
--- a/misc/Changes.deps
+++ b/misc/Changes.deps
@@ -1,6 +1,8 @@
This file contains changes in REQUIRED dependencies for standard CPAN phases (configure/build/runtime/test)
0.003009
+ [Removed / test requires]
+ - Dist::Zilla::Util::Test::KENTNL 1.003001
0.003008 2017-03-01T22:26:39Z
[Changed / test requires]
diff --git a/misc/Changes.deps.all b/misc/Changes.deps.all
index 0a5d159..2882f1a 100644
--- a/misc/Changes.deps.all
+++ b/misc/Changes.deps.all
@@ -5,6 +5,9 @@ This file contains ALL changes in dependencies in both REQUIRED / OPTIONAL depen
- Dist::Zilla::App::Command::bakeini 0.002005 → 0.002006
- Dist::Zilla::PluginBundle::Author::KENTNL 2.025020 → 2.025021
+ [Removed / test requires]
+ - Dist::Zilla::Util::Test::KENTNL 1.003001
+
0.003008 2017-03-01T22:26:39Z
[Added / develop requires]
- English
diff --git a/t/attr_lazy.t b/t/attr_lazy.t
index 8038904..4a91626 100644
--- a/t/attr_lazy.t
+++ b/t/attr_lazy.t
@@ -2,8 +2,7 @@ use strict;
use warnings;
use Test::More;
-use Test::DZil qw( simple_ini );
-use Dist::Zilla::Util::Test::KENTNL 1.001 qw( dztest );
+use Test::DZil qw( simple_ini Builder );
# ABSTRACT: Make sure plugins do what they say they'll do
@@ -14,12 +13,12 @@ require Dist::Zilla::Plugin::GatherDir;
require Dist::Zilla::Plugin::MetaConfig;
subtest 'unspecificied lazy' => sub {
- my $t = dztest();
- my $pn = 'TestPlugin';
- my $fpn = 'Dist::Zilla::Plugin::' . $pn;
- $t->add_file( 'dist.ini', simple_ini( ['Bootstrap::lib'], ['GatherDir'], ['MetaConfig'], [$pn], ) );
- $t->add_file( 'lib/Dist/Zilla/Plugin/' . $pn . '.pm', <<"EOF");
+ my $pn = 'TestPlugin';
+ my $fpn = 'Dist::Zilla::Plugin::' . $pn;
+ my $files = {};
+ $files->{'source/dist.ini'} = simple_ini( ['Bootstrap::lib'], ['GatherDir'], ['MetaConfig'], [$pn], );
+ $files->{ 'source/lib/Dist/Zilla/Plugin/' . $pn . '.pm' } = <<"EOF";
package $fpn;
use Moose qw( has around with );
@@ -37,9 +36,13 @@ no Moose;
1;
EOF
- $t->build_ok;
- $t->meta_path_deeply(
- '/x_Dist_Zilla/plugins/*/*[ key eq \'class\' and value eq \'Dist::Zilla::Plugin::TestPlugin\' ]/../*[ key eq \'config\']',
+ my $t = Builder->from_config( { dist_root => 'invalid' }, { add_files => $files } );
+ $t->chrome->logger->set_debug(1);
+ $t->build;
+ pass("build ok");
+
+ is_deeply(
+ [ map { $_->{config} } grep { $_->{class} eq $fpn } @{ $t->distmeta->{x_Dist_Zilla}->{plugins} } ],
[ { 'Dist::Zilla::Plugin::TestPlugin' => { nlattr => 'nonlazy' } } ],
"Plugin list expected"
);
@@ -47,12 +50,12 @@ EOF
};
subtest 'specificied lazy' => sub {
- my $t = dztest();
- my $pn = 'TestPlugin';
- my $fpn = 'Dist::Zilla::Plugin::' . $pn;
- $t->add_file( 'dist.ini', simple_ini( ['Bootstrap::lib'], ['GatherDir'], ['MetaConfig'], [ $pn, { attr => 'user' } ], ) );
- $t->add_file( 'lib/Dist/Zilla/Plugin/' . $pn . '.pm', <<"EOF");
+ my $pn = 'TestPlugin';
+ my $fpn = 'Dist::Zilla::Plugin::' . $pn;
+ my $files = {};
+ $files->{'source/dist.ini'} = simple_ini( ['Bootstrap::lib'], ['GatherDir'], ['MetaConfig'], [ $pn, { attr => 'user' } ], );
+ $files->{ 'source/lib/Dist/Zilla/Plugin/' . $pn . '.pm' } = <<"EOF";
package $fpn;
use Moose qw( has around with );
@@ -69,14 +72,16 @@ no Moose;
1;
EOF
+ my $t = Builder->from_config( { dist_root => 'invalid' }, { add_files => $files } );
+ $t->chrome->logger->set_debug(1);
+ $t->build;
+ pass("build ok");
- $t->build_ok;
- $t->meta_path_deeply(
- '/x_Dist_Zilla/plugins/*/*[ key eq \'class\' and value eq \'Dist::Zilla::Plugin::TestPlugin\' ]/../*[ key eq \'config\']',
+ is_deeply(
+ [ map { $_->{config} } grep { $_->{class} eq $fpn } @{ $t->distmeta->{x_Dist_Zilla}->{plugins} } ],
[ { 'Dist::Zilla::Plugin::TestPlugin' => { attr => 'user', nlattr => 'nonlazy' } } ],
"Plugin list expected"
);
};
done_testing;
-
diff --git a/t/bang_on_ref.t b/t/bang_on_ref.t
index ea3b89e..0707219 100644
--- a/t/bang_on_ref.t
+++ b/t/bang_on_ref.t
@@ -1,9 +1,8 @@
use strict;
use warnings;
-use Test::More;
-use Test::DZil qw( simple_ini );
-use Dist::Zilla::Util::Test::KENTNL 1.001 qw( dztest );
+use Test::More tests => 1;
+use Test::DZil qw( simple_ini Builder );
# ABSTRACT: Make sure plugins do what they say they'll do
@@ -13,12 +12,12 @@ require Dist::Zilla::Plugin::Bootstrap::lib;
require Dist::Zilla::Plugin::GatherDir;
require Dist::Zilla::Plugin::MetaConfig;
-my $t = dztest();
my $pn = 'TestPlugin';
my $fpn = 'Dist::Zilla::Plugin::' . $pn;
-$t->add_file( 'dist.ini', simple_ini( ['Bootstrap::lib'], ['GatherDir'], ['MetaConfig'], [$pn], ) );
-$t->add_file( 'lib/Dist/Zilla/Plugin/' . $pn . '.pm', <<"EOF");
+my $files = {};
+$files->{"source/dist.ini"} = simple_ini( ['Bootstrap::lib'], ['GatherDir'], ['MetaConfig'], [$pn], );
+$files->{"source/lib/Dist/Zilla/Plugin/${pn}.pm"} = <<"EOF";
package $fpn;
use Moose qw( has around with );
@@ -34,6 +33,15 @@ no Moose;
1;
EOF
-isnt( $t->safe_build, undef, 'Ref == bang' );
-done_testing;
+my ( $t, $error );
+{
+ local $@;
+ eval {
+ $t = Builder->from_config( { dist_root => 'invalid' }, { add_files => $files } );
+ $t->chrome->logger->set_debug(1);
+ $t->build;
+ 1;
+ } or $error = $@;
+}
+isnt( $error, undef, 'Ref == bang' );
diff --git a/t/basic.t b/t/basic.t
index 30d6616..43f6ddc 100644
--- a/t/basic.t
+++ b/t/basic.t
@@ -1,9 +1,8 @@
use strict;
use warnings;
-use Test::More;
-use Test::DZil qw( simple_ini );
-use Dist::Zilla::Util::Test::KENTNL 1.001 qw( dztest );
+use Test::More tests => 1;
+use Test::DZil qw( simple_ini Builder );
# ABSTRACT: Make sure plugins do what they say they'll do
@@ -13,12 +12,11 @@ require Dist::Zilla::Plugin::Bootstrap::lib;
require Dist::Zilla::Plugin::GatherDir;
require Dist::Zilla::Plugin::MetaConfig;
-my $t = dztest();
-my $pn = 'TestPlugin';
-my $fpn = 'Dist::Zilla::Plugin::' . $pn;
-
-$t->add_file( 'dist.ini', simple_ini( ['Bootstrap::lib'], ['GatherDir'], ['MetaConfig'], [$pn], ) );
-$t->add_file( 'lib/Dist/Zilla/Plugin/' . $pn . '.pm', <<"EOF");
+my $pn = 'TestPlugin';
+my $fpn = 'Dist::Zilla::Plugin::' . $pn;
+my $files = {};
+$files->{'source/dist.ini'} = simple_ini( ['Bootstrap::lib'], ['GatherDir'], ['MetaConfig'], [$pn], );
+$files->{ 'source/lib/Dist/Zilla/Plugin/' . $pn . '.pm' } = <<"EOF";
package $fpn;
use Moose qw( has around with );
@@ -34,10 +32,12 @@ no Moose;
1;
EOF
+my $t = Builder->from_config( { dist_root => 'invalid' }, { add_files => $files } );
+$t->chrome->logger->set_debug(1);
+$t->build;
-$t->build_ok;
-$t->meta_path_deeply(
- '/x_Dist_Zilla/plugins/*/*[ key eq \'class\' and value eq \'Dist::Zilla::Plugin::TestPlugin\' ]/../*[ key eq \'config\']',
+is_deeply(
+ [ map { $_->{config} } grep { $_->{class} eq $fpn } @{ $t->distmeta->{x_Dist_Zilla}->{plugins} } ],
[
{
'Dist::Zilla::Plugin::TestPlugin' => {
@@ -48,5 +48,3 @@ $t->meta_path_deeply(
],
"Plugin list expected"
);
-done_testing;
-
diff --git a/t/basic_inherit_attr.t b/t/basic_inherit_attr.t
index 3fff4a7..2fb5ee9 100644
--- a/t/basic_inherit_attr.t
+++ b/t/basic_inherit_attr.t
@@ -1,9 +1,8 @@
use strict;
use warnings;
-use Test::More;
-use Test::DZil qw( simple_ini );
-use Dist::Zilla::Util::Test::KENTNL 1.001 qw( dztest );
+use Test::More tests => 1;
+use Test::DZil qw( simple_ini Builder );
# ABSTRACT: Make sure plugins do what they say they'll do
@@ -13,12 +12,11 @@ require Dist::Zilla::Plugin::Bootstrap::lib;
require Dist::Zilla::Plugin::GatherDir;
require Dist::Zilla::Plugin::MetaConfig;
-my $t = dztest();
-my $pn = 'TestPlugin';
-my $fpn = 'Dist::Zilla::Plugin::' . $pn;
-
-$t->add_file( 'dist.ini', simple_ini( ['Bootstrap::lib'], ['GatherDir'], ['MetaConfig'], [$pn], ) );
-$t->add_file( 'lib/Dist/Zilla/Plugin/BasePlugin.pm', <<"EOREOR" );
+my $pn = 'TestPlugin';
+my $fpn = 'Dist::Zilla::Plugin::' . $pn;
+my $files = {};
+$files->{'source/dist.ini'} = simple_ini( ['Bootstrap::lib'], ['GatherDir'], ['MetaConfig'], [$pn], );
+$files->{'source/lib/Dist/Zilla/Plugin/BasePlugin.pm'} = <<"EOREOR";
package #
Dist::Zilla::Plugin::BasePlugin;
@@ -34,8 +32,7 @@ around dump_config => config_dumper(__PACKAGE__, { attrs => [qw( attr )] });
no Moose;
1;
EOREOR
-
-$t->add_file( 'lib/Dist/Zilla/Plugin/' . $pn . '.pm', <<"EOF");
+$files->{ 'source/lib/Dist/Zilla/Plugin/' . $pn . '.pm' } = <<"EOF";
package $fpn;
use Moose qw( has around extends );
@@ -51,10 +48,11 @@ no Moose;
1;
EOF
-
-$t->build_ok;
-$t->meta_path_deeply(
- '/x_Dist_Zilla/plugins/*/*[ key eq \'class\' and value eq \'Dist::Zilla::Plugin::TestPlugin\' ]/../*[ key eq \'config\']',
+my $t = Builder->from_config( { dist_root => 'invalid' }, { add_files => $files } );
+$t->chrome->logger->set_debug(1);
+$t->build;
+is_deeply(
+ [ map { $_->{config} } grep { $_->{class} eq $fpn } @{ $t->distmeta->{x_Dist_Zilla}->{plugins} } ],
[
{
'Dist::Zilla::Plugin::TestPlugin' => { 'childattr' => 'Rainbows and lollypops, etc' },
@@ -63,5 +61,4 @@ $t->meta_path_deeply(
],
"Plugin list expected"
);
-done_testing;
-
+note explain grep { $_->{class} eq $fpn } @{ $t->distmeta->{x_Dist_Zilla}->{plugins} };
diff --git a/t/basic_role_attr.t b/t/basic_role_attr.t
index 1db95b7..fd4d1a2 100644
--- a/t/basic_role_attr.t
+++ b/t/basic_role_attr.t
@@ -1,9 +1,8 @@
use strict;
use warnings;
-use Test::More;
-use Test::DZil qw( simple_ini );
-use Dist::Zilla::Util::Test::KENTNL 1.001 qw( dztest );
+use Test::More tests => 1;
+use Test::DZil qw( simple_ini Builder );
# ABSTRACT: Make sure plugins do what they say they'll do
@@ -13,12 +12,11 @@ require Dist::Zilla::Plugin::Bootstrap::lib;
require Dist::Zilla::Plugin::GatherDir;
require Dist::Zilla::Plugin::MetaConfig;
-my $t = dztest();
-my $pn = 'TestPlugin';
-my $fpn = 'Dist::Zilla::Plugin::' . $pn;
-
-$t->add_file( 'dist.ini', simple_ini( ['Bootstrap::lib'], ['GatherDir'], ['MetaConfig'], [$pn], ) );
-$t->add_file( 'lib/Dist/Zilla/Role/TestRole.pm', <<"EOREOR" );
+my $pn = 'TestPlugin';
+my $fpn = 'Dist::Zilla::Plugin::' . $pn;
+my $files = {};
+$files->{'source/dist.ini'} = simple_ini( ['Bootstrap::lib'], ['GatherDir'], ['MetaConfig'], [$pn], );
+$files->{'source/lib/Dist/Zilla/Role/TestRole.pm'} = <<"EOREOR";
package #
Dist::Zilla::Role::TestRole;
@@ -33,8 +31,7 @@ around dump_config => config_dumper(__PACKAGE__, { attrs => [qw( attr )] });
no Moose;
1;
EOREOR
-
-$t->add_file( 'lib/Dist/Zilla/Plugin/' . $pn . '.pm', <<"EOF");
+$files->{ 'source/lib/Dist/Zilla/Plugin/' . $pn . '.pm' } = <<"EOF";
package $fpn;
use Moose qw( has around with );
@@ -50,10 +47,11 @@ no Moose;
1;
EOF
-
-$t->build_ok;
-$t->meta_path_deeply(
- '/x_Dist_Zilla/plugins/*/*[ key eq \'class\' and value eq \'Dist::Zilla::Plugin::TestPlugin\' ]/../*[ key eq \'config\']',
+my $t = Builder->from_config( { dist_root => 'invalid' }, { add_files => $files } );
+$t->chrome->logger->set_debug(1);
+$t->build;
+is_deeply(
+ [ map { $_->{config} } grep { $_->{class} eq $fpn } @{ $t->distmeta->{x_Dist_Zilla}->{plugins} } ],
[
{
'Dist::Zilla::Plugin::TestPlugin' => { 'childattr' => 'Rainbows and lollypops, etc' },
@@ -61,5 +59,3 @@ $t->meta_path_deeply(
],
"Plugin list expected"
);
-done_testing;
-
diff --git a/t/callback.t b/t/callback.t
index 44a0f48..17afd0f 100644
--- a/t/callback.t
+++ b/t/callback.t
@@ -1,9 +1,8 @@
use strict;
use warnings;
-use Test::More;
-use Test::DZil qw( simple_ini );
-use Dist::Zilla::Util::Test::KENTNL 1.001 qw( dztest );
+use Test::More tests => 1;
+use Test::DZil qw( simple_ini Builder );
# ABSTRACT: Make sure plugins do what they say they'll do
@@ -13,12 +12,11 @@ require Dist::Zilla::Plugin::Bootstrap::lib;
require Dist::Zilla::Plugin::GatherDir;
require Dist::Zilla::Plugin::MetaConfig;
-my $t = dztest();
-my $pn = 'TestPlugin';
-my $fpn = 'Dist::Zilla::Plugin::' . $pn;
-
-$t->add_file( 'dist.ini', simple_ini( ['Bootstrap::lib'], ['GatherDir'], ['MetaConfig'], [$pn], ) );
-$t->add_file( 'lib/Dist/Zilla/Plugin/' . $pn . '.pm', <<"EOF");
+my $pn = 'TestPlugin';
+my $fpn = 'Dist::Zilla::Plugin::' . $pn;
+my $files = {};
+$files->{'source/dist.ini'} = simple_ini( ['Bootstrap::lib'], ['GatherDir'], ['MetaConfig'], [$pn], );
+$files->{ 'source/lib/Dist/Zilla/Plugin/' . $pn . '.pm' } = <<"EOF";
package $fpn;
use Moose qw( has around with );
@@ -34,12 +32,11 @@ no Moose;
1;
EOF
-
-$t->build_ok;
-$t->meta_path_deeply(
- '/x_Dist_Zilla/plugins/*/*[ key eq \'class\' and value eq \'Dist::Zilla::Plugin::TestPlugin\' ]/../*[ key eq \'config\']',
+my $t = Builder->from_config( { dist_root => "invalid" }, { add_files => $files } );
+$t->chrome->logger->set_debug(1);
+$t->build;
+is_deeply(
+ [ map { $_->{config} } grep { $_->{class} eq $fpn } @{ $t->distmeta->{x_Dist_Zilla}->{plugins} } ],
[ { 'Dist::Zilla::Plugin::TestPlugin' => { 'foo' => 'bar' } } ],
"Plugin list expected"
);
-done_testing;
-
diff --git a/t/failattr.t b/t/failattr.t
index be0310d..4525df2 100644
--- a/t/failattr.t
+++ b/t/failattr.t
@@ -1,9 +1,8 @@
use strict;
use warnings;
-use Test::More;
-use Test::DZil qw( simple_ini );
-use Dist::Zilla::Util::Test::KENTNL 1.001 qw( dztest );
+use Test::More tests => 1;
+use Test::DZil qw( simple_ini Builder );
# ABSTRACT: Make sure failures go in the right places
@@ -13,12 +12,11 @@ require Dist::Zilla::Plugin::Bootstrap::lib;
require Dist::Zilla::Plugin::GatherDir;
require Dist::Zilla::Plugin::MetaConfig;
-my $t = dztest();
-my $pn = 'TestPlugin';
-my $fpn = 'Dist::Zilla::Plugin::' . $pn;
-
-$t->add_file( 'dist.ini', simple_ini( ['Bootstrap::lib'], ['GatherDir'], ['MetaConfig'], [$pn], ) );
-$t->add_file( 'lib/Dist/Zilla/Plugin/' . $pn . '.pm', <<"EOF");
+my $pn = 'TestPlugin';
+my $fpn = 'Dist::Zilla::Plugin::' . $pn;
+my $files = {};
+$files->{'source/dist.ini'} = simple_ini( ['Bootstrap::lib'], ['GatherDir'], ['MetaConfig'], [$pn], );
+$files->{ 'source/lib/Dist/Zilla/Plugin/' . $pn . '.pm' } = <<"EOF";
package $fpn;
use Moose qw( has around with );
@@ -34,10 +32,11 @@ no Moose;
1;
EOF
-
-$t->build_ok;
-$t->meta_path_deeply(
- '/x_Dist_Zilla/plugins/*/*[ key eq \'class\' and value eq \'Dist::Zilla::Plugin::TestPlugin\' ]/../*[ key eq \'config\']',
+my $t = Builder->from_config( { dist_root => 'invalid' }, { add_files => $files } );
+$t->chrome->logger->set_debug(1);
+$t->build;
+is_deeply(
+ [ map { $_->{config} } grep { $_->{class} eq $fpn } @{ $t->distmeta->{x_Dist_Zilla}->{plugins} } ],
[
{
'Dist::Zilla::Util::ConfigDumper' => {
@@ -47,5 +46,3 @@ $t->meta_path_deeply(
],
"Plugin list expected"
);
-done_testing;
-
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libdist-zilla-util-configdumper-perl.git
More information about the Pkg-perl-cvs-commits
mailing list