X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Fgenerated_app.t;h=799f27099378c763503b30a8f15b6a8287d9c786;hb=ee2184e2f37034507fae23efa2ad1afc75c76fed;hp=fa9cf7d52500bb3fdeefd5499a71e67c1a3a1445;hpb=4a081761f5bbc97e7d99bb0575be891f0d63b2ae;p=catagits%2FCatalyst-Devel.git

diff --git a/t/generated_app.t b/t/generated_app.t
index fa9cf7d..799f270 100644
--- a/t/generated_app.t
+++ b/t/generated_app.t
@@ -1,85 +1,160 @@
 use strict;
 use warnings;
-
-use File::Temp qw/ tempdir tmpnam /;
+use lib ();
+use Cwd qw( abs_path );
+use File::Temp qw/ tempdir /;
 use File::Spec;
-use Test::WWW::Mechanize;
+use FindBin qw/$Bin/;
+use Catalyst::Devel;
+use Catalyst::Helper;
+use Test::More;
+use Config;
+
+eval "use IPC::Run3";
+plan skip_all => 'These tests require IPC::Run3' if $@;
+
+my $share_dir = abs_path('share');
+plan skip_all => "No share dir at $share_dir!"
+    unless -d $share_dir;
 
-my $dir = tempdir(); # CLEANUP => 1 );
+$ENV{CATALYST_DEVEL_SHAREDIR} = $share_dir;
+
+my $dir = tempdir(CLEANUP => 1);
 my $devnull = File::Spec->devnull;
 
-use Test::More;
+diag "Generated app is in $dir";
+
+chdir $dir or die "Cannot chdir to $dir: $!";
+
 {
-    # Check exit status here
-    if ($^O eq 'MSWin32') {
-      system("cd $dir & catalyst TestApp > $devnull 2>&1");
-    }
-    else {
-      system("cd $dir; catalyst.pl TestApp > $devnull 2>&1");
-    }
+    open my $fh, '>', $devnull or die "Cannot write to $devnull: $!";
+
+    local *STDOUT = $fh;
+
+    my $helper = Catalyst::Helper->new(
+        {
+            name => 'TestApp',
+        }
+    );
+
+    $helper->mk_app('TestApp');
 }
-# Fix paths / nl work on win32
-chdir("$dir/TestApp/");
 
-# Ok, this is lame.. Also, check +x permissions?
+my $app_dir = File::Spec->catdir($dir, 'TestApp');
+chdir($app_dir) or die "Cannot chdir to $app_dir: $!";
+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
+    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 + 4;
+foreach my $fn (map { File::Spec->catdir(@$_) } map { [ split /\// ] } @files) {
+    test_fn($fn);
+}
+create_ok($_, 'My' . $_) for qw/Model View Controller/;
 
-foreach my $fn (@files) {
-    ok -r $fn, "Have $fn in generated app";
+command_ok( [ $^X, 'Makefile.PL' ] );
+ok -e "Makefile", "Makefile generated";
+#NOTE: do not assume that 'make' is always 'make' as e.g. Win32/strawberry perl uses 'dmake'
+my $make = $Config{make} || 'make';
+command_ok( [ $make ], 'Ran make ok' );
+if (eval { require PAR::Packer }) {
+    command_ok([ $make, 'catalyst_par' ], 'Ran make catalyst_par ok');
+    command_ok([ 'parl', ]); # FIXME - Win32?
 }
 
-## Makefile stuff
-my $makefile_status = `$^X Makefile.PL`;
-ok $makefile_status, "Makefile ran okay";
-ok -e "Makefile", "Makefile exists";
-my $newapp_test_status = `prove -l t/ 2> $devnull`;
-ok $newapp_test_status, "Tests ran okay";
-#is $newapp_test_status, ;
+run_generated_component_tests();
+
+my $server_script = do {
+    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';
 
-## Moosey server tests - kmx++
-my $server_path   = File::Spec->catfile('script', 'testapp_server.pl');
-my $port = int(rand(10000)) + 40000; # get random port between 40000-50000
+chdir('/');
+done_testing;
 
-my $childpid = fork();
-die "fork() error, cannot continue" unless defined($childpid);
+sub command_ok {
+    my $cmd = shift;
+    my $desc = shift;
 
-if ($childpid == 0) {
-  system("$^X $server_path -p $port > $devnull 2>&1");
-  exit; # just for sure; we should never got here
+    my $stdout;
+    my $stderr;
+    run3( $cmd, \undef, \$stdout, \$stderr );
+
+    $desc ||= "Exit status ok for '@{$cmd}'";
+    unless ( is $? >> 8, 0, $desc ) {
+        diag "STDOUT:\n$stdout" if defined $stdout;
+        diag "STDERR:\n$stderr" if defined $stderr;
+    }
 }
 
-sleep 10; #wait for catalyst application to start
-my $mech = Test::WWW::Mechanize->new;
-$mech->get_ok( "http://localhost:" . $port );
+sub runperl {
+    my $comment = pop @_;
+    command_ok( [ $^X, '-I', File::Spec->catdir($Bin, '..', 'lib'), @_ ], $comment );
+}
 
-kill 'KILL', $childpid;
+my @generated_component_tests;
 
+sub test_fn {
+    my $fn = shift;
+    ok -r $fn, "Have $fn in generated app";
+    if ($fn =~ /script/) {
+        SKIP: {
+            skip 'Executable file flag test does not make sense on Win32', 1 if ($^O eq 'MSWin32');
+            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 {
+    local $ENV{TEST_POD} = 1;
+    local $ENV{CATALYST_DEBUG} = 0;
+    foreach my $fn (@generated_component_tests) {
+        subtest "Generated app test: $fn", sub {
+            do $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", lc $type, $name)));
+}