X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Fgenerated_app.t;h=2a46078c2b62a64b2d63fa69efec89047f528196;hb=41cebeb1e1e47c8fbab0b112342baaeaea232061;hp=c6e58a76463025c53bb6f35c16e4d3af100950ae;hpb=312ab89fa9c3f147a7418c9f0c5899d362d59330;p=catagits%2FCatalyst-Devel.git

diff --git a/t/generated_app.t b/t/generated_app.t
index c6e58a7..2a46078 100644
--- a/t/generated_app.t
+++ b/t/generated_app.t
@@ -1,28 +1,120 @@
 use strict;
 use warnings;
+use lib ();
+use File::Temp qw/ tempdir tmpnam /;
+use File::Spec;
+use FindBin qw/$Bin/;
+use Catalyst::Devel;
 
-use File::Temp qw/ tempdir /;
-
-my $dir = tempdir(); # CLEANUP => 1 );
+my $dir = tempdir(CLEANUP => 1);
+my $devnull = File::Spec->devnull;
 
 use Test::More;
+
+diag "Generated app is in $dir";
+
 {
-    # Check exit status here
-    system("cd $dir; catalyst.pl TestApp");
+    my $exit;
+    if ($^O eq 'MSWin32') {
+      $exit = system("cd $dir & catalyst TestApp > $devnull 2>&1");
+    }
+    else {
+      $exit = system("cd $dir; catalyst.pl TestApp > $devnull 2>&1");
+    }
+    is $exit, 0, 'Exit status ok';
 }
-# Fix paths / nl work on win32
-chdir("$dir/TestApp/");
-warn($dir);
 
-# Ok, this is lame.. Also, check +x permissions?
+chdir(File::Spec->catdir($dir, 'TestApp'));
+lib->import(File::Spec->catdir($dir, 'TestApp', 'lib'));
+
 my @files = qw|
     Makefile.PL
+    testapp.conf
     lib/TestApp.pm
+    lib/TestApp/Controller/Root.pm
+    README
+    Changes
+    t/01app.t
+    t/02pod.t
+    t/03podcoverage.t
+    root/static/images/catalyst_logo.png
+    root/static/images/btn_120x50_built.png
+    root/static/images/btn_120x50_built_shadow.png
+    root/static/images/btn_120x50_powered.png
+    root/static/images/btn_120x50_powered_shadow.png
+    root/static/images/btn_88x31_built.png
+    root/static/images/btn_88x31_built_shadow.png
+    root/static/images/btn_88x31_powered.png
+    root/static/images/btn_88x31_powered_shadow.png
+    root/favicon.ico
+    Makefile.PL
+    script/testapp_cgi.pl
+    script/testapp_fastcgi.pl
+    script/testapp_server.pl
+    script/testapp_test.pl
+    script/testapp_create.pl
 |;
 
-plan 'tests' => scalar @files;
+foreach my $fn (map { File::Spec->catdir(@$_) } map { [ split /\// ] } @files) {
+    test_fn($fn);
+}
+create_ok($_, 'My' . $_) for qw/Model View Controller/;
+
+is system($^X, 'Makefile.PL'), 0, 'Ran Makefile.PL';
+ok -e "Makefile", "Makefile generated";
+is system("make"), 0, 'Run make';
+
+run_generated_component_tests();
+
+my $server_script = do {
+    open(my $fh, '<', File::Spec->catdir(qw/script testapp_server.pl/)) or fail $!;
+    local $/;
+    <$fh>;
+};
 
-foreach my $fn (@files) {
+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';
+
+chdir('/');
+done_testing;
+
+sub runperl {
+    my $comment = pop @_;
+    is system($^X, '-I', File::Spec->catdir($Bin, '..', 'lib'), @_), 0, $comment;
+}
+
+my @generated_component_tests;
+
+sub test_fn {
+    local $ENV{TEST_POD} = 1;
+    local $ENV{CATALYST_DEBUG} = 0;
+
+    my $fn = shift;
     ok -r $fn, "Have $fn in generated app";
+    if ($fn =~ /script/) {
+        ok -x $fn, "$fn is executable";
+    }
+    if ($fn =~ /\.p[ml]$/) {
+        runperl( '-c', $fn, "$fn compiles" );
+    }
+    # Save these till later as Catalyst::Test will only be loaded once :-/
+    push @generated_component_tests, $fn
+        if $fn =~ /\.t$/;
+}
+
+sub run_generated_component_tests {
+    foreach my $fn (@generated_component_tests) {
+        subtest "Generated app test: $fn", sub {
+            require $fn;
+        };
+    }
 }
 
+sub create_ok {
+    my ($type, $name) = @_;
+    runperl( File::Spec->catdir('script', 'testapp_create.pl'), $type, $name,
+        "'script/testapp_create.pl $type $name' ok");
+    test_fn(File::Spec->catdir('t', sprintf("%s_%s.t", $type, $name)));
+}