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 Data::Dumper;
+use Test::Requires qw(Catalyst::Helper DBIx::Class::Schema::Loader);
my $helper = Catalyst::Helper->new;
$helper->{base} = $Bin;
is_deeply $i->components, ['InflateColumn::DateTime', 'TimeStamp', 'Foo'],
'two extra components';
-my $flags = qr// =~ /\^/ ? '^' : "-xism";
+# Different versions of perl and Data::Dumper serialise regexes differently
+my ($flagstart, $flagend, $postflag) = Dumper(qr//) =~ m{qr/(.*?)(\)?)/([a-z]*)};
$i = instance(args => [$static, q{constraint=^(foo|bar)$}]);
is $i->loader_args->{constraint}, qr/^(foo|bar)$/,
'constraint loader arg';
is $i->helper->{loader_args}{constraint},
- qq{qr/(?$flags:^(foo|bar)\$)/},
+ qq{qr/$flagstart^(foo|bar)\$$flagend/$postflag},
'constraint loader arg as string';
$i = instance(args => [$static, q{exclude=^(foo|bar)$}]);
is $i->loader_args->{db_schema}, 'myschema',
'loader arg after connect_info';
+ok ((not exists $i->helper->{connect_info}{db_schema}),
+ 'loader args removed from connect_info');
+
done_testing;
sub instance {