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=7f46b2dea24887675b729649ce08ece7939d0c83;hp=4e0913fa1f20290a944ab95f3c6cc0f5c0a91e44;hb=bb73aedb99734f11a8419f93915b87faf33ac1bf;hpb=d273984026646e5b57c052deef3fcb9121122060

diff --git a/t/rpc/create.t b/t/rpc/create.t
index 4e0913f..7f46b2d 100644
--- a/t/rpc/create.t
+++ b/t/rpc/create.t
@@ -1,5 +1,3 @@
-use 5.6.0;
-
 use strict;
 use warnings;
 
@@ -13,77 +11,118 @@ use DBICTest;
 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_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
 {
-    $DB::single = 1;
-  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 $data = {
+        producerid => 100,
+        name       => 'Producer',
+    };
+
+    my $req = POST($producer_create_url, $data, 'Accept' => 'text/json');
+    $mech->request( $req, $content_type );
+    cmp_ok( $mech->status, '==', 200, 'create with pk value ok' );
+    my $response = $json->decode( $mech->content );
+    is_deeply(
+        $response,
+        { success => 'true', list => $data },
+        'json for producer with pk value ok'
+    );
+    # try to insert same data again, as this seems to be the only way to
+    # force an insert to fail for SQLite.
+    # It accepts too long columns as well as wrong datatypes without errors.
+    # The bind with datatype of newer DBIC versions numifies non-integer
+    # values passed as pk value too.
+    $mech->request( $req, $content_type );
+    cmp_ok( $mech->status, '==', 400, 'invalid param value produces error' );
 }
 
 done_testing();