Cleaned up generated tests

[catagits/Catalyst-Runtime.git] / lib / Catalyst / Helper.pm

diff --git a/lib/Catalyst/Helper.pm b/lib/Catalyst/Helper.pm
index 9c83a9c..006cdfb 100644 (file)
--- a/lib/Catalyst/Helper.pm
+++ b/lib/Catalyst/Helper.pm
@@ -82,6 +82,7 @@ sub mk_app {
 
     if ($gen_app) {
         $self->_mk_dirs;
+        $self->_mk_config;
         $self->_mk_appclass;
         $self->_mk_readme;
         $self->_mk_changes;
@@ -354,6 +355,14 @@ sub _mk_makefile {
     }
 }
 
+sub _mk_config {
+    my $self      = shift;
+    my $dir       = $self->{dir};
+    my $appprefix = $self->{appprefix};
+    $self->render_file( 'config',
+        File::Spec->catfile( $dir, "$appprefix.yml" ) );
+}
+
 sub _mk_readme {
     my $self = shift;
     my $dir  = $self->{dir};
@@ -525,18 +534,14 @@ use warnings;
 # Set flags and add plugins for the application
 #
 #         -Debug: activates the debug mode for very useful log messages
-# Static::Simple: will serve static files from the applications root directory
+# Static::Simple: will serve static files from the application's root 
+# directory
 #
-use Catalyst qw/-Debug Static::Simple/;
+use Catalyst qw/-Debug ConfigLoader Static::Simple/;
 
 our $VERSION = '0.01';
 
 #
-# Configure the application
-#
-__PACKAGE__->config( name => '[% name %]' );
-
-#
 # Start the application
 #
 __PACKAGE__->setup;
@@ -603,13 +608,16 @@ use inc::Module::Install;
 name '[% dir %]';
 all_from '[% path %]';
 
-requires Catalyst => '5.62';
+requires Catalyst => '5.64';
 
 catalyst;
 
 install_script glob('script/*.pl');
 auto_install;
 WriteAll;
+__config__
+---
+name: [% name %]
 __readme__
 Run script/[% appprefix %]_server.pl to test the application.
 __changes__
@@ -618,11 +626,16 @@ This file documents the revision history for Perl extension [% name %].
 0.01  [% time %]
         - initial revision, generated by Catalyst
 __apptest__
+use strict;
+use warnings;
 use Test::More tests => 2;
-BEGIN { use_ok( Catalyst::Test, '[% name %]' ); }
 
-ok( request('/')->is_success );
+BEGIN { use_ok 'Catalyst::Test', '[% name %]' }
+
+ok( request('/')->is_success, 'Request should succeed' );
 __podtest__
+use strict;
+use warnings;
 use Test::More;
 
 eval "use Test::Pod 1.14";
@@ -631,6 +644,8 @@ plan skip_all => 'set TEST_POD to enable this test' unless $ENV{TEST_POD};
 
 all_pod_files_ok();
 __podcoveragetest__
+use strict;
+use warnings;
 use Test::More;
 
 eval "use Test::Pod::Coverage 1.04";
@@ -1033,12 +1048,14 @@ it under the same terms as Perl itself.
 
 1;
 __comptest__
+use strict;
+use warnings;
 [% IF long_type == 'Controller' %]
 use Test::More tests => 3;
-use_ok( Catalyst::Test, '[% app %]' );
+use_ok( 'Catalyst::Test', '[% app %]' );
 use_ok('[% class %]');
 
-ok( request('[% uri %]')->is_success );
+ok( request('[% uri %]')->is_success, 'Request should succeed' );
 [% ELSE %]
 use Test::More tests => 1;
 use_ok('[% class %]');