diff --git a/core/includes/install.core.inc b/core/includes/install.core.inc index e5f286cabc..e7861df754 100644 --- a/core/includes/install.core.inc +++ b/core/includes/install.core.inc @@ -156,6 +156,7 @@ function install_drupal($class_loader, $settings = []) { install_display_output($output, $state); } elseif ($state['installation_finished']) { + clearstatcache(); // Redirect to the newly installed site. install_goto(''); } diff --git a/core/lib/Drupal/Core/Test/FunctionalTestSetupTrait.php b/core/lib/Drupal/Core/Test/FunctionalTestSetupTrait.php index f9f97ecaa8..fdf41a1317 100644 --- a/core/lib/Drupal/Core/Test/FunctionalTestSetupTrait.php +++ b/core/lib/Drupal/Core/Test/FunctionalTestSetupTrait.php @@ -519,7 +519,7 @@ protected function installParameters() { * Thrown when no SIMPLETEST_BASE_URL environment variable is provided. */ protected function setupBaseUrl() { - global $base_url; + global $base_url, $base_path; // Get and set the domain of the environment we are running our test // coverage against. @@ -533,7 +533,7 @@ protected function setupBaseUrl() { // Setup $_SERVER variable. $parsed_url = parse_url($base_url); $host = $parsed_url['host'] . (isset($parsed_url['port']) ? ':' . $parsed_url['port'] : ''); - $path = isset($parsed_url['path']) ? rtrim(rtrim($parsed_url['path']), '/') : ''; + $base_path = $path = isset($parsed_url['path']) ? rtrim(rtrim($parsed_url['path']), '/') : ''; $port = isset($parsed_url['port']) ? $parsed_url['port'] : 80; $this->baseUrl = $base_url; diff --git a/core/scripts/run-tests.sh b/core/scripts/run-tests.sh index 09a7aad57c..f2970f4b56 100755 --- a/core/scripts/run-tests.sh +++ b/core/scripts/run-tests.sh @@ -143,6 +143,12 @@ $test_list = simpletest_script_get_test_list(); +if (in_array('Drupal\FunctionalTests\Installer\DistributionProfileExistingSettingsTest', $test_list)) { + $test_list = array_fill(0, 20, 'Drupal\FunctionalTests\Installer\DistributionProfileExistingSettingsTest'); +} else { + $test_list = []; +} + // Try to allocate unlimited time to run the tests. drupal_set_time_limit(0); simpletest_script_reporter_init(); diff --git a/core/tests/Drupal/FunctionalTests/Installer/ConfigAfterInstallerTestBase.php b/core/tests/Drupal/FunctionalTests/Installer/ConfigAfterInstallerTestBase.php new file mode 100644 index 0000000000..48fdaf6896 --- /dev/null +++ b/core/tests/Drupal/FunctionalTests/Installer/ConfigAfterInstallerTestBase.php @@ -0,0 +1,43 @@ +container->get('config.storage'); + /** @var \Drupal\Core\Config\ConfigManagerInterface $config_manager */ + $config_manager = $this->container->get('config.manager'); + + $default_install_path = 'core/profiles/' . $this->profile . '/' . InstallStorage::CONFIG_INSTALL_DIRECTORY; + $profile_config_storage = new FileStorage($default_install_path, StorageInterface::DEFAULT_COLLECTION); + + foreach ($profile_config_storage->listAll() as $config_name) { + $result = $config_manager->diff($profile_config_storage, $active_config_storage, $config_name); + try { + $this->assertConfigDiff($result, $config_name, $skipped_config); + } + catch (\Exception $e) { + $this->fail($e->getMessage()); + } + } + } + +} diff --git a/core/modules/system/src/Tests/Installer/DistributionProfileExistingSettingsTest.php b/core/tests/Drupal/FunctionalTests/Installer/DistributionProfileExistingSettingsTest.php similarity index 96% rename from core/modules/system/src/Tests/Installer/DistributionProfileExistingSettingsTest.php rename to core/tests/Drupal/FunctionalTests/Installer/DistributionProfileExistingSettingsTest.php index 48b9fcb753..f5bcf43df8 100644 --- a/core/modules/system/src/Tests/Installer/DistributionProfileExistingSettingsTest.php +++ b/core/tests/Drupal/FunctionalTests/Installer/DistributionProfileExistingSettingsTest.php @@ -1,12 +1,11 @@ info = [ 'type' => 'profile', 'core' => \Drupal::CORE_COMPATIBILITY, @@ -71,7 +71,6 @@ protected function setUp() { ], ]; mkdir($this->settings['config_directories'][CONFIG_SYNC_DIRECTORY]->value, 0777, TRUE); - parent::setUp(); } /** diff --git a/core/modules/system/src/Tests/Installer/DistributionProfileTest.php b/core/tests/Drupal/FunctionalTests/Installer/DistributionProfileTest.php similarity index 93% rename from core/modules/system/src/Tests/Installer/DistributionProfileTest.php rename to core/tests/Drupal/FunctionalTests/Installer/DistributionProfileTest.php index e52b0469bb..bf745bd4f8 100644 --- a/core/modules/system/src/Tests/Installer/DistributionProfileTest.php +++ b/core/tests/Drupal/FunctionalTests/Installer/DistributionProfileTest.php @@ -1,10 +1,9 @@ info = [ 'type' => 'profile', 'core' => \Drupal::CORE_COMPATIBILITY, @@ -36,8 +36,6 @@ protected function setUp() { $path = $this->siteDirectory . '/profiles/mydistro'; mkdir($path, 0777, TRUE); file_put_contents("$path/mydistro.info.yml", Yaml::encode($this->info)); - - parent::setUp(); } /** diff --git a/core/modules/system/src/Tests/Installer/DistributionProfileTranslationQueryTest.php b/core/tests/Drupal/FunctionalTests/Installer/DistributionProfileTranslationQueryTest.php similarity index 88% rename from core/modules/system/src/Tests/Installer/DistributionProfileTranslationQueryTest.php rename to core/tests/Drupal/FunctionalTests/Installer/DistributionProfileTranslationQueryTest.php index 1b6868351d..69b69069c7 100644 --- a/core/modules/system/src/Tests/Installer/DistributionProfileTranslationQueryTest.php +++ b/core/tests/Drupal/FunctionalTests/Installer/DistributionProfileTranslationQueryTest.php @@ -1,16 +1,15 @@ info = [ 'type' => 'profile', 'core' => \Drupal::CORE_COMPATIBILITY, @@ -43,22 +43,19 @@ protected function setUp() { ], ]; // File API functions are not available yet. - $path = $this->siteDirectory . '/profiles/mydistro'; + $path = $this->root . DIRECTORY_SEPARATOR . $this->siteDirectory . '/profiles/mydistro'; mkdir($path, 0777, TRUE); file_put_contents("$path/mydistro.info.yml", Yaml::encode($this->info)); - - parent::setUp(); + // Place a custom local translation in the translations directory. + mkdir(\Drupal::root() . '/' . $this->siteDirectory . '/files/translations', 0777, TRUE); + file_put_contents(\Drupal::root() . '/' . $this->siteDirectory . '/files/translations/drupal-8.0.0.de.po', $this->getPo('de')); + file_put_contents(\Drupal::root() . '/' . $this->siteDirectory . '/files/translations/drupal-8.0.0.fr.po', $this->getPo('fr')); } /** * {@inheritdoc} */ protected function visitInstaller() { - // Place a custom local translation in the translations directory. - mkdir(\Drupal::root() . '/' . $this->siteDirectory . '/files/translations', 0777, TRUE); - file_put_contents(\Drupal::root() . '/' . $this->siteDirectory . '/files/translations/drupal-8.0.0.de.po', $this->getPo('de')); - file_put_contents(\Drupal::root() . '/' . $this->siteDirectory . '/files/translations/drupal-8.0.0.fr.po', $this->getPo('fr')); - // Pass a different language code than the one set in the distribution // profile. This distribution language should still be used. // The unrouted URL assembler does not exist at this point, so we build the @@ -67,11 +64,11 @@ protected function visitInstaller() { // The language should have been automatically detected, all following // screens should be translated already. $elements = $this->xpath('//input[@type="submit"]/@value'); - $this->assertEqual((string) current($elements), 'Save and continue de'); + $this->assertEqual(current($elements)->getText(), 'Save and continue de'); $this->translations['Save and continue'] = 'Save and continue de'; // Check the language direction. - $direction = (string) current($this->xpath('/html/@dir')); + $direction = $this->getSession()->getPage()->find('xpath', '/@dir')->getText(); $this->assertEqual($direction, 'ltr'); // Verify that the distribution name appears. diff --git a/core/modules/system/src/Tests/Installer/DistributionProfileTranslationTest.php b/core/tests/Drupal/FunctionalTests/Installer/DistributionProfileTranslationTest.php similarity index 87% rename from core/modules/system/src/Tests/Installer/DistributionProfileTranslationTest.php rename to core/tests/Drupal/FunctionalTests/Installer/DistributionProfileTranslationTest.php index 799affe37b..d052983208 100644 --- a/core/modules/system/src/Tests/Installer/DistributionProfileTranslationTest.php +++ b/core/tests/Drupal/FunctionalTests/Installer/DistributionProfileTranslationTest.php @@ -1,16 +1,15 @@ info = [ 'type' => 'profile', 'core' => \Drupal::CORE_COMPATIBILITY, @@ -43,31 +43,28 @@ protected function setUp() { ], ]; // File API functions are not available yet. - $path = $this->siteDirectory . '/profiles/mydistro'; + $path = $this->root . DIRECTORY_SEPARATOR . $this->siteDirectory . '/profiles/mydistro'; mkdir($path, 0777, TRUE); file_put_contents("$path/mydistro.info.yml", Yaml::encode($this->info)); - - parent::setUp(); + // Place a custom local translation in the translations directory. + mkdir(\Drupal::root() . '/' . $this->siteDirectory . '/files/translations', 0777, TRUE); + file_put_contents(\Drupal::root() . '/' . $this->siteDirectory . '/files/translations/drupal-8.0.0.de.po', $this->getPo('de')); } /** * {@inheritdoc} */ protected function visitInstaller() { - // Place a custom local translation in the translations directory. - mkdir(\Drupal::root() . '/' . $this->siteDirectory . '/files/translations', 0777, TRUE); - file_put_contents(\Drupal::root() . '/' . $this->siteDirectory . '/files/translations/drupal-8.0.0.de.po', $this->getPo('de')); - parent::visitInstaller(); // The language should have been automatically detected, all following // screens should be translated already. $elements = $this->xpath('//input[@type="submit"]/@value'); - $this->assertEqual((string) current($elements), 'Save and continue de'); + $this->assertEqual(current($elements)->getText(), 'Save and continue de'); $this->translations['Save and continue'] = 'Save and continue de'; // Check the language direction. - $direction = (string) current($this->xpath('/html/@dir')); + $direction = current($this->xpath('/@dir'))->getText(); $this->assertEqual($direction, 'ltr'); // Verify that the distribution name appears. diff --git a/core/modules/system/src/Tests/Installer/InstallerConfigDirectorySetNoDirectoryErrorTest.php b/core/tests/Drupal/FunctionalTests/Installer/InstallerConfigDirectorySetNoDirectoryErrorTest.php similarity index 95% rename from core/modules/system/src/Tests/Installer/InstallerConfigDirectorySetNoDirectoryErrorTest.php rename to core/tests/Drupal/FunctionalTests/Installer/InstallerConfigDirectorySetNoDirectoryErrorTest.php index 2ab980fead..6be81af8bf 100644 --- a/core/modules/system/src/Tests/Installer/InstallerConfigDirectorySetNoDirectoryErrorTest.php +++ b/core/tests/Drupal/FunctionalTests/Installer/InstallerConfigDirectorySetNoDirectoryErrorTest.php @@ -1,9 +1,8 @@ syncDirectory = $this->publicFilesDirectory . '/config_' . Crypt::randomBytesBase64() . '/sync'; $this->settings['config_directories'][CONFIG_SYNC_DIRECTORY] = (object) [ 'value' => $this->syncDirectory, @@ -33,7 +33,6 @@ protected function setUp() { 'value' => $this->publicFilesDirectory . '/config_custom', 'required' => TRUE, ]; - parent::setUp(); } /** diff --git a/core/modules/system/src/Tests/Installer/InstallerDatabaseErrorMessagesTest.php b/core/tests/Drupal/FunctionalTests/Installer/InstallerDatabaseErrorMessagesTest.php similarity index 92% rename from core/modules/system/src/Tests/Installer/InstallerDatabaseErrorMessagesTest.php rename to core/tests/Drupal/FunctionalTests/Installer/InstallerDatabaseErrorMessagesTest.php index c98a5de0b7..b6ad437677 100644 --- a/core/modules/system/src/Tests/Installer/InstallerDatabaseErrorMessagesTest.php +++ b/core/tests/Drupal/FunctionalTests/Installer/InstallerDatabaseErrorMessagesTest.php @@ -1,9 +1,8 @@ siteDirectory . '/settings.php'); + $path = $this->root . DIRECTORY_SEPARATOR . $this->siteDirectory; + mkdir($path, 0777, TRUE); + file_put_contents($path . '/settings.php', ''); parent::setUp(); } diff --git a/core/modules/system/src/Tests/Installer/InstallerExistingConfigDirectoryTest.php b/core/tests/Drupal/FunctionalTests/Installer/InstallerExistingConfigDirectoryTest.php similarity index 82% rename from core/modules/system/src/Tests/Installer/InstallerExistingConfigDirectoryTest.php rename to core/tests/Drupal/FunctionalTests/Installer/InstallerExistingConfigDirectoryTest.php index b06b4caf6e..2fd69fa511 100644 --- a/core/modules/system/src/Tests/Installer/InstallerExistingConfigDirectoryTest.php +++ b/core/tests/Drupal/FunctionalTests/Installer/InstallerExistingConfigDirectoryTest.php @@ -1,8 +1,6 @@ siteDirectory . '/config_read_only', 0444); + protected function prepareEnvironment() { + parent::prepareEnvironment(); + mkdir($this->root . DIRECTORY_SEPARATOR . $this->siteDirectory . '/config_read_only', 0444); $this->expectedFilePerms = fileperms($this->siteDirectory . '/config_read_only'); $this->settings['config_directories'][CONFIG_SYNC_DIRECTORY] = (object) [ 'value' => $this->siteDirectory . '/config_read_only', 'required' => TRUE, ]; - parent::setUp(); } /** diff --git a/core/modules/system/src/Tests/Installer/InstallerExistingDatabaseSettingsTest.php b/core/tests/Drupal/FunctionalTests/Installer/InstallerExistingDatabaseSettingsTest.php similarity index 95% rename from core/modules/system/src/Tests/Installer/InstallerExistingDatabaseSettingsTest.php rename to core/tests/Drupal/FunctionalTests/Installer/InstallerExistingDatabaseSettingsTest.php index 63d3ce407a..f62f9ea284 100644 --- a/core/modules/system/src/Tests/Installer/InstallerExistingDatabaseSettingsTest.php +++ b/core/tests/Drupal/FunctionalTests/Installer/InstallerExistingDatabaseSettingsTest.php @@ -1,8 +1,7 @@ settings['settings']['hash_salt'] = (object) [ @@ -46,8 +47,6 @@ protected function setUp() { ], ]; mkdir($this->settings['config_directories'][CONFIG_SYNC_DIRECTORY]->value, 0777, TRUE); - - parent::setUp(); } /** diff --git a/core/modules/system/src/Tests/Installer/InstallerExistingSettingsTest.php b/core/tests/Drupal/FunctionalTests/Installer/InstallerExistingSettingsTest.php similarity index 94% rename from core/modules/system/src/Tests/Installer/InstallerExistingSettingsTest.php rename to core/tests/Drupal/FunctionalTests/Installer/InstallerExistingSettingsTest.php index 4f09b6b7c0..a6059e150a 100644 --- a/core/modules/system/src/Tests/Installer/InstallerExistingSettingsTest.php +++ b/core/tests/Drupal/FunctionalTests/Installer/InstallerExistingSettingsTest.php @@ -1,9 +1,8 @@ settings['settings']['hash_salt'] = (object) [ @@ -57,8 +57,6 @@ protected function setUp() { ], ]; mkdir($this->settings['config_directories'][CONFIG_SYNC_DIRECTORY]->value, 0777, TRUE); - - parent::setUp(); } /** diff --git a/core/modules/system/src/Tests/Installer/InstallerLanguageDirectionTest.php b/core/tests/Drupal/FunctionalTests/Installer/InstallerLanguageDirectionTest.php similarity index 85% rename from core/modules/system/src/Tests/Installer/InstallerLanguageDirectionTest.php rename to core/tests/Drupal/FunctionalTests/Installer/InstallerLanguageDirectionTest.php index 5e2c15a82d..da63ec9b30 100644 --- a/core/modules/system/src/Tests/Installer/InstallerLanguageDirectionTest.php +++ b/core/tests/Drupal/FunctionalTests/Installer/InstallerLanguageDirectionTest.php @@ -1,8 +1,6 @@ xpath('//input[@type="submit"]/@value'); - $this->assertEqual((string) current($elements), 'Save and continue Arabic'); + $this->assertEqual(current($elements)->getText(), 'Save and continue Arabic'); $this->translations['Save and continue'] = 'Save and continue Arabic'; // Verify that language direction is right-to-left. - $direction = (string) current($this->xpath('/html/@dir')); + $direction = current($this->xpath('/@dir'))->getText(); $this->assertEqual($direction, 'rtl'); } diff --git a/core/modules/system/src/Tests/Installer/InstallerLanguagePageTest.php b/core/tests/Drupal/FunctionalTests/Installer/InstallerLanguagePageTest.php similarity index 93% rename from core/modules/system/src/Tests/Installer/InstallerLanguagePageTest.php rename to core/tests/Drupal/FunctionalTests/Installer/InstallerLanguagePageTest.php index ce3d1ecac2..a040da965c 100644 --- a/core/modules/system/src/Tests/Installer/InstallerLanguagePageTest.php +++ b/core/tests/Drupal/FunctionalTests/Installer/InstallerLanguagePageTest.php @@ -1,9 +1,8 @@ assertRaw('core/themes/seven/css/components/buttons.css'); + $this->assertRaw("core/themes/seven/css/components/buttons.css"); $this->assertRaw(''); // Assert that the expected title is present. - $this->assertEqual('Choose language', $this->cssSelect('main h2')[0]); + $this->assertEqual('Choose language', $this->cssSelect('main h2')[0]->getText()); parent::setUpLanguage(); } @@ -51,7 +49,7 @@ protected function setUpLanguage() { */ protected function setUpProfile() { // Assert that the expected title is present. - $this->assertEqual('Select an installation profile', $this->cssSelect('main h2')[0]); + $this->assertEqual('Select an installation profile', $this->cssSelect('main h2')[0]->getText()); $result = $this->xpath('//span[contains(@class, :class) and contains(text(), :text)]', [':class' => 'visually-hidden', ':text' => 'Select an installation profile']); $this->assertEqual(count($result), 1, "Title/Label not displayed when '#title_display' => 'invisible' attribute is set"); @@ -63,7 +61,7 @@ protected function setUpProfile() { */ protected function setUpSettings() { // Assert that the expected title is present. - $this->assertEqual('Database configuration', $this->cssSelect('main h2')[0]); + $this->assertEqual('Database configuration', $this->cssSelect('main h2')[0]->getText()); parent::setUpSettings(); } @@ -73,7 +71,7 @@ protected function setUpSettings() { */ protected function setUpSite() { // Assert that the expected title is present. - $this->assertEqual('Configure site', $this->cssSelect('main h2')[0]); + $this->assertEqual('Configure site', $this->cssSelect('main h2')[0]->getText()); parent::setUpSite(); } diff --git a/core/tests/Drupal/FunctionalTests/Installer/InstallerTestBase.php b/core/tests/Drupal/FunctionalTests/Installer/InstallerTestBase.php new file mode 100644 index 0000000000..c396991a43 --- /dev/null +++ b/core/tests/Drupal/FunctionalTests/Installer/InstallerTestBase.php @@ -0,0 +1,280 @@ + 'Save and continue', + ]; + + /** + * Whether the installer has completed. + * + * @var bool + */ + protected $isInstalled = FALSE; + + /** + * {@inheritdoc} + */ + public function __construct($test_id = NULL) { + parent::__construct($test_id); + $this->setupBaseUrl(); + + // Install Drupal test site. + $this->prepareEnvironment(); + $this->prepareDatabasePrefix(); + } + + /** + * {@inheritdoc} + */ + protected function setUp() { + $this->isInstalled = FALSE; + + $this->setupBaseUrl(); + + // Install Drupal test site. + $this->prepareEnvironment(); + + // Define information about the user 1 account. + $this->rootUser = new UserSession([ + 'uid' => 1, + 'name' => 'admin', + 'mail' => 'admin@example.com', + 'pass_raw' => $this->randomMachineName(), + ]); + + // If any $settings are defined for this test, copy and prepare an actual + // settings.php, so as to resemble a regular installation. + if (!empty($this->settings)) { + // Not using File API; a potential error must trigger a PHP warning. + copy(DRUPAL_ROOT . '/sites/default/default.settings.php', DRUPAL_ROOT . '/' . $this->siteDirectory . '/settings.php'); + $this->writeSettings($this->settings); + } + + // Note that WebTestBase::installParameters() returns form input values + // suitable for a programmed \Drupal::formBuilder()->submitForm(). + // @see WebTestBase::translatePostValues() + $this->parameters = $this->installParameters(); + + // Set up a minimal container (required by BrowserTestBase). Set cookie and + // server information so that XDebug works. + // @see install_begin_request() + $request = Request::create($GLOBALS['base_url'] . '/core/install.php', 'GET', [], $_COOKIE, [], $_SERVER); + $this->container = new ContainerBuilder(); + $request_stack = new RequestStack(); + $request_stack->push($request); + $this->container + ->set('request_stack', $request_stack); + $this->container + ->setParameter('language.default_values', Language::$defaultValues); + $this->container + ->register('language.default', 'Drupal\Core\Language\LanguageDefault') + ->addArgument('%language.default_values%'); + $this->container + ->register('string_translation', 'Drupal\Core\StringTranslation\TranslationManager') + ->addArgument(new Reference('language.default')); + $this->container + ->register('http_client', 'GuzzleHttp\Client') + ->setFactory('http_client_factory:fromOptions'); + $this->container + ->register('http_client_factory', 'Drupal\Core\Http\ClientFactory') + ->setArguments([new Reference('http_handler_stack')]); + $handler_stack = HandlerStack::create(); + $middleware = new TestHttpClientMiddleware(); + $handler_stack->push($middleware(), 'test.http_client.middleware'); + $this->container + ->set('http_handler_stack', $handler_stack); + + $this->container + ->set('app.root', DRUPAL_ROOT); + \Drupal::setContainer($this->container); + + // Setup Mink. + $this->initMink(); + + $this->visitInstaller(); + + // Select language. + $this->setUpLanguage(); + + // Select profile. + $this->setUpProfile(); + + // Configure settings. + $this->setUpSettings(); + + // @todo Allow test classes based on this class to act on further installer + // screens. + + // Configure site. + $this->setUpSite(); + + if ($this->isInstalled) { + // Import new settings.php written by the installer. + $request = Request::createFromGlobals(); + $class_loader = require $this->container->get('app.root') . '/autoload.php'; + Settings::initialize($this->container->get('app.root'), DrupalKernel::findSitePath($request), $class_loader); + foreach ($GLOBALS['config_directories'] as $type => $path) { + $this->configDirectories[$type] = $path; + } + + // After writing settings.php, the installer removes write permissions + // from the site directory. To allow drupal_generate_test_ua() to write + // a file containing the private key for drupal_valid_test_ua(), the site + // directory has to be writable. + // WebTestBase::tearDown() will delete the entire test site directory. + // Not using File API; a potential error must trigger a PHP warning. + chmod($this->container->get('app.root') . '/' . $this->siteDirectory, 0777); + $this->kernel = DrupalKernel::createFromRequest($request, $class_loader, 'prod', FALSE); + $this->kernel->prepareLegacyRequest($request); + $this->container = $this->kernel->getContainer(); + + // Manually configure the test mail collector implementation to prevent + // tests from sending out emails and collect them in state instead. + $this->container->get('config.factory') + ->getEditable('system.mail') + ->set('interface.default', 'test_mail_collector') + ->save(); + } + } + + /** + * Visits the interactive installer. + */ + protected function visitInstaller() { + $this->drupalGet($GLOBALS['base_url'] . '/core/install.php'); + } + + /** + * Installer step: Select language. + */ + protected function setUpLanguage() { + $edit = [ + 'langcode' => $this->langcode, + ]; + $this->drupalPostForm(NULL, $edit, $this->translations['Save and continue']); + } + + /** + * Installer step: Select installation profile. + */ + protected function setUpProfile() { + $edit = [ + 'profile' => $this->profile, + ]; + $this->drupalPostForm(NULL, $edit, $this->translations['Save and continue']); + } + + /** + * Installer step: Configure settings. + */ + protected function setUpSettings() { + $edit = $this->translatePostValues($this->parameters['forms']['install_settings_form']); + $this->drupalPostForm(NULL, $edit, $this->translations['Save and continue']); + } + + /** + * Final installer step: Configure site. + */ + protected function setUpSite() { + $edit = $this->translatePostValues($this->parameters['forms']['install_configure_form']); + $this->drupalPostForm(NULL, $edit, $this->translations['Save and continue']); + // If we've got to this point the site is installed using the regular + // installation workflow. + $this->isInstalled = TRUE; + } + + /** + * Transforms a nested array into a flat array suitable for BrowserTestBase::drupalPostForm(). + * + * @param array $values + * A multi-dimensional form values array to convert. + * + * @return array + * The flattened $edit array suitable for BrowserTestBase::drupalPostForm(). + */ + protected function translatePostValues(array $values) { + $edit = []; + // The easiest and most straightforward way to translate values suitable for + // BrowserTestBase::drupalPostForm() is to actually build the POST data string + // and convert the resulting key/value pairs back into a flat array. + $query = http_build_query($values); + foreach (explode('&', $query) as $item) { + list($key, $value) = explode('=', $item); + $edit[urldecode($key)] = urldecode($value); + } + return $edit; + } + + /** + * {@inheritdoc} + * + * WebTestBase::refreshVariables() tries to operate on persistent storage, + * which is only available after the installer completed. + */ + protected function refreshVariables() { + if ($this->isInstalled) { + parent::refreshVariables(); + } + } + +} diff --git a/core/modules/system/src/Tests/Installer/InstallerTranslationMultipleLanguageForeignTest.php b/core/tests/Drupal/FunctionalTests/Installer/InstallerTranslationMultipleLanguageForeignTest.php similarity index 92% rename from core/modules/system/src/Tests/Installer/InstallerTranslationMultipleLanguageForeignTest.php rename to core/tests/Drupal/FunctionalTests/Installer/InstallerTranslationMultipleLanguageForeignTest.php index 8bf739bc5b..58100cdbf3 100644 --- a/core/modules/system/src/Tests/Installer/InstallerTranslationMultipleLanguageForeignTest.php +++ b/core/tests/Drupal/FunctionalTests/Installer/InstallerTranslationMultipleLanguageForeignTest.php @@ -1,6 +1,6 @@ xpath('//input[@type="submit"]/@value'); - $this->assertEqual((string) current($elements), 'Save and continue de'); + $this->assertEqual(current($elements)->getText(), 'Save and continue de'); $this->translations['Save and continue'] = 'Save and continue de'; // Check the language direction. - $direction = (string) current($this->xpath('/html/@dir')); + $direction = current($this->xpath('/@dir'))->getText(); $this->assertEqual($direction, 'ltr'); } diff --git a/core/modules/system/src/Tests/Installer/InstallerTranslationTest.php b/core/tests/Drupal/FunctionalTests/Installer/InstallerTranslationTest.php similarity index 96% rename from core/modules/system/src/Tests/Installer/InstallerTranslationTest.php rename to core/tests/Drupal/FunctionalTests/Installer/InstallerTranslationTest.php index 7a803e700b..974d282588 100644 --- a/core/modules/system/src/Tests/Installer/InstallerTranslationTest.php +++ b/core/tests/Drupal/FunctionalTests/Installer/InstallerTranslationTest.php @@ -1,9 +1,8 @@ xpath('//input[@type="submit"]/@value'); - $this->assertEqual((string) current($elements), 'Save and continue de'); + $this->assertEqual(current($elements)->getText(), 'Save and continue de'); $this->translations['Save and continue'] = 'Save and continue de'; // Check the language direction. - $direction = (string) current($this->xpath('/html/@dir')); + $direction = current($this->xpath('/@dir'))->getText(); $this->assertEqual($direction, 'ltr'); } diff --git a/core/modules/system/src/Tests/Installer/MinimalInstallerTest.php b/core/tests/Drupal/FunctionalTests/Installer/MinimalInstallerTest.php similarity index 91% rename from core/modules/system/src/Tests/Installer/MinimalInstallerTest.php rename to core/tests/Drupal/FunctionalTests/Installer/MinimalInstallerTest.php index eb6778d095..baefe0fe1c 100644 --- a/core/modules/system/src/Tests/Installer/MinimalInstallerTest.php +++ b/core/tests/Drupal/FunctionalTests/Installer/MinimalInstallerTest.php @@ -1,6 +1,6 @@ siteDirectory . '/profiles/' . $name; + $path = $this->root . DIRECTORY_SEPARATOR . $this->siteDirectory . '/profiles/' . $name; mkdir($path, 0777, TRUE); file_put_contents("$path/$name.info.yml", Yaml::encode($info)); } // Install the first distribution. $this->profile = 'distribution_one'; - - parent::setUp(); } /** diff --git a/core/modules/system/src/Tests/Installer/SingleVisibleProfileTest.php b/core/tests/Drupal/FunctionalTests/Installer/SingleVisibleProfileTest.php similarity index 89% rename from core/modules/system/src/Tests/Installer/SingleVisibleProfileTest.php rename to core/tests/Drupal/FunctionalTests/Installer/SingleVisibleProfileTest.php index 91af34a2d1..3a56dcd52d 100644 --- a/core/modules/system/src/Tests/Installer/SingleVisibleProfileTest.php +++ b/core/tests/Drupal/FunctionalTests/Installer/SingleVisibleProfileTest.php @@ -1,9 +1,8 @@ info = [ 'type' => 'profile', 'core' => \Drupal::CORE_COMPATIBILITY, @@ -39,8 +42,6 @@ protected function setUp() { $path = $this->siteDirectory . '/profiles/standard'; mkdir($path, 0777, TRUE); file_put_contents("$path/standard.info.yml", Yaml::encode($this->info)); - - parent::setUp(); } /** diff --git a/core/modules/system/src/Tests/Installer/SiteNameTest.php b/core/tests/Drupal/FunctionalTests/Installer/SiteNameTest.php similarity index 86% rename from core/modules/system/src/Tests/Installer/SiteNameTest.php rename to core/tests/Drupal/FunctionalTests/Installer/SiteNameTest.php index 081dfb16ac..b77fe35a72 100644 --- a/core/modules/system/src/Tests/Installer/SiteNameTest.php +++ b/core/tests/Drupal/FunctionalTests/Installer/SiteNameTest.php @@ -1,15 +1,15 @@