update drupal
This commit is contained in:
@@ -10,7 +10,7 @@
|
||||
*/
|
||||
function config_schema_test_config_schema_info_alter(&$definitions) {
|
||||
if (\Drupal::state()->get('config_schema_test_exception_add')) {
|
||||
$definitions['config_schema_test.hook_added_defintion'] = $definitions['config_schema_test.hook'];
|
||||
$definitions['config_schema_test.hook_added_definition'] = $definitions['config_schema_test.hook'];
|
||||
}
|
||||
if (\Drupal::state()->get('config_schema_test_exception_remove')) {
|
||||
unset($definitions['config_schema_test.hook']);
|
||||
|
||||
@@ -69,7 +69,7 @@ class ConfigEntityTest extends BrowserTestBase {
|
||||
$this->fail('EntityMalformedException was thrown.');
|
||||
}
|
||||
catch (EntityMalformedException $e) {
|
||||
$this->pass('EntityMalformedException was thrown.');
|
||||
// Expected exception; just continue testing.
|
||||
}
|
||||
|
||||
// Verify that an empty entity cannot be saved.
|
||||
@@ -78,7 +78,7 @@ class ConfigEntityTest extends BrowserTestBase {
|
||||
$this->fail('EntityMalformedException was thrown.');
|
||||
}
|
||||
catch (EntityMalformedException $e) {
|
||||
$this->pass('EntityMalformedException was thrown.');
|
||||
// Expected exception; just continue testing.
|
||||
}
|
||||
|
||||
// Verify that an entity with an empty ID string is considered empty, too.
|
||||
@@ -91,7 +91,7 @@ class ConfigEntityTest extends BrowserTestBase {
|
||||
$this->fail('EntityMalformedException was thrown.');
|
||||
}
|
||||
catch (EntityMalformedException $e) {
|
||||
$this->pass('EntityMalformedException was thrown.');
|
||||
// Expected exception; just continue testing.
|
||||
}
|
||||
|
||||
// Verify properties on a newly created entity.
|
||||
@@ -116,7 +116,6 @@ class ConfigEntityTest extends BrowserTestBase {
|
||||
// Verify that the entity can be saved.
|
||||
try {
|
||||
$status = $config_test->save();
|
||||
$this->pass('EntityMalformedException was not thrown.');
|
||||
}
|
||||
catch (EntityMalformedException $e) {
|
||||
$this->fail('EntityMalformedException was not thrown.');
|
||||
@@ -151,9 +150,6 @@ class ConfigEntityTest extends BrowserTestBase {
|
||||
]);
|
||||
try {
|
||||
$id_length_config_test->save();
|
||||
$this->pass(new FormattableMarkup("config_test entity with ID length @length was saved.", [
|
||||
'@length' => strlen($id_length_config_test->id()),
|
||||
]));
|
||||
}
|
||||
catch (ConfigEntityIdLengthException $e) {
|
||||
$this->fail($e->getMessage());
|
||||
@@ -165,9 +161,6 @@ class ConfigEntityTest extends BrowserTestBase {
|
||||
]);
|
||||
try {
|
||||
$id_length_config_test->save();
|
||||
$this->pass(new FormattableMarkup("config_test entity with ID length @length was saved.", [
|
||||
'@length' => strlen($id_length_config_test->id()),
|
||||
]));
|
||||
}
|
||||
catch (ConfigEntityIdLengthException $e) {
|
||||
$this->fail($e->getMessage());
|
||||
@@ -185,10 +178,7 @@ class ConfigEntityTest extends BrowserTestBase {
|
||||
]));
|
||||
}
|
||||
catch (ConfigEntityIdLengthException $e) {
|
||||
$this->pass(new FormattableMarkup("config_test entity with ID length @length exceeding the maximum allowed length of @max failed to save", [
|
||||
'@length' => strlen($id_length_config_test->id()),
|
||||
'@max' => static::MAX_ID_LENGTH,
|
||||
]));
|
||||
// Expected exception; just continue testing.
|
||||
}
|
||||
|
||||
// Ensure that creating an entity with the same id as an existing one is not
|
||||
@@ -202,7 +192,7 @@ class ConfigEntityTest extends BrowserTestBase {
|
||||
$this->fail('Not possible to overwrite an entity entity.');
|
||||
}
|
||||
catch (EntityStorageException $e) {
|
||||
$this->pass('Not possible to overwrite an entity entity.');
|
||||
// Expected exception; just continue testing.
|
||||
}
|
||||
|
||||
// Verify that renaming the ID returns correct status and properties.
|
||||
|
||||
@@ -231,6 +231,10 @@ EOD;
|
||||
$this->drupalPostForm('admin/config/development/configuration/single/import', $edit, t('Import'));
|
||||
$this->assertText(t('Can not uninstall the Configuration module as part of a configuration synchronization through the user interface.'));
|
||||
|
||||
// Try to import without any values.
|
||||
$this->drupalPostForm('admin/config/development/configuration/single/import', [], t('Import'));
|
||||
$this->assertText('Configuration type field is required.');
|
||||
$this->assertText('Paste your configuration here field is required.');
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -29,38 +29,32 @@ class SchemaConfigListenerWebTest extends BrowserTestBase {
|
||||
$this->drupalLogin($this->drupalCreateUser(['administer site configuration']));
|
||||
|
||||
// Test a non-existing schema.
|
||||
$msg = 'Expected SchemaIncompleteException thrown';
|
||||
try {
|
||||
$this->config('config_schema_test.schemaless')->set('foo', 'bar')->save();
|
||||
$this->fail($msg);
|
||||
$this->fail('Expected SchemaIncompleteException thrown');
|
||||
}
|
||||
catch (SchemaIncompleteException $e) {
|
||||
$this->pass($msg);
|
||||
$this->assertEquals('No schema for config_schema_test.schemaless', $e->getMessage());
|
||||
}
|
||||
|
||||
// Test a valid schema.
|
||||
$msg = 'Unexpected SchemaIncompleteException thrown';
|
||||
$config = $this->config('config_test.types')->set('int', 10);
|
||||
try {
|
||||
$config->save();
|
||||
$this->pass($msg);
|
||||
}
|
||||
catch (SchemaIncompleteException $e) {
|
||||
$this->fail($msg);
|
||||
$this->fail('Unexpected SchemaIncompleteException thrown');
|
||||
}
|
||||
|
||||
// Test an invalid schema.
|
||||
$msg = 'Expected SchemaIncompleteException thrown';
|
||||
$config = $this->config('config_test.types')
|
||||
->set('foo', 'bar')
|
||||
->set('array', 1);
|
||||
try {
|
||||
$config->save();
|
||||
$this->fail($msg);
|
||||
$this->fail('Expected SchemaIncompleteException thrown');
|
||||
}
|
||||
catch (SchemaIncompleteException $e) {
|
||||
$this->pass($msg);
|
||||
$this->assertEquals('Schema errors for config_test.types with the following errors: config_test.types:array variable type is integer but applied schema class is Drupal\Core\Config\Schema\Sequence, config_test.types:foo missing schema', $e->getMessage());
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user