X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Fversion_storages%2Fstandard.t;h=2d049a50fdaf2bed4c1b3cf48c634cb0ebad7e0a;hb=7b3d00f984e43c319a637332579e950376637a3d;hp=5a36e1af1cc96a3682b9cba0c45c7657b95839e6;hpb=be140a5f1f8ab40705bf4cbedb74761c4994a765;p=dbsrgits%2FDBIx-Class-DeploymentHandler.git diff --git a/t/version_storages/standard.t b/t/version_storages/standard.t index 5a36e1a..2d049a5 100644 --- a/t/version_storages/standard.t +++ b/t/version_storages/standard.t @@ -1,19 +1,22 @@ #!perl +use strict; +use warnings; + use Test::More; -use Test::Deep; use Test::Exception; use lib 't/lib'; use DBICDHTest; use aliased 'DBIx::Class::DeploymentHandler::VersionStorage::Standard'; use aliased 'DBIx::Class::DeploymentHandler::DeployMethod::SQL::Translator'; +use File::Temp 'tempdir'; use DBICVersion_v1; use DBIx::Class::DeploymentHandler; -my $db = 'dbi:SQLite:db.db'; -my @connection = ($db, '', '', { ignore_version => 1 }); -my $sql_dir = 't/sql'; +my $dbh = DBICDHTest::dbh(); +my @connection = (sub { $dbh }, { ignore_version => 1 }); +my $sql_dir = tempdir( CLEANUP => 1 ); my $s = DBICVersion::Schema->connect(@connection); { @@ -23,11 +26,9 @@ my $s = DBICVersion::Schema->connect(@connection); like( $warning, qr/Your DB is currently unversioned. Please call upgrade on your schema to sync the DB/, 'warning when database is unversioned'); } -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 }, }); @@ -76,11 +77,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'); }