diff --git a/core/modules/config/lib/Drupal/config/Tests/ConfigSchemaTest.php b/core/modules/config/lib/Drupal/config/Tests/ConfigSchemaTest.php index e701d39..947c027 100644 --- a/core/modules/config/lib/Drupal/config/Tests/ConfigSchemaTest.php +++ b/core/modules/config/lib/Drupal/config/Tests/ConfigSchemaTest.php @@ -114,17 +114,18 @@ function testSchemaMapping() { 'label' => 'Weight', 'type' => 'integer', ); - $this->assertEqual($definition, $expected, 'Retrieved the right metadata for config_schema_test.ignore'); + $this->assertEqual($definition, $expected); // The ignore elements themselves. - $definition = \Drupal::service('config.typed')->getDefinition('config_schema_test.ignore.irrelevant'); + $definition = \Drupal::service('config.typed')->get('config_schema_test.ignore')->get('irrelevant')->getDataDefinition(); $expected = array(); - $expected['label'] = 'Irrelevant'; $expected['type'] = 'ignore'; - $this->assertEqual($definition, $expected, 'Retrieved the right metadata for config_schema_test.ignore.irrelevant'); - $definition = \Drupal::service('config.typed')->getDefinition('config_schema_test.ignore.indescribable'); + $expected['label'] = 'Irrelevant'; + $expected['class'] = '\Drupal\Core\Config\Schema\Ignore'; + $this->assertEqual($definition, $expected); + $definition = \Drupal::service('config.typed')->get('config_schema_test.ignore')->get('indescribable')->getDataDefinition(); $expected['label'] = 'Indescribable'; - $this->assertEqual($definition, $expected, 'Retrieved the right metadata for config_schema_test.ignore.indescribable'); + $this->assertEqual($definition, $expected); // More complex case, generic type. Metadata for image style. $definition = \Drupal::service('config.typed')->getDefinition('image.style.large'); diff --git a/core/modules/config/tests/config_schema_test/config/schema/config_schema_test.schema.yml b/core/modules/config/tests/config_schema_test/config/schema/config_schema_test.schema.yml index ce13363..34c6089 100644 --- a/core/modules/config/tests/config_schema_test/config/schema/config_schema_test.schema.yml +++ b/core/modules/config/tests/config_schema_test/config/schema/config_schema_test.schema.yml @@ -142,7 +142,7 @@ config_schema_test.ignore: label: 'Label' irrelevant: type: ignore - label: 'Ignore' + label: 'Irrelevant' indescribable: type: ignore label: 'Indescribable'