[Catalyst-commits] r11464 - in Catalyst-Devel/1.00/branches/helper_refactor: . share share/lib share/t

[t0m at dev.catalyst.perl.org]

Author: t0m
Date: 2009-10-05 22:59:11 +0000 (Mon, 05 Oct 2009)
New Revision: 11464

Modified:
   Catalyst-Devel/1.00/branches/helper_refactor/
   Catalyst-Devel/1.00/branches/helper_refactor/share/Makefile.PL.tt
   Catalyst-Devel/1.00/branches/helper_refactor/share/lib/MyApp.pm.tt
   Catalyst-Devel/1.00/branches/helper_refactor/share/t/01app.t.tt
   Catalyst-Devel/1.00/branches/helper_refactor/share/t/comptest.tt
Log:
 r11494 at t0mlaptop:  t0m | 2009-10-05 23:59:22 +0100
 More cleanups in the generated skeleton app



Property changes on: Catalyst-Devel/1.00/branches/helper_refactor
___________________________________________________________________
Name: svk:merge
   - 4ad37cd2-5fec-0310-835f-b3785c72a374:/Catalyst-Devel/1.00/trunk:10253
4ad37cd2-5fec-0310-835f-b3785c72a374:/trunk/Catalyst-Devel:6899
4ad37cd2-5fec-0310-835f-b3785c72a374:/trunk/Catalyst-Helper:4258
6d45476b-5895-46b8-b13a-8b969fa34c98:/local/Catalyst-Devel-helper-refactor:11493
   + 4ad37cd2-5fec-0310-835f-b3785c72a374:/Catalyst-Devel/1.00/trunk:10253
4ad37cd2-5fec-0310-835f-b3785c72a374:/trunk/Catalyst-Devel:6899
4ad37cd2-5fec-0310-835f-b3785c72a374:/trunk/Catalyst-Helper:4258
6d45476b-5895-46b8-b13a-8b969fa34c98:/local/Catalyst-Devel-helper-refactor:11494

Modified: Catalyst-Devel/1.00/branches/helper_refactor/share/Makefile.PL.tt
===================================================================
--- Catalyst-Devel/1.00/branches/helper_refactor/share/Makefile.PL.tt	2009-10-05 22:59:03 UTC (rev 11463)
+++ Catalyst-Devel/1.00/branches/helper_refactor/share/Makefile.PL.tt	2009-10-05 22:59:11 UTC (rev 11464)
@@ -14,6 +14,7 @@
 requires 'namespace::autoclean';
 requires 'Config::General'; # This should reflect the config file format you've chosen
                  # See Catalyst::Plugin::ConfigLoader for supported formats
+test_requires 'Test::More' => '0.88';
 catalyst;
 
 install_script glob('script/*.pl');

Modified: Catalyst-Devel/1.00/branches/helper_refactor/share/lib/MyApp.pm.tt
===================================================================
--- Catalyst-Devel/1.00/branches/helper_refactor/share/lib/MyApp.pm.tt	2009-10-05 22:59:03 UTC (rev 11463)
+++ Catalyst-Devel/1.00/branches/helper_refactor/share/lib/MyApp.pm.tt	2009-10-05 22:59:11 UTC (rev 11464)
@@ -12,13 +12,16 @@
 # Static::Simple: will serve static files from the application's root
 #                 directory
 
-use Catalyst qw/-Debug
-                ConfigLoader
-                Static::Simple/;
+use Catalyst qw/
+	-Debug
+    ConfigLoader
+    Static::Simple
+/;
 
 extends 'Catalyst';
 
 our $VERSION = '0.01';
+$VERSION = eval $VERSION;
 
 # Configure the application.
 #
@@ -29,7 +32,11 @@
 # with an external configuration file acting as an override for
 # local deployment.
 
-__PACKAGE__->config( name => '[% name %]' );
+__PACKAGE__->config(
+	name => '[% name %]',
+	# Disable deprecated behavior needed by old applications
+	disable_component_resolution_regex_fallback => 1, 
+);
 
 # Start the application
 __PACKAGE__->setup();

Modified: Catalyst-Devel/1.00/branches/helper_refactor/share/t/01app.t.tt
===================================================================
--- Catalyst-Devel/1.00/branches/helper_refactor/share/t/01app.t.tt	2009-10-05 22:59:03 UTC (rev 11463)
+++ Catalyst-Devel/1.00/branches/helper_refactor/share/t/01app.t.tt	2009-10-05 22:59:11 UTC (rev 11464)
@@ -1,8 +1,10 @@
 [% startperl %]
 use strict;
 use warnings;
-use Test::More tests => 2;
+use Test::More;
 
 BEGIN { use_ok 'Catalyst::Test', '[% name %]' }
 
 ok( request('/')->is_success, 'Request should succeed' );
+
+done_testing();

Modified: Catalyst-Devel/1.00/branches/helper_refactor/share/t/comptest.tt
===================================================================
--- Catalyst-Devel/1.00/branches/helper_refactor/share/t/comptest.tt	2009-10-05 22:59:03 UTC (rev 11463)
+++ Catalyst-Devel/1.00/branches/helper_refactor/share/t/comptest.tt	2009-10-05 22:59:11 UTC (rev 11464)
@@ -3,9 +3,10 @@
 [% IF long_type == 'Controller' %][% IF mech %]use Test::More;
 
 eval "use Test::WWW::Mechanize::Catalyst '[% name %]'";
-plan $@
-    ? ( skip_all => 'Test::WWW::Mechanize::Catalyst required' )
-    : ( tests => 2 );
+if ($@) {
+    plan skip_all => 'Test::WWW::Mechanize::Catalyst required';
+	exit 0;
+}
 
 ok( my $mech = Test::WWW::Mechanize::Catalyst->new, 'Created mech object' );
 
@@ -21,3 +22,5 @@
 
 BEGIN { use_ok '[% class %]' }
 [% END %]
+
+done_testing();