projects
/
yaffs-website
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Further Drupal 8.6.4 changes. Some core files were not committed before a commit...
[yaffs-website]
/
web
/
core
/
modules
/
system
/
tests
/
src
/
Functional
/
Module
/
InstallUninstallTest.php
diff --git
a/web/core/modules/system/tests/src/Functional/Module/InstallUninstallTest.php
b/web/core/modules/system/tests/src/Functional/Module/InstallUninstallTest.php
index 4d8f30d65c7fd582137b89778da8bbd2cd88c6e3..9ca44078012f912e095e985a7eee411f520ff0e2 100644
(file)
--- a/
web/core/modules/system/tests/src/Functional/Module/InstallUninstallTest.php
+++ b/
web/core/modules/system/tests/src/Functional/Module/InstallUninstallTest.php
@@
-4,6
+4,7
@@
namespace Drupal\Tests\system\Functional\Module;
use Drupal\Component\Render\FormattableMarkup;
use Drupal\Core\Logger\RfcLogLevel;
use Drupal\Component\Render\FormattableMarkup;
use Drupal\Core\Logger\RfcLogLevel;
+use Drupal\workspaces\Entity\Workspace;
/**
* Install/uninstall core module and confirm table creation/deletion.
/**
* Install/uninstall core module and confirm table creation/deletion.
@@
-22,7
+23,8
@@
class InstallUninstallTest extends ModuleTestBase {
*/
public function testInstallUninstall() {
// Set a variable so that the hook implementations in system_test.module
*/
public function testInstallUninstall() {
// Set a variable so that the hook implementations in system_test.module
- // will display messages via drupal_set_message().
+ // will display messages via
+ // \Drupal\Core\Messenger\MessengerInterface::addStatus().
$this->container->get('state')->set('system_test.verbose_module_hooks', TRUE);
// Install and uninstall module_test to ensure hook_preinstall_module and
$this->container->get('state')->set('system_test.verbose_module_hooks', TRUE);
// Install and uninstall module_test to ensure hook_preinstall_module and
@@
-147,6
+149,12
@@
class InstallUninstallTest extends ModuleTestBase {
$this->preUninstallForum();
}
$this->preUninstallForum();
}
+ // Delete all workspaces before uninstall.
+ if ($name == 'workspaces') {
+ $workspaces = Workspace::loadMultiple();
+ \Drupal::entityTypeManager()->getStorage('workspace')->delete($workspaces);
+ }
+
$now_installed_list = \Drupal::moduleHandler()->getModuleList();
$added_modules = array_diff(array_keys($now_installed_list), array_keys($was_installed_list));
while ($added_modules) {
$now_installed_list = \Drupal::moduleHandler()->getModuleList();
$added_modules = array_diff(array_keys($now_installed_list), array_keys($was_installed_list));
while ($added_modules) {