X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Makefile.PL;h=b014ca941d6bb22e0fb14318558cb68d9d59247c;hb=dc0e73a30aaaf9a8b85d86ac5be6554b57fa8fea;hp=de27fe1cbc4788e03607a301aa308d39115df8c3;hpb=6b2a933b5b3820e494f9b5804c7c2eb6083bcf09;p=catagits%2FCatalyst-Runtime.git

diff --git a/Makefile.PL b/Makefile.PL
index de27fe1..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,12 +126,16 @@ 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',
     );
 
     my $found = 0;
     for my $mod ( sort keys %conflicts ) {
-        eval "require $mod";
+        eval "require($mod)";
         next if $@;
 
         my $installed = $mod->VERSION();