X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Fadmin%2F10script.t;h=e65ad7da8b7bd5152e2d9d6ba83e976bf640a3ad;hb=cb551b07;hp=9414b84623d3e1fe2d4292c3fdc944c805f2939a;hpb=afb8fc5295f37e051ab76636d1f73538f42edc08;p=dbsrgits%2FDBIx-Class.git diff --git a/t/admin/10script.t b/t/admin/10script.t index 9414b84..e65ad7d 100644 --- a/t/admin/10script.t +++ b/t/admin/10script.t @@ -1,27 +1,22 @@ -# vim: filetype=perl +use DBIx::Class::Optional::Dependencies -skip_all_without => 'test_admin_script'; + use strict; use warnings; +BEGIN { + # just in case the user env has stuff in it + delete $ENV{JSON_ANY_ORDER}; +} + 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}; -} - $ENV{PATH} = ''; $ENV{PERL5LIB} = join ($Config{path_sep}, @INC); -require JSON::Any; my @json_backends = qw(DWIW PP JSON CPANEL XS); # test the script is setting @INC properly