X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Controller-DBIC-API.git;a=blobdiff_plain;f=t%2Frpc%2Fcreate.t;h=d3b249db7aea26adbe9b2fda06de1845848f67a2;hp=f49a5b685f1042dd9dacea191a9d36ff73e5c708;hb=0b0bf9111127c9fdad1e456169ec4cdd15b160f9;hpb=e17f1f8e991b57bf9f7f23547c0c9af8b3012569

diff --git a/t/rpc/create.t b/t/rpc/create.t
index f49a5b6..d3b249d 100644
--- a/t/rpc/create.t
+++ b/t/rpc/create.t
@@ -13,76 +13,108 @@ use DBICTest;
 use Test::More;
 use Test::WWW::Mechanize::Catalyst 'RestTest';
 use HTTP::Request::Common;
-use JSON::Any;
+use JSON;
+
+my $json = JSON->new->utf8;
 
 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_create_url = "$base/api/rpc/artist/create";
+my $artist_create_url     = "$base/api/rpc/artist/create";
 my $any_artist_create_url = "$base/api/rpc/any/artist/create";
-my $producer_create_url = "$base/api/rpc/producer/create";
+my $producer_create_url   = "$base/api/rpc/producer/create";
 
 # test validation when no params sent
 {
-  my $req = POST( $artist_create_url, {
-	  wrong_param => 'value'
-  }, 'Accept' => 'text/json' );
-  $mech->request($req, $content_type);
-  cmp_ok( $mech->status, '==', 400, 'attempt without required params caught' );
-  my $response = JSON::Any->Load( $mech->content);
-  like( $response->{messages}->[0], qr/No value supplied for name and no default/, 'correct message returned' );
+    my $req = POST(
+        $artist_create_url,
+        { wrong_param => 'value' },
+        'Accept' => 'text/json'
+    );
+    $mech->request( $req, $content_type );
+    cmp_ok( $mech->status, '==', 400,
+        'attempt without required params caught' );
+    my $response = $json->decode( $mech->content );
+    like(
+        $response->{messages}->[0],
+        qr/No value supplied for name and no default/,
+        'correct message returned'
+    );
 }
 
 # test default value used if default value exists
 {
-  my $req = POST( $producer_create_url, {
-
-  }, 'Accept' => 'text/json' );
-  $mech->request($req, $content_type);
-  cmp_ok( $mech->status, '==', 200, 'default value used when not supplied' );
-  ok($schema->resultset('Producer')->find({ name => 'fred' }), 'record created with default name');
+    my $req = POST(
+        $producer_create_url,
+        {
+
+        },
+        'Accept' => 'text/json'
+    );
+    $mech->request( $req, $content_type );
+    cmp_ok( $mech->status, '==', 200,
+        'default value used when not supplied' );
+    ok( $schema->resultset('Producer')->find( { name => 'fred' } ),
+        'record created with default name' );
 }
 
 # test create works as expected when passing required value
 {
-  my $req = POST( $producer_create_url, {
-	  name => 'king luke'
-  }, 'Accept' => 'text/json' );
-  $mech->request($req, $content_type);
-  cmp_ok( $mech->status, '==', 200, 'param value used when supplied' );
-
-  my $new_obj = $schema->resultset('Producer')->find({ name => 'king luke' });
-  ok($new_obj, 'record created with specified name');
-
-  my $response = JSON::Any->Load( $mech->content);
-  is_deeply( $response->{list}, { $new_obj->get_columns }, 'json for new producer returned' );
+    my $req = POST(
+        $producer_create_url,
+        { name => 'king luke' },
+        'Accept' => 'text/json'
+    );
+    $mech->request( $req, $content_type );
+    cmp_ok( $mech->status, '==', 200, 'param value used when supplied' );
+
+    my $new_obj =
+        $schema->resultset('Producer')->find( { name => 'king luke' } );
+    ok( $new_obj, 'record created with specified name' );
+
+    my $response = $json->decode( $mech->content );
+    is_deeply(
+        $response->{list},
+        { $new_obj->get_columns },
+        'json for new producer returned'
+    );
 }
 
 # test stash config handling
 {
-  my $req = POST( $any_artist_create_url, {
-	  name => 'queen monkey'
-  }, 'Accept' => 'text/json' );
-  $mech->request($req, $content_type);
-  cmp_ok( $mech->status, '==', 200, 'stashed config okay' );
-
-  my $new_obj = $schema->resultset('Artist')->find({ name => 'queen monkey' });
-  ok($new_obj, 'record created with specified name');
-
-  my $response = JSON::Any->Load( $mech->content);
-  is_deeply( $response, { success => 'true' }, 'json for new artist returned' );
+    my $req = POST(
+        $any_artist_create_url,
+        { name => 'queen monkey' },
+        'Accept' => 'text/json'
+    );
+    $mech->request( $req, $content_type );
+    cmp_ok( $mech->status, '==', 200, 'stashed config okay' );
+
+    my $new_obj =
+        $schema->resultset('Artist')->find( { name => 'queen monkey' } );
+    ok( $new_obj, 'record created with specified name' );
+
+    my $response = $json->decode( $mech->content );
+    is_deeply(
+        $response,
+        { success => 'true' },
+        'json for new artist returned'
+    );
 }
 
 # test create returns an error as expected when passing invalid value
 {
-  my $long_string = '-' x 1024;
-
-  my $req = POST( $producer_create_url, {
-	  producerid => $long_string,
-      name       => $long_string,
-  }, 'Accept' => 'text/json' );
-  $mech->request($req, $content_type);
-  cmp_ok( $mech->status, '==', 400, 'invalid param value produces error' );
+    my $long_string = '-' x 1024;
+
+    my $req = POST(
+        $producer_create_url,
+        {   producerid => $long_string,
+            name       => $long_string,
+        },
+        'Accept' => 'text/json'
+    );
+    $mech->request( $req, $content_type );
+    cmp_ok( $mech->status, '==', 400, 'invalid param value produces error' );
 }
 
 done_testing();