GlobalSet Element Fixture improvements

CHANGELOG-v3.md

@@ -5,6 +5,8 @@
 ### Added
 - Added the option to automatically apply all migrations in the `CRAFT_MIGRATIONS_PATH` when setting up the test environment. ([#4904](https://github.com/craftcms/cms/issues/4904))
 - The Control Panel is now translated into Persian. ([#4969)(https://github.com/craftcms/cms/pull/4969))
+- Added an option to `craft\test\fixtures\elements\GlobalSetFixture` to specify whether it should load the Active Record instance. ([#4947](https://github.com/craftcms/cms/pull/4947))
+- Added the `craft\test\fixtures\elements\ElementFixture::$unload` option to specify whether fixture data should be unloaded. 
 
 ### Changed
 - Any migrations applied during testing will now be stored in the database as content migrations. 

docs/testing/testing-craft/fixtures.md

@@ -123,6 +123,12 @@ return [
 
 The primary keys are: `handle`.
 
+::: tip
+Global set's do not get their own database row by default. 
+If you need the Global Sets to have their own database row you can set 
+the `$useActiveRecord` to true.
+:::
+
 ### `Tag fixtures`
 
 Extend `craft\test\fixtures\elements\TagFixture` to add tags. 

src/test/fixtures/elements/ElementFixture.php

@@ -37,6 +37,13 @@ abstract class ElementFixture extends ActiveFixture
      */
     protected $siteIds = [];
 
+    /**
+     * Whether the fixture data should be unloaded
+     *
+     * @var bool
+     */
+    public $unload = true;
+
     // Public Methods
     // =========================================================================
 
@@ -139,15 +146,17 @@ public function load()
      */
     public function unload()
     {
-        foreach ($this->getData() as $data) {
-            $element = $this->getElement($data);
+        if ($this->unload) {
+            foreach ($this->getData() as $data) {
+                $element = $this->getElement($data);
 
-            if ($element && !Craft::$app->getElements()->deleteElement($element, true)) {
-                throw new InvalidElementException($element, 'Unable to delete element.');
+                if ($element && !Craft::$app->getElements()->deleteElement($element, true)) {
+                    throw new InvalidElementException($element, 'Unable to delete element.');
+                }
             }
-        }
 
-        $this->data = [];
+            $this->data = [];
+        }
     }
 
     /**

src/test/fixtures/elements/GlobalSetFixture.php

@@ -37,21 +37,28 @@ abstract class GlobalSetFixture extends ElementFixture
      */
     public $tableName = Table::GLOBALSETS;
 
+    /**
+     * @var boolean
+     */
+    public $useActiveRecord = true;
+
     /**
      * @inheritdoc
      */
     public function load()
     {
         parent::load();
 
-        // TODO: layouts?
-        foreach ($this->data as $alias => $data) {
-            $record = new GlobalSetRecord();
-            $record->id = $data['id'];
-            $record->name = $data['name'];
-            $record->handle = $data['handle'];
-            $record->uid = $data['uid'];
-            $record->save();
+        if ($this->useActiveRecord) {
+            // TODO: layouts?
+            foreach ($this->data as $alias => $data) {
+                $record = new GlobalSetRecord();
+                $record->id = $data['id'];
+                $record->name = $data['name'];
+                $record->handle = $data['handle'];
+                $record->uid = $data['uid'];
+                $record->save();
+            }
         }
     }