Write tests for octobercms#2258

Prevent nulling when model fails validation
jimcottrell · Jul 30, 2016 · fdcfe80 · fdcfe80
1 parent b6ecc65
commit fdcfe80
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/modules/backend/behaviors/RelationController.php b/modules/backend/behaviors/RelationController.php
@@ -1315,7 +1315,7 @@ protected function evalToolbarButtons()
             case 'belongsToMany':
                 return ['create', 'add', 'delete', 'remove'];
             case 'morphMany':
-                return ['create', 'delete'];                
+                return ['create', 'delete'];
             case 'hasOne':
             case 'morphOne':
             case 'belongsTo':

diff --git a/tests/unit/plugins/database/BelongsToManyModelTest.php b/tests/unit/plugins/database/BelongsToManyModelTest.php
@@ -51,6 +51,13 @@ public function testSetRelationValue()
         $author->roles = null;
         $this->assertEquals(0, $author->roles->count());
 
+        // Extra nullify checks (still exists in DB until saved)
+        $author->reloadRelations('roles');
+        $this->assertEquals(2, $author->roles->count());
+        $author->save();
+        $author->reloadRelations('roles');
+        $this->assertEquals(0, $author->roles->count());
+
         // Deferred in memory
         $author->roles = [$role2->id, $role3->id];
         $this->assertEquals(2, $author->roles->count());