X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Fgenerated_app.t;h=30b2fce295fa14dc115bad362f9cfcc6bedb8b28;hb=70d67e3c3d80049e192be80576863de31bd23165;hp=b9c9f68bdb7faecc1c2182809ab4e8510d449776;hpb=165233a4c662ef80af3e2fe954e060436c90b264;p=catagits%2FCatalyst-Devel.git diff --git a/t/generated_app.t b/t/generated_app.t index b9c9f68..30b2fce 100644 --- a/t/generated_app.t +++ b/t/generated_app.t @@ -1,86 +1,229 @@ use strict; use warnings; +use lib (); +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 File::Temp qw/ tempdir tmpnam /; -use File::Spec; -use Test::WWW::Mechanize; +eval "use IPC::Run3"; +plan skip_all => 'These tests require IPC::Run3' if $@; -my $dir = tempdir(); # CLEANUP => 1 ); -my $devnull = File::Spec->devnull; +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 = devnull; + +diag "Generated app is in $dir"; + +chdir $dir or die "Cannot chdir to $dir: $!"; -use Test::More; { - # 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/"); -warn($dir); -# Ok, this is lame.. Also, check +x permissions? +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 -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 + testapp.psgi + 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 { catdir(@$_) } map { [ split qr{/}, $_ ] } @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"; +command_ok( [ $MAKE ] ); + +run_generated_component_tests(); + +my $server_script_file = catdir(qw/script testapp_server.pl/); +my $server_script = do { + open(my $fh, '<', $server_script_file) 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'; + +{ + 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>; +}; -## 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, ; +is $server_script, $server_script_new; -## 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 +diag "Installed app is in $instdir"; +command_ok( [ $MAKE, 'install' ] ); -my $childpid = fork(); -die "fork() error, cannot continue" unless defined($childpid); +my $inst_app_dir = catdir($instdir); +chdir($inst_app_dir) or die "Cannot chdir to $inst_app_dir: $!"; +lib->import(catdir($instdir, 'lib', 'perl5')); -if ($childpid == 0) { - system("$^X $server_path -p $port > $devnull 2>&1"); - exit; # just for sure; we should never got here +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"; } -sleep 10; #wait for catalyst application to start -my $mech = Test::WWW::Mechanize->new; -$mech->get_ok( "http://localhost:" . $port ); +chdir('/'); +done_testing; + +sub command_ok { + my $cmd = shift; + my $desc = shift; -kill 'KILL', $childpid; + 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; + } +} +sub runperl { + my $comment = pop @_; + command_ok( [ $^X, '-I', $helper_lib, @_ ], $comment ); +} + +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) { + my $full_name = rel2abs($fn); + subtest "Generated app test: $fn", sub { + do $full_name; + }; + } +} + +sub create_ok { + my ($type, $name) = @_; + runperl( catdir('script', 'testapp_create.pl'), $type, $name, + "'script/testapp_create.pl $type $name' ok"); + test_fn( catdir('t', sprintf("%s_%s.t", lc $type, $name))); +}