More tests, bump required Cat version, update TODO

diff --git a/Makefile.PL b/Makefile.PL
index 2e2199a..77737c2 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -7,7 +7,7 @@ requires 'Moose';
 requires 'File::ShareDir';
 requires 'namespace::clean';
 requires 'namespace::autoclean';
-requires 'Catalyst'    => '5.8000';
+requires 'Catalyst'    => '5.8001402';
 requires 'Catalyst::Action::RenderView' => '0.04';
 requires 'Catalyst::Plugin::Static::Simple' => '0.16';
 requires 'Catalyst::Plugin::ConfigLoader';

diff --git a/TODO.devel b/TODO.devel
index e1f0096..4cbde30 100644 (file)
--- a/TODO.devel
+++ b/TODO.devel
@@ -1,4 +1,5 @@
-. More tests
-. Test component class generation
-. Test TT helper generation
-
+. Manually test script_create and component class creation
+. Tests for component class generation in generated app
+. Manually test TT helper generation
+. More attributes in ::Helper?
+. Tests for Helper construction by other things (what does TT helper do for example)

diff --git a/t/generated_app.t b/t/generated_app.t
index 73bb7f6..96f038b 100644 (file)
--- a/t/generated_app.t
+++ b/t/generated_app.t
@@ -10,7 +10,7 @@ my $devnull = File::Spec->devnull;
 
 use Test::More;
 
-diag "In $dir";
+diag "Generated app is in $dir";
 
 {
     my $exit;
@@ -59,13 +59,13 @@ foreach my $fn (@files) {
     if ($fn =~ /script/) {
         ok -x $fn, "$fn is executable";
     }
+    if ($fn =~ /\.p[ml]/) {
+        is system($^X, '-c', $fn), 0, "$fn compiles";
+    }
 }
 
-## Makefile stuff
-my $makefile_status = `$^X Makefile.PL`;
-ok $makefile_status, "Makefile ran okay";
-ok -e "Makefile", "Makefile exists";
-
+is system($^X, 'Makefile.PL'), 0, 'Ran Makefile.PL';
+ok -e "Makefile", "Makefile generated";
 is system("make"), 0, 'Run make';
 
 {
@@ -79,11 +79,12 @@ is system("make"), 0, 'Run make';
 }
 
 my $server_script = do {
-    open(my $fh, '<', 'script/testapp_server.pl') or die $!;
+    open(my $fh, '<', File::Spec->catdir(qw/script testapp_server.pl/)) or fail $!;
     local $/;
     <$fh>;
 };
 
+ok $server_script;
 ok $server_script =~ qr/CATALYST_SCRIPT_GEN}\s+=\s+(\d+)/,
     'SCRIPT_GEN found in generated output';
 is $1, $Catalyst::Devel::CATALYST_SCRIPT_GEN, 'Script gen correct';

diff --git a/t/render_file_contents.t b/t/render_file_contents.t
index dffd490..4fd3205 100644 (file)
--- a/t/render_file_contents.t
+++ b/t/render_file_contents.t
@@ -15,6 +15,7 @@ close $fh;
 
 ok( $helper->render_file_contents('example1',  $fn, { test_var => 'test_val' }), "file contents rendered" ); 
 ok -r $fn;
+ok -s $fn;
 unlink $fn;
 
 done_testing;

diff --git a/t/render_share_dir_file.t b/t/render_share_dir_file.t
index a56fe5c..529c74f 100644 (file)
--- a/t/render_share_dir_file.t
+++ b/t/render_share_dir_file.t
@@ -14,6 +14,7 @@ close $fh;
 
 ok( $helper->render_sharedir_file('script/myapp_cgi.pl.tt', $fn, { appprefix  => 'fnargh' }), "sharedir file rendered" ); 
 ok -r $fn;
+ok -s $fn;
 unlink $fn;
 
 done_testing;