X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Controller-DBIC-API.git;a=blobdiff_plain;f=t%2Frest%2Fdelete.t;h=303455857bf36d68fabfa47967a4035fdf7d7c5e;hp=7ce222f6dc02d829120647bf2393da4b6c496c6e;hb=0b0bf9111127c9fdad1e456169ec4cdd15b160f9;hpb=a1f7106409eb2d3c49aa9cb2c631464c14e911c4

diff --git a/t/rest/delete.t b/t/rest/delete.t
index 7ce222f..3034558 100644
--- a/t/rest/delete.t
+++ b/t/rest/delete.t
@@ -13,45 +13,50 @@ use DBICTest;
 use Test::More;
 use Test::WWW::Mechanize::Catalyst 'RestTest';
 use HTTP::Request::Common qw/ DELETE /;
-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 $track = $schema->resultset('Track')->first;
+my $track         = $schema->resultset('Track')->first;
 my %original_cols = $track->get_columns;
 
-my $track_url = "$base/api/rest/track/";
+my $track_url        = "$base/api/rest/track/";
 my $track_delete_url = $track_url . $track->id;
 
 {
-  my $req = HTTP::Request->new( DELETE => $track_delete_url );
-  $req->content_type('text/x-json');
-  $mech->request($req);
-  cmp_ok( $mech->status, '==', 200, 'Attempt to delete track ok' );
+    my $req = HTTP::Request->new( DELETE => $track_delete_url );
+    $req->content_type('text/x-json');
+    $mech->request($req);
+    cmp_ok( $mech->status, '==', 200, 'Attempt to delete track ok' );
 
-  my $deleted_track = $schema->resultset('Track')->find($track->id);
-  is($deleted_track, undef, 'track deleted');
+    my $deleted_track = $schema->resultset('Track')->find( $track->id );
+    is( $deleted_track, undef, 'track deleted' );
 }
 
 {
-  my $req = HTTP::Request->new( DELETE => $track_delete_url );
-  $req->content_type('text/x-json');
-  $mech->request($req);
-  cmp_ok( $mech->status, '==', 400, 'Attempt to delete again caught' );
+    my $req = HTTP::Request->new( DELETE => $track_delete_url );
+    $req->content_type('text/x-json');
+    $mech->request($req);
+    cmp_ok( $mech->status, '==', 400, 'Attempt to delete again caught' );
 }
 
 {
-  my $track_cnt = $schema->resultset('Track')->count;
-  my $tracks_rs = $schema->resultset('Track')->search(undef, { select => ['trackid'], as => ['id'], rows=> 3 });
-  $tracks_rs->result_class('DBIx::Class::ResultClass::HashRefInflator');
-  my $test_data = JSON::Any->Dump({ list => [$tracks_rs->all] });
-  my $req = DELETE( $track_url, Content => $test_data );
-  $req->content_type('text/x-json');
-  $mech->request($req);
-  cmp_ok( $mech->status, '==', 200, 'Attempt to delete three tracks ok' );
-
-  is($schema->resultset('Track')->count + 3, $track_cnt, 'Three tracks deleted');
+    my $track_cnt = $schema->resultset('Track')->count;
+    my $tracks_rs =
+        $schema->resultset('Track')
+        ->search( undef, { select => ['trackid'], as => ['id'], rows => 3 } );
+    $tracks_rs->result_class('DBIx::Class::ResultClass::HashRefInflator');
+    my $test_data = $json->encode( { list => [ $tracks_rs->all ] } );
+    my $req = DELETE( $track_url, Content => $test_data );
+    $req->content_type('text/x-json');
+    $mech->request($req);
+    cmp_ok( $mech->status, '==', 200, 'Attempt to delete three tracks ok' );
+
+    is( $schema->resultset('Track')->count + 3,
+        $track_cnt, 'Three tracks deleted' );
 }
 
 done_testing();