Fix up all test tests

diff --git a/t/back_compat.t b/t/back_compat.t
index 6c93eb3..4e23b7d 100644 (file)
--- a/t/back_compat.t
+++ b/t/back_compat.t
@@ -3,11 +3,10 @@ use warnings;
 use FindBin qw/$Bin/;
 use File::Temp qw/tempfile/;
 use lib "$Bin/lib";
-use Data::Dumper;
 
 use MyTestHelper;
 
-use Test::More tests => 3;
+use Test::More;
 
 my $helper = bless {}, 'MyTestHelper';
 
@@ -38,3 +37,4 @@ my $contents;
 }
 is $contents, "foobartest_val\n";
 
+done_testing;

diff --git a/t/generated_app.t b/t/generated_app.t
index f6b3990..73bb7f6 100644 (file)
--- a/t/generated_app.t
+++ b/t/generated_app.t
@@ -1,12 +1,11 @@
 use strict;
 use warnings;
-
+use lib ();
 use File::Temp qw/ tempdir tmpnam /;
 use File::Spec;
-use Test::WWW::Mechanize;
 use Catalyst::Devel;
 
-my $dir = tempdir();
+my $dir = tempdir(CLEANUP => 1);
 my $devnull = File::Spec->devnull;
 
 use Test::More;
@@ -23,8 +22,9 @@ diag "In $dir";
     }
     is $exit, 0, 'Exit status ok';
 }
-# FIXME paths / nl work on win32
-chdir("$dir/TestApp/");
+
+chdir(File::Spec->catdir($dir, 'TestApp'));
+lib->import(File::Spec->catdir($dir, 'TestApp', 'lib'));
 
 my @files = qw|
     Makefile.PL
@@ -70,7 +70,7 @@ is system("make"), 0, 'Run make';
 
 {
     local $ENV{TEST_POD} = 1;
-
+    local $ENV{CATALYST_DEBUG} = 0;
     foreach my $test (grep { m|^t/| } @files) {
         subtest "Generated app test: $test", sub {
             require $test;
@@ -78,24 +78,6 @@ is system("make"), 0, 'Run make';
     }
 }
 
-## Moosey server tests - kmx++
-my $server_path   = File::Spec->catfile('script', 'testapp_server.pl');
-my $port = int(rand(10000)) + 40000; # get random port between 40000-50000
-
-my $childpid = fork();
-die "fork() error, cannot continue" unless defined($childpid);
-
-if ($childpid == 0) {
-  system("$^X $server_path -p $port > $devnull 2>&1");
-  exit; # just for sure; we should never got here
-}
-
-sleep 10; #wait for catalyst application to start
-my $mech = Test::WWW::Mechanize->new;
-$mech->get_ok( "http://localhost:" . $port );
-
-kill 'KILL', $childpid;
-
 my $server_script = do {
     open(my $fh, '<', 'script/testapp_server.pl') or die $!;
     local $/;
@@ -107,6 +89,4 @@ ok $server_script =~ qr/CATALYST_SCRIPT_GEN}\s+=\s+(\d+)/,
 is $1, $Catalyst::Devel::CATALYST_SCRIPT_GEN, 'Script gen correct';
 
 chdir('/');
-
 done_testing;
-

diff --git a/t/get_sharedir_file.t b/t/get_sharedir_file.t
index 899af3b..f2a68ad 100644 (file)
--- a/t/get_sharedir_file.t
+++ b/t/get_sharedir_file.t
@@ -1,13 +1,12 @@
 use strict;
 use warnings;
 
-use Test::MockObject::Extends;
-use Test::More tests => 3;
+use Test::More;
 use Test::Exception;
 
 use Catalyst::Helper;
 
-my $i = Test::MockObject::Extends->new('Catalyst::Helper');
+my $i = bless {}, 'Catalyst::Helper';
 
 throws_ok {
     $i->get_sharedir_file(qw/does not exist and hopefully never will or we are
@@ -18,3 +17,4 @@ lives_ok {
     ok($i->get_sharedir_file('Makefile.PL.tt'), 'has contents');
 } 'Can get_sharedir_file';
 
+done_testing;

diff --git a/t/render_file_contents.t b/t/render_file_contents.t
index 4617197..dffd490 100644 (file)
--- a/t/render_file_contents.t
+++ b/t/render_file_contents.t
@@ -3,17 +3,18 @@ use warnings;
 use FindBin qw/$Bin/;
 use lib "$Bin/lib";
 use Catalyst::Helper;
-use MyTestHelper;
 
-use Test::More tests => 1;
+use Test::More;
 
-my $helper = bless {}, 'MyTestHelper';
+my $helper = bless {}, 'Catalyst::Helper';
 
-package MyTestHelper;
-use Test::More;
 use File::Temp qw/tempfile/;
 
 my ($fh, $fn) = tempfile;
 close $fh;
 
 ok( $helper->render_file_contents('example1',  $fn, { test_var => 'test_val' }), "file contents rendered" ); 
+ok -r $fn;
+unlink $fn;
+
+done_testing;

diff --git a/t/render_share_dir_file.t b/t/render_share_dir_file.t
index a53cf65..a56fe5c 100644 (file)
--- a/t/render_share_dir_file.t
+++ b/t/render_share_dir_file.t
@@ -3,18 +3,17 @@ use warnings;
 use FindBin qw/$Bin/;
 use lib "$Bin/lib";
 use Catalyst::Helper;
-use MyTestHelper;
-
-use Test::More tests => 1;
+use Test::More;
 
-my $helper = bless {}, 'MyTestHelper';
+my $helper = bless {}, 'Catalyst::Helper';
 
-package MyTestHelper;
-use FindBin qw/$Bin/;
-use Test::More;
 use File::Temp qw/tempfile/;
 
 my ($fh, $fn) = tempfile;
 close $fh;
 
-ok( $helper->render_sharedir_file('script/myapp_cgi.pl.tt',  { appprefix  => 'fnargh' }), "sharedir file rendered" ); 
+ok( $helper->render_sharedir_file('script/myapp_cgi.pl.tt', $fn, { appprefix  => 'fnargh' }), "sharedir file rendered" ); 
+ok -r $fn;
+unlink $fn;
+
+done_testing;