X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fp5-DBIx-Class-ResultSet-RecursiveUpdate;a=blobdiff_plain;f=t%2Flib%2FRunTests.pm;h=b5f447d20d4b172b8c085cf1cb2288f7d7fb6c2e;hp=cce65e02bda418cf5fbfcbb5dfda6e0686f19639;hb=34a44681170dc8a76ec09b1d655ed2c6d1d28e49;hpb=dd98344ab0d8b1c141f7090ffa576ff2f25b9f51

diff --git a/t/lib/RunTests.pm b/t/lib/RunTests.pm
index cce65e0..b5f447d 100644
--- a/t/lib/RunTests.pm
+++ b/t/lib/RunTests.pm
@@ -9,7 +9,7 @@ use Test::More;
 sub run_tests{
     my $schema = shift;
 
-    plan tests => 24;
+    plan tests => 30;
     
     my $dvd_rs = $schema->resultset( 'Dvd' );
     my $user_rs = $schema->resultset( 'User' );
@@ -18,12 +18,10 @@ sub run_tests{
     my $another_owner = $user_rs->next;
     my $initial_user_count = $user_rs->count;
     my $initial_dvd_count = $dvd_rs->count;
-   
-    # creating new record linked to some old record
-    
     my $updates;
+
+    # creating new record linked to some old record
     $updates = {
-        id => undef,
             name => 'Test name 2',
             viewings => [ { user_id => $owner->id } ],
             owner => { id => $another_owner->id },
@@ -37,10 +35,9 @@ sub run_tests{
     is ( $new_dvd->name, 'Test name 2', 'Dvd name set' );
     is ( $new_dvd->owner->id, $another_owner->id, 'Owner set' );
     is ( $new_dvd->viewings->count, 1, 'Viewing created' );
-    
+
     # creating new records
-    my $updates = {
-        id => undef,
+    $updates = {
             aaaa => undef,
             tags => [ '2', { id => '3' } ], 
             name => 'Test name',
@@ -56,6 +53,12 @@ sub run_tests{
             like_has_many => [
             { key2 => 1 }
             ],
+            like_has_many2 => [ 
+                {
+                    onekey => { name => 'aaaaa' },
+                    key2 => 1
+                }
+            ],
     };
     
     my $dvd = $dvd_rs->recursive_update( $updates );
@@ -69,44 +72,52 @@ sub run_tests{
     is ( $dvd->current_borrower->name, 'temp name', 'Related record created' );
     is ( $dvd->liner_notes->notes, 'test note', 'might_have record created' );
     ok ( $schema->resultset( 'Twokeys' )->find( { dvd_name => 'Test name', key2 => 1 } ), 'Twokeys created' );
-    # changing existing records
-    
+    my $onekey = $schema->resultset( 'Onekey' )->search( name => 'aaaaa' )->first;
+    ok ( $onekey, 'Onekey created' );
+    ok ( $schema->resultset( 'Twokeys_belongsto' )->find( { key1 => $onekey->id, key2 => 1 } ), 'Twokeys created' );
+
+    is ( $dvd->name, 'Test name', 'Dvd name set' );
+# changing existing records
+
     my $num_of_users = $user_rs->count;
     $updates = {
-            id => $dvd->id,
+            id => $dvd->dvd_id, # id instead of dvd_id
             aaaa => undef,
-            name => 'Test name',
+            name => undef,
             tags => [ ], 
             'owner' => $another_owner->id,
             current_borrower => {
                 username => 'new name a',
                 name => 'new name a',
                 password => 'new password a',
-            }
+            },
+            liner_notes => {
+                notes => 'test note changed',
+            },
+
     };
-    $dvd = $dvd_rs->recursive_update( $updates );
-    
+    my $dvd_updated = $dvd_rs->recursive_update( $updates );
+   
+    is ( $dvd_updated->dvd_id, $dvd->dvd_id, 'Pk from "id"' );
     is ( $schema->resultset( 'User' )->count, $initial_user_count + 1, "No new user created" );
-    is ( $dvd->name, 'Test name', 'Dvd name set' );
-    is ( $dvd->owner->id, $another_owner->id, 'Owner updated' );
-    is ( $dvd->current_borrower->name, 'new name a', 'Related record modified' );
-    is ( $dvd->tags->count, 0, 'Tags deleted' );
+    is ( $dvd_updated->name, undef, 'Dvd name deleted' );
+    is ( $dvd_updated->owner->id, $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' );
+    is ( $dvd_updated->liner_notes->notes, 'test note changed', 'might_have record changed' );
 
     # repeatable
     
     $updates = {
-        id => undef,
         name  => 'temp name',
         username => 'temp username',
         password => 'temp username',
         owned_dvds =>[
         {
-            'id' => undef,
             'name' => 'temp name 1',
             'tags' => [ 1, 2 ],
         },
         {
-            'id' => undef,
             'name' => 'temp name 2',
             'tags' => [ 2, 3 ],
         }
@@ -123,4 +134,23 @@ sub run_tests{
     is( scalar @tags, 2, 'Tags in has_many related record saved' );
     ok( $owned_dvds{'temp name 2'}, 'Second name in a has_many related record saved' );
 
+    $updates = {
+        id => $user->id,
+        address => {
+            street => "101 Main Street",
+            city => "Podunk",
+            state => "New York"
+        }
+    };
+    $user = $user_rs->recursive_update( $updates );
+    $user = $user_rs->recursive_update( $updates );
+    is( $schema->resultset( 'Address' )->search({ user_id => $user->id  })->count, 1,
+            'the right number of addresses' );
+
+
+#    $updates = {
+#            name => 'Test name 1',
+#    };
+#    $dvd = $dvd_rs->search( { id => $dvd->id } )->recursive_update( $updates, [ 'id' ] );
+#    is ( $dvd->name, 'Test name 1', 'Dvd name set in a resultset with restricted id' );
 }