Merge pull request #24109 from yashodha/reports_improvements

[civicrm-core.git] / Civi / Test / Data.php

diff --git a/Civi/Test/Data.php b/Civi/Test/Data.php
index 8cada62629b6cb198f3ad8cc6b5c6056bc29c390..87116adfeb67ac3a24b35415c8735669cd9a8983 100644 (file)
--- a/Civi/Test/Data.php
+++ b/Civi/Test/Data.php
@@ -18,7 +18,7 @@ class Data {
       \Civi\Test::schema()->setStrict(FALSE);
 
       // Ensure that when we populate the database it is done in utf8 mode
-      \Civi\Test::execute('SET NAMES utf8');
+      \Civi\Test::execute('SET NAMES utf8mb4');
       $sqlDir = dirname(dirname(__DIR__)) . "/sql";
 
       if (!isset(\Civi\Test::$statics['locale_data'])) {
@@ -42,8 +42,11 @@ class Data {
       unset($query, $query2, $query3);
 
       \Civi\Test::schema()->setStrict(TRUE);
+      \Civi::reset();
     });
 
+    civicrm_api('setting', 'create', ['installed' => 1, 'domain_id' => 'all', 'version' => 3]);
+
     // Rebuild triggers
     civicrm_api('system', 'flush', ['version' => 3, 'triggers' => 1]);