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

Update to Drupal 8.0.0 beta 14. For more information, see https://drupal.org/node/2544542

Browse source
This commit is contained in:
Pantheon Automation 2015-08-27 12:03:05 -07:00 • committed by Greg Anderson
parent 3b2511d96d
commit 81ccda77eb
2155 changed files with 54307 additions and 46870 deletions
Download patch file Download diff file Expand all files Collapse all files

55
core/modules/simpletest/src/Tests/Migrate/d6/MigrateSimpletestConfigsTest.php Normal file
View file

@ -0,0 +1,55 @@
<?php
/**
* @file
* Contains \Drupal\simpletest\Tests\Migrate\d6\MigrateSimpletestConfigsTest.
*/
namespace Drupal\simpletest\Tests\Migrate\d6;
use Drupal\config\Tests\SchemaCheckTestTrait;
use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
/**
* Upgrade variables to simpletest.settings.yml.
*
* @group simpletest
*/
class MigrateSimpletestConfigsTest extends MigrateDrupal6TestBase {
use SchemaCheckTestTrait;
/**
* Modules to enable.
*
* @var array
*/
public static $modules = array('simpletest');
/**
* {@inheritdoc}
*/
protected function setUp() {
parent::setUp();
$this->installConfig(['simpletest']);
$this->loadDumps(['Variable.php']);
$this->executeMigration('d6_simpletest_settings');
}
/**
* Tests migration of simpletest variables to simpletest.settings.yml.
*/
public function testSimpletestSettings() {
$config = $this->config('simpletest.settings');
$this->assertIdentical(TRUE, $config->get('clear_results'));
$this->assertIdentical(CURLAUTH_BASIC, $config->get('httpauth.method'));
// NULL in the dump means defaults which is empty string. Same as omitting
// them.
$this->assertIdentical('', $config->get('httpauth.password'));
$this->assertIdentical('', $config->get('httpauth.username'));
$this->assertIdentical(TRUE, $config->get('verbose'));
$this->assertConfigSchema(\Drupal::service('config.typed'), 'simpletest.settings', $config->get());
}
}

2
core/modules/simpletest/src/Tests/SimpleTestBrowserTest.php
View file

@ -124,6 +124,8 @@ class SimpleTestBrowserTest extends WebTestBase {
* Tests that PHPUnit and KernelTestBase tests work through the UI.
*/
public function testTestingThroughUI() {
$this->drupalGet('admin/config/development/testing');
$this->assertTrue(strpos($this->drupalSettings['simpleTest']['images'][0], 'core/misc/menu-collapsed.png') > 0, 'drupalSettings contains a link to core/misc/menu-collapsed.png.');
// We can not test WebTestBase tests here since they require a valid .htkey
// to be created. However this scenario is covered by the testception of
// \Drupal\simpletest\Tests\SimpleTestTest.

2
core/modules/simpletest/src/Tests/SimpleTestTest.php
View file

@ -157,7 +157,7 @@ EOD;
// request. This allows the stub test to make requests. The event does not
// fire here and drupal_generate_test_ua() can not generate a key for a
// test in a test since the prefix has changed.
// @see \Drupal\Core\Test\EventSubscriber\HttpRequestSubscriber::onBeforeSendRequest()
// @see \Drupal\Core\Test\HttpClientMiddleware\TestHttpClientMiddleware::onBeforeSendRequest()
// @see drupal_generate_test_ua();
$key_file = DRUPAL_ROOT . '/sites/simpletest/' . substr($this->databasePrefix, 10) . '/.htkey';
$private_key = Crypt::randomBytesBase64(55);