X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Makefile.PL;h=b014ca941d6bb22e0fb14318558cb68d9d59247c;hb=6c04a1eadc9d788231680a9ae7bff50d448899a3;hp=8cebceb6b21b207ab959206e7e00f5eded8d32ae;hpb=d1c083f90684cbf2a4589ebecdfa2f57a31eb448;p=catagits%2FCatalyst-Runtime.git diff --git a/Makefile.PL b/Makefile.PL index 8cebceb..b014ca9 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -35,6 +35,7 @@ requires 'Text::Balanced'; # core in 5.8.x but mentioned for completeness requires 'MRO::Compat'; test_requires 'Class::Data::Inheritable'; +test_requires 'Test::MockObject'; if ( ( exists $ENV{AGGREGATE_TESTS} && !$ENV{AGGREGATE_TESTS}) || (!exists $ENV{AGGREGATE_TESTS} && !can_use('Test::Aggregate', '0.34_01'))) { @@ -125,6 +126,8 @@ check_conflicts(); # Nicked straight from Moose! sub check_conflicts { my %conflicts = ( + 'Catalyst::Action::RenderView' => '0.08', + 'Catalyst::Plugin::DebugCookie' => '0.999002', 'Catalyst::Plugin::Authentication' => '0.100092', 'CatalystX::Imports' => '0.03', 'Catalyst-Plugin-HashedCookies' => '1.03', @@ -132,7 +135,7 @@ sub check_conflicts { my $found = 0; for my $mod ( sort keys %conflicts ) { - eval "require $mod"; + eval "require($mod)"; next if $@; my $installed = $mod->VERSION();