X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fp5-DBIx-Class-ResultSet-RecursiveUpdate;a=blobdiff_plain;f=t%2Flib%2FRunTests.pm;h=204b93ce81140d8d6d594fdab1207051c03e77c8;hp=f34f6b25a6d91c23fc14e0833c31eb23706fc94c;hb=HEAD;hpb=e589cf208847323ebac6def8aa65075d6c253016

diff --git a/t/lib/RunTests.pm b/t/lib/RunTests.pm
index f34f6b2..204b93c 100644
--- a/t/lib/RunTests.pm
+++ b/t/lib/RunTests.pm
@@ -11,7 +11,7 @@ use DBIx::Class::ResultSet::RecursiveUpdate;
 sub run_tests {
     my $schema = shift;
 
-    plan tests => 55;
+    plan tests => 59;
 
     my $dvd_rs  = $schema->resultset('Dvd');
     my $user_rs = $schema->resultset('User');
@@ -24,25 +24,19 @@ sub run_tests {
     my $updates;
 
     # pre 0.21 api
-    $dvd_rs->search( { dvd_id => 1 } )->recursive_update( {
-            owner =>  { username => 'aaa'  }
-        },
-        [ 'dvd_id' ]
-    );
+    $dvd_rs->search( { dvd_id => 1 } )
+        ->recursive_update( { owner => { username => 'aaa' } }, ['dvd_id'] );
 
-    my $u = $user_rs->find( $dvd_rs->find( 1 )->owner->id );
+    my $u = $user_rs->find( $dvd_rs->find(1)->owner->id );
     is( $u->username, 'aaa', 'fixed_fields pre 0.21 api ok' );
 
-     # 0.21+ api
-    $dvd_rs->search( { dvd_id => 1 } )->recursive_update( {
-            owner =>  { username => 'bbb'  }
-        },
-        {
-            fixed_fields => [ 'dvd_id' ],
-        }
+    # 0.21+ api
+    $dvd_rs->search( { dvd_id => 1 } )->recursive_update(
+        { owner        => { username => 'bbb' } },
+        { fixed_fields => ['dvd_id'], }
     );
 
-    $u = $user_rs->find( $dvd_rs->find( 1 )->owner->id );
+    $u = $user_rs->find( $dvd_rs->find(1)->owner->id );
     is( $u->username, 'bbb', 'fixed_fields 0.21+ api ok' );
 
     {
@@ -123,7 +117,7 @@ sub run_tests {
     $updates = {
         name     => 'Test name 2',
         viewings => [ { user_id => $owner->id } ],
-        owner    => { id => $another_owner->id },
+        owner => { id => $another_owner->id },
     };
 
     my $new_dvd = $dvd_rs->recursive_update($updates);
@@ -172,7 +166,7 @@ sub run_tests {
         'Twokeys created'
     );
     my $onekey =
-        $schema->resultset('Onekey')->search( name => 'aaaaa' )->first;
+        $schema->resultset('Onekey')->search({ name => 'aaaaa' })->first;
     ok( $onekey, 'Onekey created' );
     ok( $schema->resultset('Twokeys_belongsto')
             ->find( { key1 => $onekey->id, key2 => 1 } ),
@@ -205,7 +199,8 @@ TODO: {
     is( $schema->resultset('User')->count,
         $expected_user_count, "No new user created" );
     is( $dvd_updated->name, undef, 'Dvd name deleted' );
-    is( $dvd_updated->get_column('owner'), $another_owner->id, 'Owner updated' );
+    is( $dvd_updated->get_column('owner'),
+        $another_owner->id, 'Owner updated' );
     is( $dvd_updated->current_borrower->name,
         'new name a', 'Related record modified' );
     is( $dvd_updated->tags->count, 0, 'Tags deleted' );
@@ -214,10 +209,14 @@ TODO: {
         'might_have record changed'
     );
 
-    my $dvd_with_tags = $dvd_rs->recursive_update({ id => $dvd->dvd_id, tags => [1, 2] });
-    is_deeply( [ map { $_->id } $dvd_with_tags->tags ], [ 1, 2 ], 'Tags set' );
-    my $dvd_without_tags = $dvd_rs->recursive_update({ id => $dvd->dvd_id, tags => undef });
-    is( $dvd_without_tags->tags->count, 0, 'Tags deleted when m2m accessor set to undef' );
+    my $dvd_with_tags =
+        $dvd_rs->recursive_update( { id => $dvd->dvd_id, tags => [ 1, 2 ] } );
+    is_deeply( [ map { $_->id } $dvd_with_tags->tags ], [ 1, 2 ],
+        'Tags set' );
+    my $dvd_without_tags =
+        $dvd_rs->recursive_update( { id => $dvd->dvd_id, tags => undef } );
+    is( $dvd_without_tags->tags->count,
+        0, 'Tags deleted when m2m accessor set to undef' );
 
     $new_dvd->update( { name => 'New Test Name' } );
     $updates = {
@@ -283,6 +282,8 @@ TODO: {
     $dvd = $dvd_rs->find(1);
     is( $dvd->get_column('owner'), $user->id, 'foreign key set' );
 
+    # has_many where foreign cols are nullable
+    my $available_dvd_rs = $dvd_rs->search({ current_borrower => undef });
     $dvd_rs->update( { current_borrower => $user->id } );
     ok( $user->borrowed_dvds->count > 1, 'Precond' );
     $updates = {
@@ -295,21 +296,27 @@ TODO: {
         updates          => $updates,
         if_not_submitted => 'set_to_null',
         );
-    is( $user->borrowed_dvds->count, 1, 'set_to_null' );
+    is( $user->borrowed_dvds->count, 1, 'borrowed_dvds update with if_not_submitted => set_to_null ok' );
+    is( $available_dvd_rs->count, 5, "previously borrowed dvds weren't deleted");
+
+    $dvd_rs->update( { current_borrower => $user->id } );
+    $user =
+        DBIx::Class::ResultSet::RecursiveUpdate::Functions::recursive_update(
+        resultset        => $user_rs,
+        updates          => $updates,
+        );
+    is( $user->borrowed_dvds->count, 1, 'borrowed_dvds update without if_not_submitted ok' );
+    is( $available_dvd_rs->count, 5, "previously borrowed dvds weren't deleted");
 
-    # has_many where foreign cols are nullable
     $dvd_rs->update( { current_borrower => $user->id } );
-    $updates = {
-        id            => $user->id,
-        borrowed_dvds => [ { id => $dvd->id }, ]
-    };
     $user =
         DBIx::Class::ResultSet::RecursiveUpdate::Functions::recursive_update(
         resultset        => $user_rs,
         updates          => $updates,
         if_not_submitted => 'delete',
         );
-    is( $user->borrowed_dvds->count, 1, 'if_not_submitted delete' );
+    is( $user->borrowed_dvds->count, 1, 'borrowed_dvds update with if_not_submitted => delete ok' );
+    is( $dvd_rs->count, 1, 'all dvds except the one borrowed by the user were deleted');
 
     @tags = $schema->resultset('Tag')->all;
     $dvd_updated =