test_require Test::MockObject.

[catagits/Catalyst-Runtime.git] / Makefile.PL

diff --git a/Makefile.PL b/Makefile.PL
index 4ea6d0d..15b0374 100644 (file)
--- 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'))) {
@@ -126,6 +127,8 @@ check_conflicts();
 sub check_conflicts {
     my %conflicts = (
         'Catalyst::Plugin::Authentication' => '0.100092',
+        'CatalystX::Imports'               => '0.03',
+        'Catalyst-Plugin-HashedCookies'    => '1.03',
     );
 
     my $found = 0;
@@ -155,7 +158,7 @@ EOF
     return unless $found;
 
     # More or less copied from Module::Build
-    return if  $ENV{PERL_MM_USE_DEFAULT};
+    return if $ENV{PERL_MM_USE_DEFAULT};
     return unless -t STDIN && (-t STDOUT || !(-f STDOUT || -c STDOUT));
 
     sleep 4;