X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=t%2Flive_fork.t;h=e716b386b6557842f1b331d7cc0f40443250c970;hp=3a2dc3c3e9fa752746dbca8c1c419060c818377c;hb=5757858f133f7f1e92dd996dad0f6e28b0b919ed;hpb=9af4ee013b23e7241d4664ea39952fa3b20f4b7f

diff --git a/t/live_fork.t b/t/live_fork.t
index 3a2dc3c..e716b38 100644
--- a/t/live_fork.t
+++ b/t/live_fork.t
@@ -12,9 +12,7 @@ use Test::More;
 use FindBin;
 use lib "$FindBin::Bin/lib";
 use Catalyst::Test qw(TestApp);
-
-eval 'use YAML';
-plan skip_all => 'YAML required' if $@;
+use JSON::MaybeXS qw(decode_json);
 
 plan skip_all => 'Using remote server (and REMOTE_FORK not set)'
     if $ENV{CATALYST_SERVER} && !$ENV{REMOTE_FORK};
@@ -26,7 +24,7 @@ plan skip_all => 'Skipping fork tests: no /bin/ls'
     ok(my $result = get('/fork/system/%2Fbin%2Fls'), 'system');
 
     if (my $result_ref = result_ok($result)) {
-        ok($result_ref, 'is YAML');
+        ok($result_ref, 'is JSON');
         is($result_ref->{result}, 0, 'exited OK');
     }
 }
@@ -35,7 +33,7 @@ plan skip_all => 'Skipping fork tests: no /bin/ls'
     ok(my $result = get('/fork/backticks/%2Fbin%2Fls'), '`backticks`');
 
     if (my $result_ref = result_ok($result)) {
-        ok($result_ref, 'is YAML');
+        ok($result_ref, 'is JSON');
         is($result_ref->{code}, 0, 'exited successfully');
         like($result_ref->{result}, qr{^/bin/ls[^:]}, 'contains ^/bin/ls$');
         like($result_ref->{result}, qr{\n.*\n}m, 'contains two newlines');
@@ -46,7 +44,7 @@ plan skip_all => 'Skipping fork tests: no /bin/ls'
     ok(my $result = get('/fork/fork'), 'fork');
 
     if (my $result_ref = result_ok($result)) {
-        ok($result_ref, 'is YAML');
+        ok($result_ref, 'is JSON');
         isnt($result_ref->{pid}, 0, q{fork's "pid" wasn't 0});
         isnt($result_ref->{pid}, $$, 'fork got a new pid');
         is($result_ref->{result}, 'ok', 'fork was effective');
@@ -61,7 +59,7 @@ sub result_ok {
 
     $result =~ s/\r\n|\r/\n/g;
 
-    return eval { Load($result) };
+    return eval { decode_json($result) };
 }
 
 done_testing;