diff --git a/composer.json b/composer.json index c65f907..04b1c59 100644 --- a/composer.json +++ b/composer.json @@ -18,6 +18,6 @@ "drupal/ctools": "3.x-dev", "drupal/entity_browser": "2.x-dev", "drupal/entity_usage": "2.x-dev", - "drupal/search_api": "~1.0" + "drupal/search_api": "1.x-dev" } } diff --git a/tests/src/Functional/Migrate/MigrateUiParagraphsTestBase.php b/tests/src/Functional/Migrate/MigrateUiParagraphsTestBase.php index 8490451..0d048af 100644 --- a/tests/src/Functional/Migrate/MigrateUiParagraphsTestBase.php +++ b/tests/src/Functional/Migrate/MigrateUiParagraphsTestBase.php @@ -508,7 +508,14 @@ abstract class MigrateUiParagraphsTestBase extends MigrateUpgradeTestBase { $carry[$entity->id()] = (string) $entity->label(); return $carry; }); - $this->assertEquals($expected_entity_labels, $actual_labels, sprintf('The expected %s entities are not matching the actual ones.', $entity_type_id)); + if (\Drupal::database()->driver() === 'pgsql') { + // On PostgreSQL the entity IDs are not the same so only compare the + // labels to ensure we've migrated the expected number of entities. + $this->assertEqualsCanonicalizing($expected_entity_labels, $actual_labels, sprintf('The expected %s entities are not matching the actual ones.', $entity_type_id)); + } + else { + $this->assertEquals($expected_entity_labels, $actual_labels, sprintf('The expected %s entities are not matching the actual ones.', $entity_type_id)); + } } else { $this->fail(sprintf('The expected %s entity type is missing.', $entity_type_id));