Followup to: Issue #3057102 by Pancho: Replace ImageFieldTestBase by...

Followup to: Issue #3057102 by Pancho: Replace ImageFieldTestBase by entity-type agnostic test methods

tests/src/Traits/TestImageFieldTrait.php

@@ -39,15 +39,22 @@ trait TestImageFieldTrait {
     }
 
     $type_manager = \Drupal::entityTypeManager();
-    $label_key = $type_manager->getDefinition($entity_type)->getKey('label');
-    $entity = $type_manager->getStorage($entity_type)->create([
-      'type' => $bundle,
-      $label_key => $this->randomMachineName(),
-      $field_name => [
-        'target_id' => $image->id(),
-        'alt' => $alt,
-      ],
-    ]);
+    $definition = $type_manager->getDefinition($entity_type);
+
+    $values = [];
+    if ($bundle_key = $definition->getKey('bundle')) {
+      $values[$bundle_key] = $bundle;
+    }
+    $label_key = $entity_type == 'user' ? 'name' : $definition->getKey('label');
+    if ($label_key) {
+      $values[$label_key] = $this->randomMachineName();
+    }
+    $values[$field_name] = [
+      'target_id' => $image->id(),
+      'alt' => $alt,
+    ];
+
+    $entity = $type_manager->getStorage($entity_type)->create($values);
     $entity->save();
 
     return $entity->id();