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

diff --git a/t/rest/create.t b/t/rest/create.t
index 58a6ea8..4a96e81 100644
--- a/t/rest/create.t
+++ b/t/rest/create.t
@@ -12,79 +12,99 @@ 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/rest/artist";
+my $artist_create_url   = "$base/api/rest/artist";
 my $producer_create_url = "$base/api/rest/producer";
 
 # test validation when no params sent
 {
-	my $test_data = JSON::Any->Dump({ wrong_param => 'value' });
-	my $req = PUT( $artist_create_url );
-	$req->content_type('text/x-json');
-	$req->content_length(
-						 do { use bytes; length( $test_data ) }
-						 );
-	$req->content( $test_data );
-	$mech->request($req);
-    
-	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 $test_data = $json->encode( { wrong_param => 'value' } );
+    my $req = PUT($artist_create_url);
+    $req->content_type('text/x-json');
+    $req->content_length(
+        do { use bytes; length($test_data) }
+    );
+    $req->content($test_data);
+    $mech->request($req);
+
+    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 $test_data = JSON::Any->Dump({});
-	my $req = PUT( $producer_create_url );
-	$req->content_type('text/x-json');
-	$req->content_length(
-						 do { use bytes; length( $test_data ) }
-						 );
-	$req->content( $test_data );
-	$mech->request($req);
-	cmp_ok( $mech->status, '==', 200, 'default value used when not supplied' );
-	ok($schema->resultset('Producer')->find({ name => 'fred' }), 'record created with default name');
+    my $test_data = $json->encode( {} );
+    my $req = PUT($producer_create_url);
+    $req->content_type('text/x-json');
+    $req->content_length(
+        do { use bytes; length($test_data) }
+    );
+    $req->content($test_data);
+    $mech->request($req);
+    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 $test_data = JSON::Any->Dump({ name => 'king luke' });
-	my $req = PUT( $producer_create_url );
-	$req->content_type('text/x-json');
-	$req->content_length(
-						 do { use bytes; length( $test_data ) }
-						 );
-	$req->content( $test_data );
-	$mech->request($req);
-	cmp_ok( $mech->status, '==', 200, 'request with valid content okay' );
-	my $new_obj = $schema->resultset('Producer')->find({ name => 'king luke' });
-	ok($new_obj, 'record created with specified name');
+    my $test_data = $json->encode( { name => 'king luke' } );
+    my $req = PUT($producer_create_url);
+    $req->content_type('text/x-json');
+    $req->content_length(
+        do { use bytes; length($test_data) }
+    );
+    $req->content($test_data);
+    $mech->request($req);
+    cmp_ok( $mech->status, '==', 200, 'request with valid content okay' );
+    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 $response = $json->decode( $mech->content );
+    is_deeply(
+        $response->{list},
+        { $new_obj->get_columns },
+        'json for new producer returned'
+    );
 }
 
 # test bulk create
 {
-	my $test_data = JSON::Any->Dump({ list => [{ name => 'king nperez' }, { name => 'queen perla'}] });
-	my $req = PUT( $producer_create_url );
-	$req->content_type('text/x-json');
-	$req->content_length(
-						 do { use bytes; length( $test_data ) }
-						 );
-	$req->content( $test_data );
-	$mech->request($req);
-	cmp_ok( $mech->status, '==', 200, 'request with valid content okay' );
-	my $rs = $schema->resultset('Producer')->search([ { name => 'king nperez' }, { name => 'queen perla' } ]);
-	ok($rs, 'record created with specified name');
+    my $test_data = $json->encode(
+        { list => [ { name => 'king nperez' }, { name => 'queen perla' } ] }
+    );
+    my $req = PUT($producer_create_url);
+    $req->content_type('text/x-json');
+    $req->content_length(
+        do { use bytes; length($test_data) }
+    );
+    $req->content($test_data);
+    $mech->request($req);
+    cmp_ok( $mech->status, '==', 200, 'request with valid content okay' );
+    my $rs =
+        $schema->resultset('Producer')
+        ->search( [ { name => 'king nperez' }, { name => 'queen perla' } ] );
+    ok( $rs, 'record created with specified name' );
 
-	my $response = JSON::Any->Load( $mech->content);
-    my $expected = [ map { my %foo = $_->get_inflated_columns; \%foo; } $rs->all ];
-	is_deeply( $response->{list}, $expected, 'json for bulk create returned' );
+    my $response = $json->decode( $mech->content );
+    my $expected =
+        [ map { my %foo = $_->get_inflated_columns; \%foo; } $rs->all ];
+    is_deeply( $response->{list}, $expected,
+        'json for bulk create returned' );
 }
 
 done_testing();