X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Fcdbi%2Fhas_many_loads_foreign_class.t;h=5485972cba70059bb3592c783b7ec924d692c688;hb=83eef5621cc3a7b77a280b4b01f1175e9935fff6;hp=51cec5d1dc061c484db4bd603945edca0eaeda38;hpb=db29433c74a98967f61f117bd508c06055db2892;p=dbsrgits%2FDBIx-Class.git

diff --git a/t/cdbi/has_many_loads_foreign_class.t b/t/cdbi/has_many_loads_foreign_class.t
index 51cec5d..5485972 100644
--- a/t/cdbi/has_many_loads_foreign_class.t
+++ b/t/cdbi/has_many_loads_foreign_class.t
@@ -1,20 +1,17 @@
-use strict;
-use Test::More;
-use Class::Inspector ();
+use DBIx::Class::Optional::Dependencies -skip_all_without => 'cdbicompat';
 
-BEGIN {
-  eval "use DBIx::Class::CDBICompat;";
-  plan skip_all => 'Class::Trigger and DBIx::ContextualFetch required' if $@;
-  plan tests => 3;
-}
+use strict;
+use warnings;
 
+use Test::More;
 
 use lib 't/cdbi/testlib';
 use Director;
 
-# Test that has_many() will load the foreign class.
+# Test that has_many() will load the foreign class
+require Class::Inspector;
 ok !Class::Inspector->loaded( 'Film' );
-ok eval { Director->has_many( films => 'Film' ); 1; } || diag $@;
+ok eval { Director->has_many( films => 'Film' ); 1; } or diag $@;
 
 my $shan_hua = Director->create({
     Name    => "Shan Hua",
@@ -33,4 +30,6 @@ my $guillotine = Film->create({
     Director    => "Yu Wang",
 });
 
-is_deeply [sort $shan_hua->films], [sort $inframan, $guillotine2];
\ No newline at end of file
+is_deeply [sort $shan_hua->films], [sort $inframan, $guillotine2];
+
+done_testing;