Fix unit and integration tests

opsmill · Jan 19, 2025 · b05f702 · b05f702
1 parent d69027f
commit b05f702
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 16 deletions.
diff --git a/backend/tests/integration/git/test_readonly_repository.py b/backend/tests/integration/git/test_readonly_repository.py
@@ -4,7 +4,7 @@
 from unittest.mock import AsyncMock, patch
 
 import pytest
-from infrahub_sdk.protocols import CoreArtifactDefinition
+from infrahub_sdk.protocols import CoreArtifact, CoreArtifactDefinition
 
 from infrahub.core import registry
 from infrahub.core.constants import DiffAction, InfrahubKind
@@ -101,23 +101,25 @@ async def test_step01_create_repository(
     async def test_step02_validate_generated_artifacts(
         self, db: InfrahubDatabase, default_branch: Branch, client: InfrahubClient, person_john: Node
     ):
-        artifacts = await client.all(kind=InfrahubKind.ARTIFACT, branch="ro_repository")
-        assert artifacts
-        assert artifacts[0].name.value == "Ownership report"
+        artifacts = await client.all(kind=CoreArtifact, branch="ro_repository")
+        artifacts_dict = {item.name.value: item for item in artifacts}
+        assert sorted(artifacts_dict.keys()) == ["Ownership report", "name report"]
         john_display_label = await person_john.render_display_label(db=db)
 
         artifact_diff_calculator = ArtifactDiffCalculator(db=db)
         branch = await registry.get_branch(db=db, branch="ro_repository")
         diffs = await artifact_diff_calculator.calculate(source_branch=branch, target_branch=default_branch)
-        assert len(diffs) == 1
-        assert diffs[0] == BranchDiffArtifact(
+        diffs_dict = {str(item.display_label): item for item in diffs}
+        assert sorted(diffs_dict.keys()) == ["John - Ownership report", "John - name report"]
+        assert diffs_dict["John - Ownership report"] == BranchDiffArtifact(
             branch="ro_repository",
-            id=artifacts[0].id,
+            id=artifacts_dict["Ownership report"].id,
             display_label=f"{john_display_label} - Ownership report",
             action=DiffAction.ADDED,
             target=ArtifactTarget(id=person_john.id, kind="TestingPerson", display_label=john_display_label),
             item_new=BranchDiffArtifactStorage(
-                storage_id=artifacts[0].storage_id.value, checksum=artifacts[0].checksum.value
+                storage_id=str(artifacts_dict["Ownership report"].storage_id.value),
+                checksum=str(artifacts_dict["Ownership report"].checksum.value),
             ),
             item_previous=None,
         )
@@ -185,22 +187,24 @@ async def test_step04_new_branch_with_artifact(
                 REQUEST_ARTIFACT_DEFINITION_GENERATE, parameters={"model": model}
             )
 
-        artifacts = await client.all(kind=InfrahubKind.ARTIFACT, branch="branch")
-        assert artifacts
-        assert artifacts[0].name.value == "Ownership report"
+        artifacts = await client.all(kind=CoreArtifact, branch="branch")
+        artifacts_dict = {item.name.value: item for item in artifacts}
+        assert sorted(artifacts_dict.keys()) == ["Ownership report", "name report"]
         artifact_main = await NodeManager.get_one(db=db, id=artifacts[0].id)
 
         artifact_diff_calculator = ArtifactDiffCalculator(db=db)
         diffs = await artifact_diff_calculator.calculate(source_branch=branch, target_branch=default_branch)
-        assert len(diffs) == 1
-        assert diffs[0] == BranchDiffArtifact(
+        diffs_dict = {str(item.display_label): item for item in diffs}
+        assert sorted(diffs_dict.keys()) == ["John2 - Ownership report", "John2 - name report"]
+        assert diffs_dict["John2 - Ownership report"] == BranchDiffArtifact(
             branch="branch",
-            id=artifacts[0].id,
+            id=artifacts_dict["Ownership report"].id,
             display_label=f"{john_display_label} - Ownership report",
             action=DiffAction.UPDATED,
             target=ArtifactTarget(id=person_john.id, kind="TestingPerson", display_label=john_display_label),
             item_new=BranchDiffArtifactStorage(
-                storage_id=artifacts[0].storage_id.value, checksum=artifacts[0].checksum.value
+                storage_id=str(artifacts_dict["Ownership report"].storage_id.value),
+                checksum=str(artifacts_dict["Ownership report"].checksum.value),
             ),
             item_previous=BranchDiffArtifactStorage(
                 storage_id=artifact_main.storage_id.value, checksum=artifact_main.checksum.value

diff --git a/backend/tests/unit/graphql/test_mutation_artifact_definition.py b/backend/tests/unit/graphql/test_mutation_artifact_definition.py
@@ -184,7 +184,10 @@ async def test_update_artifact_definition(
                 workflow=REQUEST_ARTIFACT_DEFINITION_GENERATE,
                 parameters={
                     "model": RequestArtifactDefinitionGenerate(
-                        artifact_definition=definition1.id, branch=branch.name, limit=[]
+                        artifact_definition_id=definition1.id,
+                        artifact_definition_name=definition1.name.value,
+                        branch=branch.name,
+                        limit=[],
                     )
                 },
             ),