use JSON instead of JSON::Any to get rid of the CPAN Testers failures when only JSON...

[catagits/Catalyst-Controller-DBIC-API.git] / t / rpc / update.t

diff --git a/t/rpc/update.t b/t/rpc/update.t
index 37bdbe9..29dbf9d 100644 (file)
--- a/t/rpc/update.t
+++ b/t/rpc/update.t
@@ -13,151 +13,184 @@ 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 $track = $schema->resultset('Track')->first;
+my $track         = $schema->resultset('Track')->first;
 my %original_cols = $track->get_columns;
 
 my $track_update_url = "$base/api/rpc/track/id/" . $track->id . "/update";
-my $any_track_update_url = "$base/api/rpc/any/track/id/" . $track->id . "/update";
+my $any_track_update_url =
+    "$base/api/rpc/any/track/id/" . $track->id . "/update";
 my $tracks_update_url = "$base/api/rpc/track/update";
 
 # test invalid track id caught
 {
-               foreach my $wrong_id ('sdsdsdsd', 3434234) {
-                       my $incorrect_url = "$base/api/rpc/track/id/" . $wrong_id . "/update";
-                       my $req = POST( $incorrect_url, {
-                       title => 'value'
-               });
-
-               $mech->request($req, $content_type);
-               cmp_ok( $mech->status, '==', 400, 'Attempt with invalid track id caught' );
-               
-               my $response = JSON::Any->Load( $mech->content);
-               like( $response->{messages}->[0], qr/No object found for id/, 'correct message returned' );
-               
-               $track->discard_changes;
-               is_deeply({ $track->get_columns }, \%original_cols, 'no update occurred');
-       }
+    foreach my $wrong_id ( 'sdsdsdsd', 3434234 ) {
+        my $incorrect_url = "$base/api/rpc/track/id/" . $wrong_id . "/update";
+        my $req = POST( $incorrect_url, { title => 'value' } );
+
+        $mech->request( $req, $content_type );
+        cmp_ok( $mech->status, '==', 400,
+            'Attempt with invalid track id caught' );
+
+        my $response = $json->decode( $mech->content );
+        like(
+            $response->{messages}->[0],
+            qr/No object found for id/,
+            'correct message returned'
+        );
+
+        $track->discard_changes;
+        is_deeply(
+            { $track->get_columns },
+            \%original_cols,
+            'no update occurred'
+        );
+    }
 }
 
 # validation when no params sent
 {
-  my $req = POST( $track_update_url, {
-         wrong_param => 'value'
-  });
-  $mech->request($req, $content_type);
-  cmp_ok( $mech->status, '==', 400, 'Update with no keys causes error' );
-
-  my $response = JSON::Any->Load( $mech->content);
-  is_deeply( $response->{messages}, ['No valid keys passed'], 'correct message returned' );
-
-  $track->discard_changes;
-  is_deeply({ $track->get_columns }, \%original_cols, 'no update occurred');
+    my $req = POST( $track_update_url, { wrong_param => 'value' } );
+    $mech->request( $req, $content_type );
+    cmp_ok( $mech->status, '==', 400, 'Update with no keys causes error' );
+
+    my $response = $json->decode( $mech->content );
+    is_deeply( $response->{messages}, ['No valid keys passed'],
+        'correct message returned' );
+
+    $track->discard_changes;
+    is_deeply(
+        { $track->get_columns },
+        \%original_cols,
+        'no update occurred'
+    );
 }
 
 {
-  my $req = POST( $track_update_url, {
-         wrong_param => 'value'
-  });
-  $mech->request($req, $content_type);
-  cmp_ok( $mech->status, '==', 400, 'Update with no keys causes error' );
-
-  my $response = JSON::Any->Load( $mech->content);
-  is_deeply( $response->{messages}, ['No valid keys passed'], 'correct message returned' );
-
-  $track->discard_changes;
-  is_deeply({ $track->get_columns }, \%original_cols, 'no update occurred');
+    my $req = POST( $track_update_url, { wrong_param => 'value' } );
+    $mech->request( $req, $content_type );
+    cmp_ok( $mech->status, '==', 400, 'Update with no keys causes error' );
+
+    my $response = $json->decode( $mech->content );
+    is_deeply( $response->{messages}, ['No valid keys passed'],
+        'correct message returned' );
+
+    $track->discard_changes;
+    is_deeply(
+        { $track->get_columns },
+        \%original_cols,
+        'no update occurred'
+    );
 }
 
 {
-  my $req = POST( $track_update_url, {
-         title => undef
-  });
-  $mech->request($req, $content_type);
-  cmp_ok( $mech->status, '==', 200, 'Update with key with no value okay' );
-
-  $track->discard_changes;
-  isnt($track->title, $original_cols{title}, 'Title changed');
-  is($track->title, '', 'Title changed to undef');
+    my $req = POST( $track_update_url, { title => undef } );
+    $mech->request( $req, $content_type );
+    cmp_ok( $mech->status, '==', 200, 'Update with key with no value okay' );
+
+    $track->discard_changes;
+    isnt( $track->title, $original_cols{title}, 'Title changed' );
+    is( $track->title, '', 'Title changed to undef' );
 }
 
 {
-  my $req = POST( $track_update_url, {
-         title => 'monkey monkey'
-  });
-  $mech->request($req, $content_type);
-  cmp_ok( $mech->status, '==', 200, 'Update with key with value okay' );
-
-  $track->discard_changes;
-  is($track->title, 'monkey monkey', 'Title changed to "monkey monkey"');
+    my $req = POST( $track_update_url, { title => 'monkey monkey' } );
+    $mech->request( $req, $content_type );
+    cmp_ok( $mech->status, '==', 200, 'Update with key with value okay' );
+
+    $track->discard_changes;
+    is( $track->title, 'monkey monkey', 'Title changed to "monkey monkey"' );
 }
 
 {
-  my $req = POST( $track_update_url, {
-         title => 'sheep sheep',
-         'cd.year' => '2009'
-  });
-  $mech->request($req, $content_type);
-  cmp_ok( $mech->status, '==', 200, 'Update with key with value and related key okay' );
-
-  $track->discard_changes;
-  is($track->title, 'sheep sheep', 'Title changed');
-  is($track->cd->year, '2009', 'Related field changed"');
+    my $req = POST(
+        $track_update_url,
+        {   title     => 'sheep sheep',
+            'cd.year' => '2009'
+        }
+    );
+    $mech->request( $req, $content_type );
+    cmp_ok( $mech->status, '==', 200,
+        'Update with key with value and related key okay' );
+
+    $track->discard_changes;
+    is( $track->title,    'sheep sheep', 'Title changed' );
+    is( $track->cd->year, '2009',        'Related field changed"' );
 }
 
 {
-  my $req = POST( $any_track_update_url, {
-         title => 'baa'
-  });
-  $mech->request($req, $content_type);
-  cmp_ok( $mech->status, '==', 200, 'Stash update okay' );
-
-  $track->discard_changes;
-  is($track->title, 'baa', 'Title changed');
+    my $req = POST( $any_track_update_url, { title => 'baa' } );
+    $mech->request( $req, $content_type );
+    cmp_ok( $mech->status, '==', 200, 'Stash update okay' );
+
+    $track->discard_changes;
+    is( $track->title, 'baa', 'Title changed' );
 }
 
 {
-  my $req = POST( $any_track_update_url, {
-         position => '14'
-  });
-  $mech->request($req, $content_type);
-  cmp_ok( $mech->status, '==', 200, 'Position update okay' );
-
-  $track->discard_changes;
-  is($track->get_column('position'), '14', 'Position changed');
+    my $req = POST( $any_track_update_url, { position => '14' } );
+    $mech->request( $req, $content_type );
+    cmp_ok( $mech->status, '==', 200, 'Position update okay' );
+
+    $track->discard_changes;
+    is( $track->get_column('position'), '14', 'Position changed' );
 }
 
 # bulk_update existing objects
 {
-  # order to get a stable order of rows
-  my $tracks_rs = $schema->resultset('Track')->search(undef, { order_by => 'trackid', rows => 3 });
-  my $test_data = JSON::Any->Dump({ list => [map +{ id => $_->id, title => 'Track ' . $_->id }, $tracks_rs->all] });
-  my $req = POST( $tracks_update_url, Content => $test_data );
-  $req->content_type('text/x-json');
-  $mech->request($req);
-  cmp_ok( $mech->status, '==', 200, 'Attempt to update three tracks ok' );
-
-  $tracks_rs->reset;
-  while (my $track = $tracks_rs->next) {
-    is($track->title, 'Track ' . $track->id, 'Title changed');
-  }
+
+    # order to get a stable order of rows
+    my $tracks_rs =
+        $schema->resultset('Track')
+        ->search( undef, { order_by => 'trackid', rows => 3 } );
+    my $test_data = $json->encode(
+        {   list => [
+                map +{ id => $_->id, title => 'Track ' . $_->id },
+                $tracks_rs->all
+            ]
+        }
+    );
+    my $req = POST( $tracks_update_url, Content => $test_data );
+    $req->content_type('text/x-json');
+    $mech->request($req);
+    cmp_ok( $mech->status, '==', 200, 'Attempt to update three tracks ok' );
+
+    $tracks_rs->reset;
+    while ( my $track = $tracks_rs->next ) {
+        is( $track->title, 'Track ' . $track->id, 'Title changed' );
+    }
 }
 
 # bulk_update nonexisting objects
 {
-  # order to get a stable order of rows
-  my $test_data = JSON::Any->Dump({ list => [map +{ id => $_, title => 'Track ' . $_ }, (1000..1002)] });
-  my $req = POST( $tracks_update_url, Content => $test_data );
-  $req->content_type('text/x-json');
-  $mech->request($req);
-  cmp_ok( $mech->status, '==', 400, 'Attempt to update three nonexisting tracks fails' );
-  my $response = JSON::Any->Load( $mech->content);
-  is( $response->{success}, 'false', 'success property returns quoted false' );
-  like( $response->{messages}->[0], qr/No object found for id/, 'correct message returned' );
+
+    # order to get a stable order of rows
+    my $test_data = $json->encode(
+        {   list => [
+                map +{ id => $_, title => 'Track ' . $_ },
+                ( 1000 .. 1002 )
+            ]
+        }
+    );
+    my $req = POST( $tracks_update_url, Content => $test_data );
+    $req->content_type('text/x-json');
+    $mech->request($req);
+    cmp_ok( $mech->status, '==', 400,
+        'Attempt to update three nonexisting tracks fails' );
+    my $response = $json->decode( $mech->content );
+    is( $response->{success}, 'false',
+        'success property returns quoted false' );
+    like(
+        $response->{messages}->[0],
+        qr/No object found for id/,
+        'correct message returned'
+    );
 }
 
 done_testing();