X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=lib%2FCatalyst%2FHelper.pm;h=317b170f8563c25baf284fc17aff981699eb8c13;hp=294958127fcea0635084e4b2f480f9f10c5b1c5a;hb=614f3ad66ca3dc9715fc2be41806428b1a44cde7;hpb=0c3821be5dd624ed9045895476682d038aa0a3b8 diff --git a/lib/Catalyst/Helper.pm b/lib/Catalyst/Helper.pm index 2949581..317b170 100644 --- a/lib/Catalyst/Helper.pm +++ b/lib/Catalyst/Helper.pm @@ -256,10 +256,9 @@ sub next_test { $self->{uri} = $prefix; } my $dir = $self->{test_dir}; - my $type = $self->{type}; - $dir = File::Spec->catdir( $dir, $type ); + my $type = lc $self->{type}; $self->mk_dir($dir); - return File::Spec->catfile( $dir, $tname ); + return File::Spec->catfile( $dir, "$type\_$tname" ); } =head3 render_file @@ -297,17 +296,6 @@ sub _mk_dirs { $self->{t} = File::Spec->catdir( $self->{dir}, 't' ); $self->mk_dir( $self->{t} ); - if ( $self->{short} ) { - $self->mk_dir( File::Spec->catdir( $self->{t}, 'M' ) ); - $self->mk_dir( File::Spec->catdir( $self->{t}, 'V' ) ); - $self->mk_dir( File::Spec->catdir( $self->{t}, 'C' ) ); - } - else { - $self->mk_dir( File::Spec->catdir( $self->{t}, 'Model' ) ); - $self->mk_dir( File::Spec->catdir( $self->{t}, 'View' ) ); - $self->mk_dir( File::Spec->catdir( $self->{t}, 'Controller' ) ); - } - $self->{class} = File::Spec->catdir( split( /\:\:/, $self->{name} ) ); $self->{mod} = File::Spec->catdir( $self->{lib}, $self->{class} ); $self->mk_dir( $self->{mod} ); @@ -576,7 +564,7 @@ license('perl'); requires( Catalyst => '5.57'); -install_script; +install_script( glob('script/*.pl') ); tests( glob('t/*.t'), glob('t/*/*.t') ); catalyst_files();