Issue #2937841 by quietone: Assert plural labels exist on migrate upgrade form

core/modules/migrate_drupal_ui/tests/src/Functional/MigrateUpgradeExecuteTestBase.php

@@ -106,7 +106,16 @@ public function testMigrateUpgradeExecute() {
     $session->fieldExists('mysql[host]');
 
     $this->drupalPostForm(NULL, $edits, t('Review upgrade'));
-    $this->assertIdConflict($session);
+    $entity_types = [
+      'block_content',
+      'menu_link_content',
+      'file',
+      'taxonomy_term',
+      'user',
+      'comment',
+      'node',
+    ];
+    $this->assertIdConflict($session, $entity_types);
 
     $this->drupalPostForm(NULL, [], t('I acknowledge I may lose data. Continue anyway.'));
     $session->statusCodeEquals(200);

core/modules/migrate_drupal_ui/tests/src/Functional/MigrateUpgradeTestBase.php

@@ -193,20 +193,20 @@ protected function assertReviewPage(WebAssert $session, array $available_paths,
    *
    * @param \Drupal\Tests\WebAssert $session
    *   The current session.
-   * @param $session
-   *   The current session.
+   * @param array $entity_types
+   *   An array of entity types
    */
-  protected function assertIdConflict(WebAssert $session) {
+  protected function assertIdConflict(WebAssert $session, $entity_types) {
+    /** @var \Drupal\ $entity_type_manager */
+    $entity_type_manager = \Drupal::service('entity_type.manager');
+
     $session->pageTextContains('WARNING: Content may be overwritten on your new site.');
     $session->pageTextContains('There is conflicting content of these types:');
-    $session->pageTextContains('custom blocks');
-    $session->pageTextContains('custom menu links');
-    $session->pageTextContains('files');
-    $session->pageTextContains('taxonomy terms');
-    $session->pageTextContains('users');
-    $session->pageTextContains('comments');
+    foreach ($entity_types as $entity_type) {
+      $label = $entity_type_manager->getDefinition($entity_type)->getPluralLabel();
+      $session->pageTextContains($label);
+    }
     $session->pageTextContains('content item revisions');
-    $session->pageTextContains('content items');
     $session->pageTextContains('There is translated content of these types:');
   }