Factor out author count anouncement, making it seen on plain installs

[dbsrgits/DBIx-Class.git] / t / admin / 10script.t

diff --git a/t/admin/10script.t b/t/admin/10script.t
index 9f4ab90..e65ad7d 100644 (file)
--- a/t/admin/10script.t
+++ b/t/admin/10script.t
@@ -1,29 +1,23 @@
-# vim: filetype=perl
+use DBIx::Class::Optional::Dependencies -skip_all_without => 'test_admin_script';
+
 use strict;
 use warnings;
 
-use Test::More;
-use Config;
-use File::Spec;
-use lib qw(t/lib);
-use DBICTest;
-
 BEGIN {
-  require DBIx::Class;
-  plan skip_all => 'Test needs ' .
-    DBIx::Class::Optional::Dependencies->req_missing_for('test_admin_script')
-      unless DBIx::Class::Optional::Dependencies->req_ok_for('test_admin_script');
-
   # just in case the user env has stuff in it
   delete $ENV{JSON_ANY_ORDER};
 }
 
-use JSON::Any;
+use Test::More;
+use Config;
+use File::Spec;
+use lib qw(t/lib);
+use DBICTest;
 
 $ENV{PATH} = '';
 $ENV{PERL5LIB} = join ($Config{path_sep}, @INC);
 
-my @json_backends = qw/XS JSON DWIW/;
+my @json_backends = qw(DWIW PP JSON CPANEL XS);
 
 # test the script is setting @INC properly
 test_exec (qw|-It/lib/testinclude --schema=DBICTestAdminInc --connect=[] --insert|);
@@ -42,9 +36,9 @@ cmp_ok ($? >> 8, '==', 71, 'Correct schema loaded via testconfig');
 
 for my $js (@json_backends) {
 
-    eval {JSON::Any->import ($js) };
     SKIP: {
-        skip ("JSON backend $js is not available, skip testing", 1) if $@;
+        eval {JSON::Any->import ($js); 1 }
+          or skip ("JSON backend $js is not available, skip testing", 1);
 
         local $ENV{JSON_ANY_ORDER} = $js;
         eval { test_dbicadmin () };