X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Fdeploy_methods%2Fsql_translator.t;h=4f10f655244c8ed947f74da9bcb48d25bae3d370;hb=09bc35e3b405fbac725a45739e15cf30543d7f77;hp=704b998a2176fd5a286662ec234f4c7744668fd8;hpb=be140a5f1f8ab40705bf4cbedb74761c4994a765;p=dbsrgits%2FDBIx-Class-DeploymentHandler.git

diff --git a/t/deploy_methods/sql_translator.t b/t/deploy_methods/sql_translator.t
index 704b998..4f10f65 100644
--- a/t/deploy_methods/sql_translator.t
+++ b/t/deploy_methods/sql_translator.t
@@ -20,7 +20,7 @@ VERSION1: {
    my $s = DBICVersion::Schema->connect(@connection);
    my $dm = Translator->new({
       schema            => $s,
-      upgrade_directory => $sql_dir,
+      script_directory => $sql_dir,
       databases         => ['SQLite'],
       sql_translator_args          => { add_drop_table => 0 },
    });
@@ -44,11 +44,6 @@ VERSION1: {
       $dm->prepare_deploy;
       ok( $warned, 'prepare_deploy warns if you run it twice' );
    }
-   mkpath(catfile(qw( t sql _common schema 1.0 )));
-   open my $common, '>',
-      catfile(qw( t sql _common schema 1.0 002-error.sql ));
-   print {$common} qq<syntax fail\n\n>;
-   close $common;
 
    ok(
       -f catfile(qw( t sql SQLite schema 1.0 001-auto.sql )),
@@ -61,17 +56,7 @@ VERSION1: {
       })
    } 'schema not deployed';
 
-   mkpath catfile(qw( t sql _common schema 1.0 ));
-   open $common, '>',
-      catfile(qw( t sql _common schema 1.0 001-auto.sql ));
-   print {$common} qq<This will never get run>;
-   close $common;
-   {
-      my $warned = 0;
-      local $SIG{__WARN__} = sub{$warned = 1};
-      $dm->deploy;
-      ok( $warned, 'deploy warns on sql errors' );
-   }
+   $dm->deploy;
 
    lives_ok {
       $s->resultset('Foo')->create({
@@ -85,7 +70,7 @@ VERSION2: {
    my $s = DBICVersion::Schema->connect(@connection);
    my $dm = Translator->new({
       schema            => $s,
-      upgrade_directory => $sql_dir,
+      script_directory => $sql_dir,
       databases         => ['SQLite'],
       sql_translator_args          => { add_drop_table => 0 },
       txn_wrap          => 1,
@@ -192,7 +177,7 @@ VERSION3: {
    my $s = DBICVersion::Schema->connect(@connection);
    my $dm = Translator->new({
       schema            => $s,
-      upgrade_directory => $sql_dir,
+      script_directory => $sql_dir,
       databases         => ['SQLite'],
       sql_translator_args          => { add_drop_table => 0 },
       txn_wrap          => 0,