0.14 release, Changes updated, tests fixed

diff --git a/Changes b/Changes
index 94e0770..c393416 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,6 +1,6 @@
 Revision history for Perl extension Catalyst::Model::DBIC::Schema
 
-0.14  Not yet released - To be released with DBIx::Class::Schema::Loader 0.03001
+0.14  Mon Jun  5 23:34:35 UTC 2006
         - Helpers merged, helper syntax changed
         - Everything updated for Schema::Loader 0.03001 support, including
           what amounts to using Loader in one-shot mode to generate

diff --git a/t/01use.t b/t/01use.t
index 5c130d8..f0b7457 100644 (file)
--- a/t/01use.t
+++ b/t/01use.t
@@ -1,6 +1,5 @@
 use strict;
-use Test::More tests => 3;
+use Test::More tests => 2;
 
 BEGIN { use_ok('Catalyst::Model::DBIC::Schema') }
 BEGIN { use_ok('Catalyst::Helper::Model::DBIC::Schema') }
-BEGIN { use_ok('Catalyst::Helper::Model::DBIC::SchemaLoader') }

diff --git a/t/05testapp.t b/t/05testapp.t
index c431372..1672327 100644 (file)
--- a/t/05testapp.t
+++ b/t/05testapp.t
@@ -7,10 +7,11 @@ use File::Find;
 plan skip_all => 'Enable this optional test with $ENV{C_M_DBIC_SCHEMA_TESTAPP}'
     unless $ENV{C_M_DBIC_SCHEMA_TESTAPP};
 
+# XXX this test needs a re-write to fully test the current set of capabilities...
+
 my $test_params = [
     [ 'TestSchema', 'DBIC::Schema', '' ],
     [ 'TestSchemaDSN', 'DBIC::Schema', q{fakedsn fakeuser fakepass '{ AutoCommit => 1 }'} ],
-    [ 'TestSchemaLoader', 'DBIC::SchemaLoader', q{fakedsn fakeuser fakepass '{ AutoCommit => 1 }'} ],
 ];
 
 plan tests => (2 * @$test_params);
@@ -28,11 +29,7 @@ chdir($cat_dir);
 
 foreach my $tparam (@$test_params) {
    my ($model, $helper, $args) = @$tparam;
-   my $model_two = $model;
-   if($helper =~ /Loader/) {
-       $model_two = '';
-   }
-   system("$^X -I$blib_dir $creator model $model $helper $model_two $args");
+   system("$^X -I$blib_dir $creator model $model $helper $model $args");
    my $model_path = File::Spec->catfile($model_dir, $model . '.pm');
    ok( -f $model_path, "$model_path is a file" );
    my $compile_rv = system("$^X -I$blib_dir -I$catlib_dir -c $model_path");