X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Controller-DBIC-API.git;a=blobdiff_plain;f=t%2Frpc%2Fitem.t;h=417bffb7a41fe6283db5216b4b933e8c2c3b8e3d;hp=538c37937a01771ddf00ca32b06e0d11d7b0d207;hb=HEAD;hpb=609916e5de6201b2e2212328153657194b41a730

diff --git a/t/rpc/item.t b/t/rpc/item.t
index 538c379..417bffb 100644
--- a/t/rpc/item.t
+++ b/t/rpc/item.t
@@ -1,5 +1,3 @@
-use 5.6.0;
-
 use strict;
 use warnings;
 
@@ -13,31 +11,43 @@ use URI;
 use Test::More;
 use Test::WWW::Mechanize::Catalyst 'RestTest';
 use HTTP::Request::Common;
-use JSON::Any;
+use JSON::MaybeXS;
+
+my $json = JSON::MaybeXS->new(utf8 => 1);
 
 my $mech = Test::WWW::Mechanize::Catalyst->new;
-ok(my $schema = DBICTest->init_schema(), 'got schema');
+ok( my $schema = DBICTest->init_schema(), 'got schema' );
 
 my $artist_view_url = "$base/api/rpc/artist/id/";
 
 {
     my $id = 1;
-    my $req = GET( $artist_view_url . $id, undef, 'Accept' => 'application/json' );
+    my $req = GET( $artist_view_url . $id, 'Accept' => 'application/json' );
     $mech->request($req);
     cmp_ok( $mech->status, '==', 200, 'open attempt okay' );
-    my %expected_response = $schema->resultset('Artist')->find($id)->get_columns;
-    my $response = JSON::Any->Load( $mech->content);
-    is_deeply( $response, { data => \%expected_response, success => 'true' }, 'correct data returned' );
+    my %expected_response =
+        $schema->resultset('Artist')->find($id)->get_columns;
+    my $response = $json->decode( $mech->content );
+    is_deeply(
+        $response,
+        { data => \%expected_response, success => 'true' },
+        'correct data returned'
+    );
 }
 
 {
     my $id = 5;
-    my $req = GET( $artist_view_url . $id, undef, 'Accept' => 'application/json' );
+    my $req = GET( $artist_view_url . $id, 'Accept' => 'application/json' );
     $mech->request($req);
     cmp_ok( $mech->status, '==', 400, 'open attempt not ok' );
-    my $response = JSON::Any->Load( $mech->content);
-    is($response->{success}, 'false', 'not existing object fetch failed ok');
-    like($response->{messages}->[0], qr/^No object found for id/, 'error message for not existing object fetch ok');
+    my $response = $json->decode( $mech->content );
+    is( $response->{success}, 'false',
+        'not existing object fetch failed ok' );
+    like(
+        $response->{messages}->[0],
+        qr/^No object found for id/,
+        'error message for not existing object fetch ok'
+    );
 }
 
 done_testing();