diff --git a/core/includes/bootstrap.inc b/core/includes/bootstrap.inc index 932dd4a..19cc84a 100644 --- a/core/includes/bootstrap.inc +++ b/core/includes/bootstrap.inc @@ -537,8 +537,7 @@ function drupal_settings_initialize() { global $base_url, $base_path, $base_root, $script_path; // Export these settings.php variables to the global namespace. - global $databases, $cookie_domain, $conf, $db_prefix, $drupal_hash_salt, $base_secure_url, $base_insecure_url, $config_directories; - $conf = array(); + global $databases, $cookie_domain, $db_prefix, $drupal_hash_salt, $base_secure_url, $base_insecure_url, $config_directories, $config; $settings = array(); $config = array(); @@ -2095,7 +2094,7 @@ function drupal_valid_test_ua($new_prefix = NULL) { * The simpletest prefix. */ function _drupal_load_test_overrides($test_prefix) { - global $conf, $config_directories, $config; + global $config_directories, $config; // Do not use the parent site's config directories. Use only the child site's. // @see \Drupal\simpletest\TestBase::prepareConfigDirectories() diff --git a/core/modules/simpletest/lib/Drupal/simpletest/TestBase.php b/core/modules/simpletest/lib/Drupal/simpletest/TestBase.php index 50c04ca..46f2e20 100644 --- a/core/modules/simpletest/lib/Drupal/simpletest/TestBase.php +++ b/core/modules/simpletest/lib/Drupal/simpletest/TestBase.php @@ -1049,9 +1049,6 @@ private function prepareEnvironment() { // Change the database prefix. $this->changeDatabasePrefix(); - // Reset all variables to perform tests in a clean environment. - $conf = array(); - // Remove all configuration overrides. $GLOBALS['config'] = array(); diff --git a/core/modules/system/lib/Drupal/system/Tests/Installer/InstallerLanguageTest.php b/core/modules/system/lib/Drupal/system/Tests/Installer/InstallerLanguageTest.php index 4f720d6..93a610b 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Installer/InstallerLanguageTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Installer/InstallerLanguageTest.php @@ -23,13 +23,6 @@ public static function getInfo() { ); } - function setUp() { - // Override the installation translations directory path. - $GLOBALS['config']['locale.settings']['translation']['path'] = drupal_get_path('module', 'simpletest') . '/files/translations'; - - parent::setUp(); - } - /** * Tests that the installer can find translation files. */ @@ -43,7 +36,7 @@ function testInstallerTranslationFiles() { 'it' => array(), ); - $file_translation = new FileTranslation($GLOBALS['config']['locale.settings']['translation']['path']); + $file_translation = new FileTranslation(drupal_get_path('module', 'simpletest') . '/files/translations'); foreach ($expected_translation_files as $langcode => $files_expected) { $files_found = $file_translation->findTranslationFiles($langcode); $this->assertTrue(count($files_found) == count($files_expected), format_string('@count installer languages found.', array('@count' => count($files_expected)))); diff --git a/core/modules/system/lib/Drupal/system/Tests/Installer/InstallerTranslationTest.php b/core/modules/system/lib/Drupal/system/Tests/Installer/InstallerTranslationTest.php index d4a2f36..399cbc5 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Installer/InstallerTranslationTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Installer/InstallerTranslationTest.php @@ -83,9 +83,9 @@ protected function setUp() { $submit_value = (string) current($this->xpath('//input[@type="submit"]/@value')); $this->assertNotEqual($submit_value, 'Save and continue'); - // Submit the Minimal profile installation. + // Submit the Standard profile installation. $edit = array( - 'profile' => 'minimal', + 'profile' => 'standard', ); $this->drupalPostForm(NULL, $edit, $submit_value);