From f47d739aacdd2524efc5fdb3e0c6c7adaa6cc16f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20Klabbers?= <daniel@klabbers.email>
Date: Tue, 18 Jun 2019 17:45:29 +0200
Subject: [PATCH] Using a different setting key now, so that it won't break
 tests whenever you re-run them once smtp is set. Fixed, badly, the test to
 create users etc caused by the prepareDatabase flushing all settings by
 default.

---
 .../testing/tests/integration/TestCase.php     | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/php-packages/testing/tests/integration/TestCase.php b/php-packages/testing/tests/integration/TestCase.php
index 9fa641df0..e705a8967 100644
--- a/php-packages/testing/tests/integration/TestCase.php
+++ b/php-packages/testing/tests/integration/TestCase.php
@@ -82,12 +82,26 @@ abstract class TestCase extends \PHPUnit\Framework\TestCase
 
         // First, truncate all referenced tables so that they are empty.
         foreach (array_keys($tableData) as $table) {
-            $this->database()->table($table)->truncate();
+            if ($table !== 'settings') {
+                $this->database()->table($table)->truncate();
+            }
         }
 
         // Then, insert all rows required for this test case.
         foreach ($tableData as $table => $rows) {
-            $this->database()->table($table)->insert($rows);
+            foreach ($rows as $row) {
+                if ($table === 'settings') {
+                    $this->database()->table($table)->updateOrInsert(
+                        ['key' => $row['key']],
+                        $row
+                    );
+                } else {
+                    $this->database()->table($table)->updateOrInsert(
+                        isset($row['id']) ? ['id' => $row['id']] : $row,
+                        $row
+                    );
+                }
+            }
         }
 
         // And finally, turn on foreign key checks again.