diff --git a/core/modules/config/tests/config_test/config/schema/config_test.schema.yml b/core/modules/config/tests/config_test/config/schema/config_test.schema.yml index 904fb69..80dc9fb 100644 --- a/core/modules/config/tests/config_test/config/schema/config_test.schema.yml +++ b/core/modules/config/tests/config_test/config/schema/config_test.schema.yml @@ -41,9 +41,13 @@ config_test.query.*: label: 'Label' array: type: sequence - label: 'Array' + label: 'Array level 1' sequence: - - type: string + - type: sequence + label: 'Array level 2' + sequence: + - type: integer + label: 'Value' number: type: integer label: 'number' diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_vocabulary_field_instance.yml b/core/modules/migrate_drupal/config/install/migrate.migration.d6_vocabulary_field_instance.yml index 215f470..c7fc497 100644 --- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_vocabulary_field_instance.yml +++ b/core/modules/migrate_drupal/config/install/migrate.migration.d6_vocabulary_field_instance.yml @@ -12,8 +12,6 @@ process: plugin: migration migration: d6_taxonomy_vocabulary source: vid - 'settings.allowed_values.0.vocabulary': @field_name - 'settings.allowed_values.0.parent': constants.parent destination: plugin: entity:field_instance_config migration_dependencies: diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateVocabularyFieldInstanceTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateVocabularyFieldInstanceTest.php index a569062..d01c6c3 100644 --- a/core/modules/migrate_drupal/src/Tests/d6/MigrateVocabularyFieldInstanceTest.php +++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateVocabularyFieldInstanceTest.php @@ -84,15 +84,11 @@ public function testVocabularyFieldInstance() { $field_id = 'node.article.tags'; $field = entity_load('field_instance_config', $field_id); $this->assertEqual($field->id(), $field_id, 'Field instance exists on article bundle.'); - $settings = $field->getSettings(); - $this->assertEqual('tags', $settings['allowed_values'][0]['vocabulary'], "Vocabulary has correct settings."); // Test the page bundle as well. $field_id = 'node.page.tags'; $field = entity_load('field_instance_config', $field_id); $this->assertEqual($field->id(), $field_id, 'Field instance exists on page bundle.'); - $settings = $field->getSettings(); - $this->assertEqual('tags', $settings['allowed_values'][0]['vocabulary'], "Vocabulary has correct settings."); $this->assertEqual(array('node', 'article', 'tags'), entity_load('migration', 'd6_vocabulary_field_instance')->getIdMap()->lookupDestinationID(array(4, 'article'))); }