Release commit for 0.07049

[dbsrgits/DBIx-Class-Schema-Loader.git] / t / 60dbicdump_config.t

diff --git a/t/60dbicdump_config.t b/t/60dbicdump_config.t
index 12c5153..fb2d067 100644 (file)
--- a/t/60dbicdump_config.t
+++ b/t/60dbicdump_config.t
@@ -1,22 +1,18 @@
-#!perl
+use DBIx::Class::Schema::Loader::Optional::Dependencies
+    -skip_all_without => 'test_dbicdump_config';
 
 use strict;
 use warnings;
 
 use Test::More;
 use File::Path qw/make_path rmtree/;
-use DBIx::Class::Schema::Loader::Optional::Dependencies ();
 use DBIx::Class::Schema::Loader::Utils 'slurp_file';
+use Try::Tiny;
+use namespace::clean;
 use lib 't/lib';
 use make_dbictest_db ();
 use dbixcsl_test_dir '$tdir';
 
-BEGIN {
-  use DBIx::Class::Schema::Loader::Optional::Dependencies ();
-  plan skip_all => 'Tests needs ' . DBIx::Class::Schema::Loader::Optional::Dependencies->req_missing_for('test_dbicdump_config')
-    unless (DBIx::Class::Schema::Loader::Optional::Dependencies->req_ok_for('test_dbicdump_config'));
-}
-
 plan tests => 2;
 
 my $config_dir  = "$tdir/dbicdump_config";
@@ -31,14 +27,17 @@ open my $fh, '>', $config_file
 print $fh <<"EOF";
 schema_class DBICTest::Schema
 
+lib t/lib
+
 <connect_info>
     dsn $make_dbictest_db::dsn
 </connect_info>
 
 <loader_options>
-    dump_directory $dump_path
-    components     InflateColumn::DateTime
-    quiet          1
+    dump_directory    $dump_path
+    components        InflateColumn::DateTime
+    schema_base_class TestSchemaBaseClass
+    quiet             1
 </loader_options>
 EOF
 
@@ -49,7 +48,7 @@ system $^X, 'script/dbicdump', $config_file;
 is $? >> 8, 0,
     'dbicdump executed successfully';
 
-my $foo = slurp_file "$dump_path/DBICTest/Schema/Result/Foo.pm";
+my $foo = try { slurp_file "$dump_path/DBICTest/Schema/Result/Foo.pm" } || '';
 
 like $foo, qr/InflateColumn::DateTime/,
     'loader options read correctly from config_file';