Issue #2565791 by mikeryan, subhojit777, quietone, phenaproxima: Fix migration labels

core/modules/action/migration_templates/d6_action_settings.yml

 id: d6_action_settings
-label: Drupal 6 action configuration
+label: Action configuration
 migration_tags:
   - Drupal 6
 source:

core/modules/aggregator/migration_templates/d6_aggregator_feed.yml

 id: d6_aggregator_feed
-label: Drupal 6 aggregator feeds
+label: Aggregator feeds
 migration_tags:
   - Drupal 6
 source:

core/modules/aggregator/migration_templates/d6_aggregator_item.yml

 id: d6_aggregator_item
-label: Drupal 6 aggregator items
+label: Aggregator items
 migration_tags:
   - Drupal 6
 source:

core/modules/aggregator/migration_templates/d6_aggregator_settings.yml

 id: d6_aggregator_settings
-label: Drupal 6 aggregator configuration
+label: Aggregator configuration
 migration_tags:
   - Drupal 6
 source:

core/modules/aggregator/migration_templates/d7_aggregator_settings.yml

 id: d7_aggregator_settings
-label: Drupal 7 aggregator configuration
+label: Aggregator configuration
 migration_tags:
   - Drupal 7
 source:

core/modules/ban/migration_templates/d7_blocked_ips.yml

 id: d7_blocked_ips
-label: Drupal 7 blocked IPs
+label: Blocked IPs
 migration_tags:
   - Drupal 7
 source:

core/modules/block/migration_templates/d6_block.yml

 id: d6_block
-label: Drupal 6 blocks
+label: Blocks
 migration_tags:
   - Drupal 6
 source:

core/modules/block_content/migration_templates/d6_block_content_body_field.yml

 id: d6_block_content_body_field
-label: Drupal 6 block content body field configuration
+label: Block content body field configuration
 migration_tags:
   - Drupal 6
 source:

core/modules/block_content/migration_templates/d6_block_content_type.yml

 id: d6_block_content_type
-label: Drupal 6 block content type
+label: Block content type
 migration_tags:
   - Drupal 6
 source:

core/modules/block_content/migration_templates/d6_custom_block.yml

 id: d6_custom_block
-label: Drupal 6 custom blocks
+label: Custom blocks
 migration_tags:
   - Drupal 6
 source:

core/modules/book/migration_templates/d6_book.yml

 id: d6_book
-label: Drupal 6 books
+label: Books
 migration_tags:
   - Drupal 6
 source:

core/modules/book/migration_templates/d6_book_settings.yml

 id: d6_book_settings
-label: Drupal 6 book configuration
+label: Book configuration
 migration_tags:
   - Drupal 6
 source:

core/modules/comment/migration_templates/d6_comment.yml

 id: d6_comment
-label: Drupal 6 comments
+label: Comments
 migration_tags:
   - Drupal 6
 source:

core/modules/comment/migration_templates/d6_comment_entity_display.yml

 id: d6_comment_entity_display
-label: Drupal 6 comment display configuration
+label: Comment display configuration
 migration_tags:
   - Drupal 6
 source:

core/modules/comment/migration_templates/d6_comment_entity_form_display.yml

 id: d6_comment_entity_form_display
-label: Drupal 6 comment field form display configuration
+label: Comment field form display configuration
 migration_tags:
   - Drupal 6
 source:

core/modules/comment/migration_templates/d6_comment_entity_form_display_subject.yml

 id: d6_comment_entity_form_display_subject
-label: Drupal 6 comment subject form display configuration
+label: Comment subject form display configuration
 migration_tags:
   - Drupal 6
 source:

core/modules/comment/migration_templates/d6_comment_field.yml

 id: d6_comment_field
-label: Drupal 6 comment field configuration
+label: Comment field configuration
 migration_tags:
   - Drupal 6
 source:

core/modules/comment/migration_templates/d6_comment_field_instance.yml

 id: d6_comment_field_instance
-label: Drupal 6 comment field instance configuration
+label: Comment field instance configuration
 migration_tags:
   - Drupal 6
 source:

core/modules/comment/migration_templates/d6_comment_type.yml

 id: d6_comment_type
-label: Drupal 6 comment type
+label: Comment type
 migration_tags:
   - Drupal 6
 source:

core/modules/comment/migration_templates/d7_comment.yml

 id: d7_comment
-label: Drupal 7 comments
+label: Comments
 migration_tags:
   - Drupal 7
 source:

core/modules/comment/migration_templates/d7_comment_entity_display.yml

 id: d7_comment_entity_display
-label: Drupal 7 comment display configuration
+label: Comment display configuration
 migration_tags:
   - Drupal 7
 source:

core/modules/comment/migration_templates/d7_comment_entity_form_display.yml

 id: d7_comment_entity_form_display
-label: Drupal 7 comment field form display configuration
+label: Comment field form display configuration
 migration_tags:
   - Drupal 7
 source:

core/modules/comment/migration_templates/d7_comment_entity_form_display_subject.yml

 id: d7_comment_entity_form_display_subject
-label: Drupal 7 comment subject form display configuration
+label: Comment subject form display configuration
 migration_tags:
   - Drupal 7
 source:

core/modules/comment/migration_templates/d7_comment_field.yml

 id: d7_comment_field
-label: Drupal 7 comment field configuration
+label: Comment field configuration
 migration_tags:
   - Drupal 7
 source:

core/modules/comment/migration_templates/d7_comment_field_instance.yml

 id: d7_comment_field_instance
-label: Drupal 7 comment field instance configuration
+label: Comment field instance configuration
 migration_tags:
   - Drupal 7
 source:

core/modules/comment/migration_templates/d7_comment_type.yml

 id: d7_comment_type
-label: Drupal 7 comment type
+label: Comment type
 migration_tags:
   - Drupal 7
 source:

core/modules/contact/migration_templates/d6_contact_category.yml

 id: d6_contact_category
-label: Drupal 6 contact category configuration
+label: Contact category configuration
 migration_tags:
   - Drupal 6
 source:

core/modules/contact/migration_templates/d6_contact_settings.yml

 id: d6_contact_settings
-label: Drupal 6 contact configuration
+label: Contact configuration
 migration_tags:
   - Drupal 6
 source:

core/modules/dblog/migration_templates/d6_dblog_settings.yml

 id: d6_dblog_settings
-label: Drupal 6 database logging configuration
+label: Database logging configuration
 migration_tags:
   - Drupal 6
 source:

core/modules/dblog/migration_templates/d7_dblog_settings.yml

 id: d7_dblog_settings
-label: Drupal 7 database logging configuration
+label: Database logging configuration
 migration_tags:
   - Drupal 7
 source:

core/modules/field/migration_templates/d6_field.yml

 id: d6_field
-label: Drupal 6 field configuration
+label: Field configuration
 migration_tags:
   - Drupal 6
 builder:

core/modules/field/migration_templates/d6_field_formatter_settings.yml

 id: d6_field_formatter_settings
-label: Drupal 6 field formatter configuration
+label: Field formatter configuration
 migration_tags:
   - Drupal 6
 builder:

core/modules/field/migration_templates/d6_field_instance.yml

 id: d6_field_instance
-label: Drupal 6 field instance configuration
+label: Field instance configuration
 migration_tags:
   - Drupal 6
 builder:

core/modules/field/migration_templates/d6_field_instance_widget_settings.yml

 id: d6_field_instance_widget_settings
-label: Drupal 6 field instance widget configuration
+label: Field instance widget configuration
 migration_tags:
   - Drupal 6
 builder:

core/modules/field/migration_templates/d7_field.yml

 id: d7_field
-label: Drupal 7 field configuration
+label: Field configuration
 migration_tags:
   - Drupal 7
 source:

core/modules/field/migration_templates/d7_field_formatter_settings.yml

 id: d7_field_formatter_settings
-label: Drupal 7 field formatter configuration
+label: Field formatter configuration
 migration_tags:
   - Drupal 7
 source:

core/modules/field/migration_templates/d7_field_instance.yml

 id: d7_field_instance
+label: Field instance configuration
 migration_tags:
   - Drupal 7
 source:

core/modules/field/migration_templates/d7_field_instance_widget_settings.yml

 id: d7_field_instance_widget_settings
-label: Drupal 7 field instance widget configuration
+label: Field instance widget configuration
 migration_tags:
   - Drupal 7
 source:

core/modules/field/migration_templates/d7_view_modes.yml

 id: d7_view_modes
-label: Drupal 7 view modes
+label: View modes
 migration_tags:
   - Drupal 7
 source:

core/modules/file/migration_templates/d6_file.yml

 # Every migration that saves into {file_managed} must have the d6_file
 # migration as an optional dependency to ensure d6_file runs first.
 id: d6_file
-label: Drupal 6 files
+label: Files
 migration_tags:
   - Drupal 6
 source:

core/modules/file/migration_templates/d6_file_settings.yml

 id: d6_file_settings
-label: Drupal 6 file configuration
+label: File configuration
 migration_tags:
   - Drupal 6
 source:

core/modules/file/migration_templates/d6_upload.yml

 id: d6_upload
-label: Drupal 6 file uploads
+label: File uploads
 migration_tags:
   - Drupal 6
 source:

core/modules/file/migration_templates/d6_upload_entity_display.yml

 id: d6_upload_entity_display
-label: Drupal 6 upload display configuration
+label: Upload display configuration
 migration_tags:
   - Drupal 6
 source:

core/modules/file/migration_templates/d6_upload_entity_form_display.yml

 id: d6_upload_entity_form_display
-label: Drupal 6 upload form display configuration
+label: Upload form display configuration
 migration_tags:
   - Drupal 6
 source:

core/modules/file/migration_templates/d6_upload_field.yml

 id: d6_upload_field
-label: Drupal 6 upload field configuration
+label: Upload field configuration
 migration_tags:
   - Drupal 6
 source:

core/modules/file/migration_templates/d6_upload_field_instance.yml

 id: d6_upload_field_instance
-label: Drupal 6 upload field instance configuration
+label: Upload field instance configuration
 migration_tags:
   - Drupal 6
 source:

core/modules/file/migration_templates/d7_file.yml

 # Every migration that references a file by fid should specify this migration
 # as an optional dependency.
 id: d7_file
-label: Drupal 7 files
+label: Files
 migration_tags:
   - Drupal 7
 source:

core/modules/filter/migration_templates/d6_filter_format.yml

 id: d6_filter_format
-label: Drupal 6 filter format configuration
+label: Filter format configuration
 migration_tags:
   - Drupal 6
 source:

core/modules/filter/migration_templates/d7_filter_format.yml

 id: d7_filter_format
-label: Drupal 7 filter format configuration
+label: Filter format configuration
 migration_tags:
   - Drupal 7
 source:

core/modules/forum/migration_templates/d6_forum_settings.yml

 id: d6_forum_settings
-label: Drupal 6 forum configuration
+label: Forum configuration
 migration_tags:
   - Drupal 6
 source:

core/modules/image/migration_templates/d6_imagecache_presets.yml

 id: d6_imagecache_presets
-label: Drupal 6 ImageCache Presets
+label: ImageCache Presets
 migration_tags:
   - Drupal 6
 source:

core/modules/image/migration_templates/d7_image_settings.yml

 id: d7_image_settings
+label: Image configuration
 migration_tags:
   - Drupal 7
 source:

core/modules/language/migration_templates/d7_language_negotiation_settings.yml

 id: d7_language_negotiation_settings
-label: Drupal 7 language negotiation settings
+label: Language negotiation settings
 migration_tags:
   - Drupal 7
 source:

core/modules/menu_link_content/migration_templates/d6_menu_links.yml

 id: d6_menu_links
-label: Drupal 6 menu links
+label: Menu links
 migration_tags:
   - Drupal 6
 source:

core/modules/menu_link_content/migration_templates/d7_menu_links.yml

 id: d7_menu_links
-label: Drupal 7 menu links
+label: Menu links
 migration_tags:
   - Drupal 7
 source:

core/modules/node/migration_templates/d6_node.yml

 id: d6_node
-label: Drupal 6 nodes
+label: Nodes
 migration_tags:
   - Drupal 6
 builder:

core/modules/node/migration_templates/d6_node_revision.yml

 id: d6_node_revision
-label: Drupal 6 node revisions
+label: Node revisions
 migration_tags:
   - Drupal 6
 builder:

core/modules/node/migration_templates/d6_node_setting_promote.yml

 id: d6_node_setting_promote
-label: Drupal 6 node type 'promote' setting
+label: Node type 'promote' setting
 migration_tags:
   - Drupal 6
 source:

core/modules/node/migration_templates/d6_node_setting_status.yml

 id: d6_node_setting_status
-label: Drupal 6 node type 'status' setting
+label: Node type 'status' setting
 migration_tags:
   - Drupal 6
 source:

core/modules/node/migration_templates/d6_node_setting_sticky.yml

 id: d6_node_setting_sticky
-label: Drupal 6 node type 'sticky' setting
+label: Node type 'sticky' setting
 migration_tags:
   - Drupal 6
 source:

core/modules/node/migration_templates/d6_node_settings.yml

 id: d6_node_settings
-label: Drupal 6 node configuration
+label: Node configuration
 migration_tags:
   - Drupal 6
 source:

core/modules/node/migration_templates/d6_node_type.yml

 id: d6_node_type
-label: Drupal 6 node type configuration
+label: Node type configuration
 migration_tags:
   - Drupal 6
 source:

core/modules/node/migration_templates/d6_view_modes.yml

 id: d6_view_modes
-label: Drupal 6 view modes
+label: View modes
 migration_tags:
   - Drupal 6
 source:

core/modules/node/migration_templates/d7_node.yml

 id: d7_node
-label: Drupal 7 nodes
+label: Nodes
 migration_tags:
   - Drupal 7
 builder:

core/modules/node/migration_templates/d7_node_revision.yml

 id: d7_node_revision
-label: Drupal 7 node revisions
+label: Node revisions
 migration_tags:
   - Drupal 7
 builder:

core/modules/node/migration_templates/d7_node_settings.yml

 id: d7_node_settings
-label: Drupal 7 node configuration
+label: Node configuration
 migration_tags:
   - Drupal 7
 source:

core/modules/node/migration_templates/d7_node_title_label.yml

 id: d7_node_title_label
-label: Drupal 7 node title label
+label: Node title label
 migration_tags:
   - Drupal 7
 source:

core/modules/node/migration_templates/d7_node_type.yml

 id: d7_node_type
-label: Drupal 7 node type configuration
+label: Node type configuration
 migration_tags:
   - Drupal 7
 source:

core/modules/node/src/Tests/Migrate/d6/MigrateNodeBuilderTest.php

@@ -7,6 +7,7 @@
 
 namespace Drupal\node\Tests\Migrate\d6;
 
+use Drupal\migrate\Entity\MigrationInterface;
 use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 use Drupal\migrate\Entity\Migration;
 
@@ -17,6 +18,11 @@ class MigrateNodeBuilderTest extends MigrateDrupal6TestBase {
 
   public static $modules = ['migrate', 'migrate_drupal', 'node'];
 
+  /**
+   * @var MigrationInterface[]
+   */
+  protected $builtMigrations = [];
+
   /**
    * Asserts various aspects of a migration entity.
    *
@@ -26,7 +32,7 @@ class MigrateNodeBuilderTest extends MigrateDrupal6TestBase {
    *   The label.
    */
   protected function assertEntity($id, $label) {
-    $migration = Migration::load($id);
+    $migration = $this->builtMigrations[$id];
     $this->assertTrue($migration instanceof Migration);
     $this->assertIdentical($id, $migration->Id());
     $this->assertIdentical($label, $migration->label());
@@ -58,7 +64,11 @@ public function testCreateMigrations() {
     ];
 
     $migrations = \Drupal::service('migrate.migration_builder')->createMigrations($templates);
-    $this->assertIdentical(11, count($migrations));
+    // Key the array.
+    foreach ($migrations as $migration) {
+      $this->builtMigrations[$migration->id()] = $migration;
+    }
+    $this->assertIdentical(11, count($this->builtMigrations));
     $this->assertEntity('d6_node__article', 'Drupal 6 nodes (article)');
     $this->assertEntity('d6_node__company', 'Drupal 6 nodes (company)');
     $this->assertEntity('d6_node__employee', 'Drupal 6 nodes (employee)');

core/modules/path/migration_templates/d6_url_alias.yml

 id: d6_url_alias
-label: Drupal 6 URL aliases
+label: URL aliases
 migration_tags:
   - Drupal 6
 source:

core/modules/search/migration_templates/d6_search_page.yml

 id: d6_search_page
-label: Drupal 6 search page configuration
+label: Search page configuration
 migration_tags:
   - Drupal 6
 source:

core/modules/search/migration_templates/d6_search_settings.yml

 id: d6_search_settings
-label: Drupal 6 search configuration
+label: Search configuration
 migration_tags:
   - Drupal 6
 source:

core/modules/search/migration_templates/d7_search_settings.yml

 id: d7_search_settings
-label: Drupal 7 search configuration
+label: Search configuration
 migration_tags:
   - Drupal 7
 source:

core/modules/simpletest/migration_templates/d6_simpletest_settings.yml

 id: d6_simpletest_settings
-label: Drupal 6 simpletest configuration
+label: Simpletest configuration
 migration_tags:
   - Drupal 6
 source:

core/modules/simpletest/migration_templates/d7_simpletest_settings.yml

 id: d7_simpletest_settings
-label: Drupal 7 SimpleTest configuration
+label: SimpleTest configuration
 migration_tags:
   - Drupal 7
 source:

core/modules/statistics/migration_templates/d6_statistics_settings.yml

 id: d6_statistics_settings
-label: Drupal 6 statistics configuration
+label: Statistics configuration
 migration_tags:
   - Drupal 6
 source:

core/modules/syslog/migration_templates/d6_syslog_settings.yml

 id: d6_syslog_settings
-label: Drupal 6 system log configuration
+label: System log configuration
 migration_tags:
   - Drupal 6
 source:

core/modules/syslog/migration_templates/d7_syslog_settings.yml

 id: d7_syslog_settings
-label: Drupal 7 syslog configuration
+label: Syslog configuration
 migration_tags:
   - Drupal 7
 source:

core/modules/system/migration_templates/d6_date_formats.yml

 id: d6_date_formats
-label: Drupal 6 date format configuration
+label: Date format configuration
 migration_tags:
   - Drupal 6
 source:

core/modules/system/migration_templates/d6_system_cron.yml

 id: d6_system_cron
-label: Drupal 6 cron settings
+label: Cron settings
 migration_tags:
   - Drupal 6
 source:

core/modules/system/migration_templates/d6_system_date.yml

 id: d6_system_date
-label: Drupal 6 system date configuration
+label: System date configuration
 migration_tags:
   - Drupal 6
 source:

core/modules/system/migration_templates/d6_system_file.yml

 id: d6_system_file
-label: Drupal 6 file system configuration
+label: File system configuration
 migration_tags:
   - Drupal 6