X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Controller-DBIC-API.git;a=blobdiff_plain;f=t%2Frpc%2Flist_prefetch.t;h=3c8b1a45a3140899a65ffd67ca9ab7cf6d5cd7a6;hp=bb82da7f24c13ba078b4dee1a3e8ca2d5d0d935b;hb=a5949bfde189427d34ccd19f15d8656156454936;hpb=d273984026646e5b57c052deef3fcb9121122060

diff --git a/t/rpc/list_prefetch.t b/t/rpc/list_prefetch.t
index bb82da7..3c8b1a4 100644
--- a/t/rpc/list_prefetch.t
+++ b/t/rpc/list_prefetch.t
@@ -1,5 +1,3 @@
-use 5.6.0;
-
 use strict;
 use warnings;
 
@@ -13,66 +11,111 @@ use URI;
 use Test::More tests => 17;
 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_list_url = "$base/api/rpc/artist/list";
-my $cd_list_url = "$base/api/rpc/cd/list";
+my $cd_list_url     = "$base/api/rpc/cd/list";
+
+foreach my $req_params ( { 'list_prefetch' => '["cds"]' },
+    { 'list_prefetch' => 'cds' } )
+{
+    my $uri = URI->new($artist_list_url);
+    $uri->query_form($req_params);
+    my $req = GET( $uri, 'Accept' => 'text/x-json' );
+    $mech->request($req);
+    cmp_ok( $mech->status, '==', 200,
+        'search with simple prefetch request okay' );
+    my $rs =
+        $schema->resultset('Artist')
+        ->search( undef, { prefetch => ['cds'] } );
+    $rs->result_class('DBIx::Class::ResultClass::HashRefInflator');
+    my @rows              = $rs->all;
+    my $expected_response = { list => \@rows, success => 'true' };
+    my $response          = $json->decode( $mech->content );
 
-foreach my $req_params ({ 'list_prefetch' => '["cds"]' }, { 'list_prefetch' => 'cds' }) {
-	my $uri = URI->new( $artist_list_url );
-	$uri->query_form($req_params);
-	my $req = GET( $uri, 'Accept' => 'text/x-json' );
-	$mech->request($req);
-	cmp_ok( $mech->status, '==', 200, 'search with simple prefetch request okay' );
-	my $rs = $schema->resultset('Artist')->search(undef, { prefetch => ['cds'] });
-	$rs->result_class('DBIx::Class::ResultClass::HashRefInflator');
-	my @rows = $rs->all;
-	my $expected_response = { list => \@rows, success => 'true' };
-	my $response = JSON::Any->Load( $mech->content);
-	#use Data::Dumper; warn Dumper($response, $expected_response);
-	is_deeply( $expected_response, $response, 'correct data returned for search with simple prefetch specified as param' );
+    #use Data::Dumper; warn Dumper($response, $expected_response);
+    is_deeply( $expected_response, $response,
+        'correct data returned for search with simple prefetch specified as param'
+    );
 }
 
-foreach my $req_params ({ 'list_prefetch' => '{"cds":"tracks"}' }, { 'list_prefetch.cds' => 'tracks' }) {
-	my $uri = URI->new( $artist_list_url );
-	$uri->query_form($req_params);
-	my $req = GET( $uri, 'Accept' => 'text/x-json' );
-	$mech->request($req);
-	cmp_ok( $mech->status, '==', 200, 'search with multi-level prefetch request okay' );
-	my $rs = $schema->resultset('Artist')->search(undef, { prefetch => {'cds' => 'tracks'} });
-	$rs->result_class('DBIx::Class::ResultClass::HashRefInflator');
-	my @rows = $rs->all;
-	my $expected_response = { list => \@rows, success => 'true' };
-	my $response = JSON::Any->Load( $mech->content);
-	#use Data::Dumper; warn Dumper($response, $expected_response);
-	is_deeply( $expected_response, $response, 'correct data returned for search with multi-level prefetch specified as param' );
+foreach my $req_params (
+    { 'list_prefetch'     => '{"cds":"tracks"}' },
+    { 'list_prefetch.cds' => 'tracks' }
+    )
+{
+    my $uri = URI->new($artist_list_url);
+    $uri->query_form($req_params);
+    my $req = GET( $uri, 'Accept' => 'text/x-json' );
+    $mech->request($req);
+    cmp_ok( $mech->status, '==', 200,
+        'search with multi-level prefetch request okay' );
+    my $rs =
+        $schema->resultset('Artist')
+        ->search( undef, { prefetch => { 'cds' => 'tracks' } } );
+    $rs->result_class('DBIx::Class::ResultClass::HashRefInflator');
+    my @rows              = $rs->all;
+    my $expected_response = { list => \@rows, success => 'true' };
+    my $response          = $json->decode( $mech->content );
+
+    #use Data::Dumper; warn Dumper($response, $expected_response);
+    is_deeply( $expected_response, $response,
+        'correct data returned for search with multi-level prefetch specified as param'
+    );
 }
 
-foreach my $req_params ({ 'list_prefetch' => '["artist"]' }, { 'list_prefetch' => 'artist' }) {
-	my $uri = URI->new( $cd_list_url );
-	$uri->query_form($req_params);	
-	my $req = GET( $uri, 'Accept' => 'text/x-json' );
-	$mech->request($req);
-	cmp_ok( $mech->status, '==', 400, 'prefetch of artist not okay' );
+foreach my $req_params ( { 'list_prefetch' => '["artist"]' },
+    { 'list_prefetch' => 'artist' } )
+{
+    my $uri = URI->new($cd_list_url);
+    $uri->query_form($req_params);
+    my $req = GET( $uri, 'Accept' => 'text/x-json' );
+    $mech->request($req);
+    cmp_ok( $mech->status, '==', 400, 'prefetch of artist not okay' );
+
+    my $expected_response = map {
+        { $_->get_columns }
+    } $schema->resultset('CD')->all;
+    my $response = $json->decode( $mech->content );
 
-	my $expected_response = map { { $_->get_columns } } $schema->resultset('CD')->all;
-	my $response = JSON::Any->Load( $mech->content);
-	#use Data::Dumper; warn Dumper($response, $expected_response);
-    is($response->{success}, 'false', 'correct message returned' );
-	like($response->{messages}->[0], qr/not an allowed prefetch in:/, 'correct message returned' );
+    #use Data::Dumper; warn Dumper($response, $expected_response);
+    is( $response->{success}, 'false', 'correct message returned' );
+    like(
+        $response->{messages}->[0],
+        qr/not an allowed prefetch in:/,
+        'correct message returned'
+    );
 }
 
 {
-	my $uri = URI->new( $cd_list_url );
-	$uri->query_form({ 'list_prefetch' => 'tracks', 'list_ordered_by' => 'title', 'list_count' => 2, 'list_page' => 1 });
-	my $req = GET( $uri, 'Accept' => 'text/x-json' );
-	$mech->request($req);
-	if (cmp_ok( $mech->status, '==', 400, 'order_by on non-unique col with paging returns error' )) {
-		my $response = JSON::Any->Load( $mech->content);
-		is_deeply( $response, { messages => ['a database error has occured.'], success => 'false' },
-            'error returned for order_by on non-existing col with paging' );
-	}
+    my $uri = URI->new($cd_list_url);
+    $uri->query_form(
+        {   'list_prefetch'   => 'tracks',
+            'list_ordered_by' => 'title',
+            'list_count'      => 2,
+            'list_page'       => 1
+        }
+    );
+    my $req = GET( $uri, 'Accept' => 'text/x-json' );
+    $mech->request($req);
+    if (cmp_ok(
+            $mech->status, '==', 400,
+            'order_by on non-unique col with paging returns error'
+        )
+        )
+    {
+        my $response = $json->decode( $mech->content );
+        is_deeply(
+            $response,
+            {   messages => ['a database error has occured.'],
+                success  => 'false'
+            },
+            'error returned for order_by on non-existing col with paging'
+        );
+    }
 }