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;
-my $dir = tempdir(CLEANUP => 1);
-my $devnull = File::Spec->devnull;
+eval "use IPC::Run3";
+plan skip_all => 'These tests require IPC::Run3' if $@;
-use Test::More;
+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: $!";
+
{
- 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
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>;
};
'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;
+
+diag "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;
+
+ 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 @_;
- is system($^X, '-I', File::Spec->catdir($Bin, '..', 'lib'), @_), 0, $comment;
+ command_ok( [ $^X, '-I', $helper_lib, @_ ], $comment );
}
my @generated_component_tests;
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" );
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)));
}
projects / catagits/Catalyst-Devel.git / blobdiff