X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Fversion_storages%2Fstandard.t;h=27dafc8cd544664e5e89430d863e9146f5a13bed;hb=25c3bec32fc9c632b30dd8f90f109de1dd1c20d4;hp=d3d3ff7f4ce0565089c5e3097cfc671eb8e07587;hpb=02a7b8ac7ff6775fa47f26d22a825d024637a1a6;p=dbsrgits%2FDBIx-Class-DeploymentHandler.git diff --git a/t/version_storages/standard.t b/t/version_storages/standard.t index d3d3ff7..27dafc8 100644 --- a/t/version_storages/standard.t +++ b/t/version_storages/standard.t @@ -1,5 +1,8 @@ #!perl +use strict; +use warnings; + use Test::More; use Test::Deep; use Test::Exception; @@ -11,8 +14,8 @@ use aliased 'DBIx::Class::DeploymentHandler::DeployMethod::SQL::Translator'; use DBICVersion_v1; use DBIx::Class::DeploymentHandler; -my $db = 'dbi:SQLite:db.db'; -my @connection = ($db, '', '', { ignore_version => 1 }); +my $dbh = DBI->connect('dbi:SQLite::memory:'); +my @connection = (sub { $dbh }, { ignore_version => 1 }); my $sql_dir = 't/sql'; my $s = DBICVersion::Schema->connect(@connection); @@ -27,25 +30,25 @@ DBICDHTest::ready; my $dm = Translator->new({ schema => $s, - upgrade_directory => $sql_dir, + script_directory => $sql_dir, databases => ['SQLite'], sql_translator_args => { add_drop_table => 0 }, }); my $vs = Standard->new({ schema => $s }); -$dm->prepare_resultsource_install( - $vs->version_rs->result_source -); +$dm->prepare_resultsource_install({ + result_source => $vs->version_rs->result_source +}); ok( $vs, 'DBIC::DH::VersionStorage::Standard instantiates correctly' ); ok( !$vs->version_storage_is_installed, 'VersionStorage is not yet installed' ); -$dm->install_resultsource( - $vs->version_rs->result_source, - '1.0', -); +$dm->install_resultsource({ + result_source => $vs->version_rs->result_source, + version => '1.0', +}); ok( $vs->version_storage_is_installed, 'VersionStorage is now installed' ); @@ -76,11 +79,12 @@ ok( 'adding another version works correctly' ); +my $u; { my $warning; local $SIG{__WARN__} = sub {$warning = shift}; - my $u = DBICVersion::Schema->connect($db, '', ''); - like( $warning, qr/Versions out of sync. This is 1.0, your database contains version 2.0, please call upgrade on your Schema./, 'warning when database/schema mismatch'); + $u = DBICVersion::Schema->connect(sub { $dbh }); + like( $warning, qr/Versions out of sync. This is 1\.0, your database contains version 2\.0, please call upgrade on your Schema\./, 'warning when database/schema mismatch'); }