X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Fgenerated_app.t;h=2b50377f456465e3e80491ae2a2d9f48631067a5;hb=3f9e067ca892ae2b896de150dd22973de622dd1e;hp=3da66de097f3b82409d4e3fe450182c6f5e591cb;hpb=e3eb9f888a45fbcb3a7a57266bfa3df41f13d96b;p=catagits%2FCatalyst-Devel.git

diff --git a/t/generated_app.t b/t/generated_app.t
index 3da66de..2b50377 100644
--- a/t/generated_app.t
+++ b/t/generated_app.t
@@ -1,35 +1,68 @@
 use strict;
 use warnings;
 use lib ();
-use File::Temp qw/ tempdir tmpnam /;
-use File::Spec;
-use FindBin qw/$Bin/;
-use Catalyst::Devel;
+use Cwd qw( abs_path );
+use File::Spec::Functions qw( devnull catdir catfile updir rel2abs );
+use File::Temp qw( tempdir );
+use File::Basename qw( dirname );
+use Catalyst::Helper;
+use Test::More;
+use Config;
+use IPC::Open3 qw( open3 );
+
+my $helper_lib = abs_path(catdir(dirname($INC{'Catalyst/Helper.pm'}), updir));
+
+my $share_dir = abs_path('share');
+plan skip_all => "No share dir at $share_dir!"
+    unless -d $share_dir;
+
+$ENV{CATALYST_DEVEL_SHAREDIR} = $share_dir;
+my $instdir = tempdir(CLEANUP => 1);
+
+my $MAKE = $Config{make} || 'make';
+
+my $escaped_path = $instdir;
+$escaped_path =~ s/\\/\\\\/g;
+if ($escaped_path =~ s/ /\\ /g) {
+  $escaped_path = qq{"$escaped_path"};
+}
+
+$ENV{PERL_MM_OPT} = "INSTALL_BASE=$escaped_path";
+
+if ($ENV{MAKEFLAGS}) {
+    $ENV{MAKEFLAGS} =~ s/PREFIX=[^\s]+//;
+    $ENV{MAKEFLAGS} =~ s/INSTALL_BASE=[^\s]+//;
+}
 
 my $dir = tempdir(CLEANUP => 1);
-my $devnull = File::Spec->devnull;
+my $devnull = devnull;
 
-use Test::More;
+note "Generated app is in $dir";
 
-diag "Generated app is in $dir";
+chdir $dir or die "Cannot chdir to $dir: $!";
 
 {
-    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';
+    open my $fh, '>', $devnull or die "Cannot write to $devnull: $!";
+
+    local *STDOUT = $fh;
+
+    my $helper = Catalyst::Helper->new(
+        {
+            name => 'TestApp',
+        }
+    );
+
+    $helper->mk_app('TestApp');
 }
 
-chdir(File::Spec->catdir($dir, 'TestApp'));
-lib->import(File::Spec->catdir($dir, 'TestApp', 'lib'));
+my $app_dir = catdir($dir, 'TestApp');
+chdir($app_dir) or die "Cannot chdir to $app_dir: $!";
+lib->import(catdir($dir, 'TestApp', 'lib'));
 
 my @files = qw|
     Makefile.PL
     testapp.conf
+    testapp.psgi
     lib/TestApp.pm
     lib/TestApp/Controller/Root.pm
     README
@@ -55,19 +88,20 @@ my @files = qw|
     script/testapp_create.pl
 |;
 
-foreach my $fn (map { File::Spec->catdir(@$_) } map { [ split /\// ] } @files) {
+foreach my $fn (map { catdir(@$_) } map { [ split qr{/}, $_ ] } @files) {
     test_fn($fn);
 }
 create_ok($_, 'My' . $_) for qw/Model View Controller/;
 
-is system($^X, 'Makefile.PL'), 0, 'Ran Makefile.PL';
+command_ok( [ $^X, 'Makefile.PL' ] );
 ok -e "Makefile", "Makefile generated";
-is system("make"), 0, 'Run make';
+command_ok( [ $MAKE ] );
 
 run_generated_component_tests();
 
+my $server_script_file = catdir(qw/script testapp_server.pl/);
 my $server_script = do {
-    open(my $fh, '<', File::Spec->catdir(qw/script testapp_server.pl/)) or fail $!;
+    open(my $fh, '<', $server_script_file) or fail $!;
     local $/;
     <$fh>;
 };
@@ -77,12 +111,86 @@ 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';
 
+{
+    open(my $fh, '>', $server_script_file) or fail $!;
+    print $fh "MOO\n";
+}
+my $helper = Catalyst::Helper->new(
+    {
+        '.newfiles' => 0,
+        'makefile'  => 0,
+        'scripts'   => 1,
+        name => '.',
+    }
+);
+$helper->mk_app( '.' ) or fail;
+
+my $server_script_new = do {
+    open(my $fh, '<', $server_script_file) or fail $!;
+    local $/;
+    <$fh>;
+};
+
+is $server_script, $server_script_new;
+
+note "Installed app is in $instdir";
+command_ok( [ $MAKE, 'install' ] );
+
+my $inst_app_dir = catdir($instdir);
+chdir($inst_app_dir) or die "Cannot chdir to $inst_app_dir: $!";
+lib->import(catdir($instdir, 'lib', 'perl5'));
+
+my @installed_files = qw|
+    lib/perl5/TestApp.pm
+    lib/perl5/TestApp/testapp.conf
+    lib/perl5/TestApp/Controller/Root.pm
+    lib/perl5/TestApp/root/static/images/catalyst_logo.png
+    lib/perl5/TestApp/root/static/images/btn_120x50_built.png
+    lib/perl5/TestApp/root/static/images/btn_120x50_built_shadow.png
+    lib/perl5/TestApp/root/static/images/btn_120x50_powered.png
+    lib/perl5/TestApp/root/static/images/btn_120x50_powered_shadow.png
+    lib/perl5/TestApp/root/static/images/btn_88x31_built.png
+    lib/perl5/TestApp/root/static/images/btn_88x31_built_shadow.png
+    lib/perl5/TestApp/root/static/images/btn_88x31_powered.png
+    lib/perl5/TestApp/root/static/images/btn_88x31_powered_shadow.png
+    lib/perl5/TestApp/root/favicon.ico
+    bin/testapp_cgi.pl
+    bin/testapp_fastcgi.pl
+    bin/testapp_server.pl
+    bin/testapp_test.pl
+    bin/testapp_create.pl
+|;
+
+foreach my $fn (map { catdir(@$_) } map { [ split qr{/}, $_ ] } @installed_files) {
+    my $ffn = catfile($inst_app_dir, $fn);
+    ok -r $ffn, "'$fn' installed in correct location";
+}
+
 chdir('/');
 done_testing;
 
+sub command_ok {
+    my $cmd = shift;
+    my $desc = shift || "Exit status ok for '@{$cmd}'";
+
+    open my $stdin, '<', $devnull
+        or die "Cannot read $devnull: $!";
+
+    my $pid = open3( $stdin, my $stdout, undef, @$cmd );
+    my $output = do { local $/; <$stdout> };
+    waitpid $pid, 0;
+
+    my $result = is $?, 0, $desc;
+
+    diag "output:\n$output"
+      if !$result;
+
+    return $result;
+}
+
 sub runperl {
     my $comment = pop @_;
-    is system($^X, '-I', File::Spec->catdir($Bin, '..', 'lib'), @_), 0, $comment;
+    command_ok( [ $^X, '-I', $helper_lib, @_ ], $comment );
 }
 
 my @generated_component_tests;
@@ -91,7 +199,10 @@ sub test_fn {
     my $fn = shift;
     ok -r $fn, "Have $fn in generated app";
     if ($fn =~ /script/) {
-        ok -x $fn, "$fn is executable";
+        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" );
@@ -105,15 +216,16 @@ sub run_generated_component_tests {
     local $ENV{TEST_POD} = 1;
     local $ENV{CATALYST_DEBUG} = 0;
     foreach my $fn (@generated_component_tests) {
+        my $full_name = rel2abs($fn);
         subtest "Generated app test: $fn", sub {
-            require $fn;
+            do $full_name;
         };
     }
 }
 
 sub create_ok {
     my ($type, $name) = @_;
-    runperl( File::Spec->catdir('script', 'testapp_create.pl'), $type, $name,
+    runperl( 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)));
+    test_fn( catdir('t', sprintf("%s_%s.t", lc $type, $name)));
 }