Merge branch 'master' into psgi

[catagits/Catalyst-Runtime.git] / t / aggregate / unit_core_script_test.t

diff --git a/t/aggregate/unit_core_script_test.t b/t/aggregate/unit_core_script_test.t
index cc91a3a..e475651 100644 (file)
--- a/t/aggregate/unit_core_script_test.t
+++ b/t/aggregate/unit_core_script_test.t
@@ -1,6 +1,7 @@
 use strict;
 use warnings;
 
+use Carp qw(croak);
 use FindBin qw/$Bin/;
 use lib "$Bin/../lib";
 
@@ -11,38 +12,44 @@ use Catalyst::Script::Test;
 use File::Temp qw/tempfile/;
 use IO::Handle;
 
-my ($fh, $fn) = tempfile();
-
-binmode( $fh );
-binmode( STDOUT );
-
-{
-    local @ARGV = ('/');
-    my $i;
-    lives_ok {
-        $i = Catalyst::Script::Test->new_with_options(application_name => 'TestApp');
-    } "new_with_options";
-    ok $i;
-    my $saved;
-    open( $saved, '<&'. STDIN->fileno )
-          or croak("Can't dup stdin: $!");
-    open( STDOUT, '>&='. $fh->fileno )
-        or croak("Can't open stdout: $!");
-    eval { $i->run };
-    ok !$@, 'Ran ok';
-
-    STDOUT->flush
-        or croak("Can't flush stdout: $!");
-
-    open( STDOUT, '>&'. fileno($saved) )
-        or croak("Can't restore stdout: $!");
-}
-
-my $data = do { my $fh; open($fh, '<', $fn) or die $!; local $/; <$fh>; };
-$fh = undef;
-unlink $fn if -r $fn;
-
-is $data, "root index\n", 'correct content printed';
+is run_test('/'), "root index\n", 'correct content printed';
+is run_test('/moose/get_attribute'), "42\n", 'Correct content printed for non root action';
 
 done_testing;
 
+sub run_test {
+    my $url = shift;
+
+    my ($fh, $fn) = tempfile();
+
+    binmode( $fh );
+    binmode( STDOUT );
+
+    {
+        local @ARGV = ($url);
+        my $i;
+        lives_ok {
+            $i = Catalyst::Script::Test->new_with_options(application_name => 'TestApp');
+        } "new_with_options";
+        ok $i;
+        my $saved;
+        open( $saved, '>&'. STDOUT->fileno )
+            or croak("Can't dup stdout: $!");
+        open( STDOUT, '>&='. $fh->fileno )
+            or croak("Can't open stdout: $!");
+        eval { $i->run };
+        ok !$@, 'Ran ok';
+
+        STDOUT->flush
+            or croak("Can't flush stdout: $!");
+
+        open( STDOUT, '>&'. fileno($saved) )
+            or croak("Can't restore stdout: $!");
+    }
+
+    my $data = do { my $fh; open($fh, '<', $fn) or die $!; local $/; <$fh>; };
+    $fh = undef;
+    unlink $fn if -r $fn;
+
+    return $data;
+}