X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=share%2Ft%2Fcomptest.tt;h=cd40e00a34b616694c411d18edd0e7b5d4830243;hb=83e6e99cc1c2b63fe5e86bfee1631b02ffae1ee1;hp=dd2c5e6e092b323ad0025d8de6287beccbbdd851;hpb=312ab89fa9c3f147a7418c9f0c5899d362d59330;p=catagits%2FCatalyst-Devel.git

diff --git a/share/t/comptest.tt b/share/t/comptest.tt
index dd2c5e6..cd40e00 100644
--- a/share/t/comptest.tt
+++ b/share/t/comptest.tt
@@ -1,23 +1,26 @@
 use strict;
 use warnings;
-[% IF long_type == 'Controller' %][% IF mech %]use Test::More;
+use Test::More;
+[% IF long_type == 'Controller' %][% IF mech %]
 
-eval "use Test::WWW::Mechanize::Catalyst '[% app %]'";
-plan $@
-    ? ( skip_all => 'Test::WWW::Mechanize::Catalyst required' )
-    : ( tests => 2 );
+unless (eval q{use Test::WWW::Mechanize::Catalyst 0.55; 1}) {
+    plan skip_all => 'Test::WWW::Mechanize::Catalyst >= 0.55 required';
+    exit 0;
+}
 
-ok( my $mech = Test::WWW::Mechanize::Catalyst->new, 'Created mech object' );
+ok( my $mech = Test::WWW::Mechanize::Catalyst->new(catalyst_app => '[% app %]', 'Created mech object' );
 
 $mech->get_ok( 'http://localhost[% uri %]' );
-[% ELSE %]use Test::More tests => 3;
+[%- ELSE %]
 
-BEGIN { use_ok 'Catalyst::Test', '[% app %]' }
-BEGIN { use_ok '[% class %]' }
+use Catalyst::Test '[% app %]';
+use [% class %];
 
 ok( request('[% uri %]')->is_success, 'Request should succeed' );
-[% END %]
-[% ELSE %]use Test::More tests => 1;
+[%- END -%]
+[% ELSE %]
 
 BEGIN { use_ok '[% class %]' }
-[% END %]
+[% END -%]
+
+done_testing();