diff --git a/core/tests/Drupal/FunctionalTests/BrowserTestBaseTest.php b/core/tests/Drupal/FunctionalTests/BrowserTestBaseTest.php index f8fb83631aabe90a8b880b43e948ea690c48b97d..84df3399c863361db8a3354cbafaebe05d30e378 100644 --- a/core/tests/Drupal/FunctionalTests/BrowserTestBaseTest.php +++ b/core/tests/Drupal/FunctionalTests/BrowserTestBaseTest.php @@ -555,6 +555,9 @@ public function testCronRun() { public function testInstall() { $htaccess_filename = $this->tempFilesDirectory . '/.htaccess'; $this->assertFileExists($htaccess_filename); + + // Ensure the update module is not installed. + $this->assertFalse(\Drupal::moduleHandler()->moduleExists('update'), 'The Update module is not installed.'); } /** diff --git a/core/tests/Drupal/FunctionalTests/Installer/InstallerExistingConfigTestBase.php b/core/tests/Drupal/FunctionalTests/Installer/InstallerExistingConfigTestBase.php index 8a6a9308fcaad1fe3ede391d071a966b9f2b5f61..1e04685e241d778607c49c53224fd5d6158d7c5a 100644 --- a/core/tests/Drupal/FunctionalTests/Installer/InstallerExistingConfigTestBase.php +++ b/core/tests/Drupal/FunctionalTests/Installer/InstallerExistingConfigTestBase.php @@ -105,7 +105,8 @@ protected function installParameters() { // existing configuration. unset($parameters['forms']['install_configure_form']['site_name']); unset($parameters['forms']['install_configure_form']['site_mail']); - unset($parameters['forms']['install_configure_form']['update_status_module']); + unset($parameters['forms']['install_configure_form']['enable_update_status_module']); + unset($parameters['forms']['install_configure_form']['enable_update_status_emails']); return $parameters; } diff --git a/core/tests/Drupal/FunctionalTests/Installer/InstallerTest.php b/core/tests/Drupal/FunctionalTests/Installer/InstallerTest.php index 118a77124577aede34f9033925258dee1f1560d9..af85b7e7fd221a14684dd71394bf6538e88fe4f4 100644 --- a/core/tests/Drupal/FunctionalTests/Installer/InstallerTest.php +++ b/core/tests/Drupal/FunctionalTests/Installer/InstallerTest.php @@ -131,6 +131,9 @@ public function testInstalled() { $module = $database->getProvider(); $module_handler = \Drupal::service('module_handler'); + // Ensure the update module is not installed. + $this->assertFalse($module_handler->moduleExists('update'), 'The Update module is not installed.'); + // Assert that the module that is providing the database driver has been // installed. $this->assertTrue($module_handler->moduleExists($module)); diff --git a/core/tests/Drupal/FunctionalTests/Installer/InstallerTestBase.php b/core/tests/Drupal/FunctionalTests/Installer/InstallerTestBase.php index 4b6c28d40f157463454ada0a18e37abebef6533f..5bf4918d084e1103799dceaf6c6bf47f288271be 100644 --- a/core/tests/Drupal/FunctionalTests/Installer/InstallerTestBase.php +++ b/core/tests/Drupal/FunctionalTests/Installer/InstallerTestBase.php @@ -73,6 +73,19 @@ abstract class InstallerTestBase extends BrowserTestBase { */ protected $isInstalled = FALSE; + /** + * {@inheritdoc} + */ + protected function installParameters() { + $params = parent::installParameters(); + // Set the checkbox values to FALSE so that + // \Drupal\Tests\BrowserTestBase::translatePostValues() does not remove + // them. + $params['forms']['install_configure_form']['enable_update_status_module'] = FALSE; + $params['forms']['install_configure_form']['enable_update_status_emails'] = FALSE; + return $params; + } + /** * {@inheritdoc} */