opdavies/drupalcampbristol
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update to drupal-org-drupal 8.0.0-rc2. For more information, see https://www.drupal.org/node/2598668

Browse source
This commit is contained in:
Pantheon Automation 2015-10-21 21:44:50 -07:00 • committed by Greg Anderson
parent f32e58e4b1
commit 8e18df8c36
3062 changed files with 15044 additions and 172506 deletions
Download patch file Download diff file Expand all files Collapse all files

32
core/modules/simpletest/src/WebTestBase.php
View file

@ -680,14 +680,11 @@ abstract class WebTestBase extends TestBase {
// Initialize user 1 and session name.
$this->initUserSession();
// Get parameters for install_drupal() before removing global variables.
$parameters = $this->installParameters();
// Prepare the child site settings.
$this->prepareSettings();
// Execute the non-interactive installer.
$this->doInstall($parameters);
$this->doInstall();
// Import new settings.php written by the installer.
$this->initSettings();
@ -711,12 +708,9 @@ abstract class WebTestBase extends TestBase {
/**
* Execute the non-interactive installer.
*
* @param array $parameters
* Parameters to pass to install_drupal().
*
* @see install_drupal()
*/
protected function doInstall(array $parameters = []) {
protected function doInstall() {
require_once DRUPAL_ROOT . '/core/includes/install.core.inc';
install_drupal($this->classLoader, $this->installParameters());
}
@ -785,7 +779,7 @@ abstract class WebTestBase extends TestBase {
$services = $yaml->parse($content);
$services['services']['simpletest.config_schema_checker'] = [
'class' => 'Drupal\Core\Config\Testing\ConfigSchemaChecker',
'arguments' => ['@config.typed'],
'arguments' => ['@config.typed', $this->getConfigSchemaExclusions()],
'tags' => [['name' => 'event_subscriber']]
];
file_put_contents($directory . '/services.yml', $yaml->dump($services));
@ -812,6 +806,10 @@ abstract class WebTestBase extends TestBase {
// TestBase::restoreEnvironment() will delete the entire site directory.
// Not using File API; a potential error must trigger a PHP warning.
chmod(DRUPAL_ROOT . '/' . $this->siteDirectory, 0777);
// During tests, cacheable responses should get the debugging cacheability
// headers by default.
$this->setContainerParameter('http.response.debug_cacheability_headers', TRUE);
}
/**
@ -2921,7 +2919,7 @@ abstract class WebTestBase extends TestBase {
$server = array_merge($server, $override_server_vars);
$request = Request::create($request_path, 'GET', array(), array(), array(), $server);
// Ensure the the request time is REQUEST_TIME to ensure that API calls
// Ensure the request time is REQUEST_TIME to ensure that API calls
// in the test use the right timestamp.
$request->server->set('REQUEST_TIME', REQUEST_TIME);
$this->container->get('request_stack')->push($request);
@ -3019,4 +3017,18 @@ abstract class WebTestBase extends TestBase {
$this->assertFalse(in_array($cache_tag, $cache_tags), "'" . $cache_tag . "' is absent in the X-Drupal-Cache-Tags header.");
}
/**
* Enables/disables the cacheability headers.
*
* Sets the http.response.debug_cacheability_headers container parameter.
*
* @param bool $value
* (optional) Whether the debugging cacheability headers should be sent.
*/
protected function setHttpResponseDebugCacheabilityHeaders($value = TRUE) {
$this->setContainerParameter('http.response.debug_cacheability_headers', $value);
$this->rebuildContainer();
$this->resetAll();
}
}