make sure we do not run helper test if the helper feature is not installed

diff --git a/Changes b/Changes
index fe566fa..6b7b59c 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,5 +1,9 @@
 Revision history for Perl extension Catalyst::Model::DBIC::Schema
 
+0.54  Fri Aug  5 11:29:00 EDT 2011
+        - Changed t/08helper.t to skip if required features are not installed.
+        - tweaked the Makefile.PL to support these changes
+
 0.53  Wed Aug  3 03:45:07 UTC 2011
         - check loader args after connect_info against loader methods and remove
           them from connect_info

diff --git a/Makefile.PL b/Makefile.PL
index 9b0c698..5d817f8 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -18,6 +18,8 @@ requires 'Try::Tiny';
 
 test_requires 'Test::More' => '0.94';
 test_requires 'Test::Exception';
+test_requires 'Storable';
+test_requires 'Test::Requires';
 
 feature 'Catalyst::Helper support',
     -default                      => 0,

diff --git a/lib/Catalyst/Model/DBIC/Schema.pm b/lib/Catalyst/Model/DBIC/Schema.pm
index f31c586..63ba367 100644 (file)
--- a/lib/Catalyst/Model/DBIC/Schema.pm
+++ b/lib/Catalyst/Model/DBIC/Schema.pm
@@ -5,7 +5,7 @@ use mro 'c3';
 extends 'Catalyst::Model';
 with 'CatalystX::Component::Traits';
 
-our $VERSION = '0.53';
+our $VERSION = '0.54';
 $VERSION = eval $VERSION;
 
 use namespace::autoclean;

diff --git a/t/08helper.t b/t/08helper.t
index 0c8afd3..09ae5eb 100644 (file)
--- a/t/08helper.t
+++ b/t/08helper.t
@@ -8,8 +8,7 @@ use Test::More;
 use Test::Exception;
 use Catalyst::Helper::Model::DBIC::Schema;
 use Storable 'dclone';
-eval "use Catalyst::Helper";
-plan skip_all => 'Catalyst::Helper required for tests' if $@;
+use Test::Requires qw(Catalyst::Helper DBIx::Class::Schema::Loader);
 
 my $helper      = Catalyst::Helper->new;
 $helper->{base} = $Bin;