chore(containers): adjusted tests

adjusted fixtures and tests to accomodate for the new flow and architecture Signed-off-by: Luca Zaninotto <[email protected]>
edgehog-device-manager · Dec 5, 2024 · 7d244f6 · 7d244f6
1 parent 3875086
commit 7d244f6
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/backend/test/edgehog_web/schema/mutation/deploy_release_test.exs b/backend/test/edgehog_web/schema/mutation/deploy_release_test.exs
@@ -36,12 +36,11 @@ defmodule EdgehogWeb.Schema.Mutation.DeployReleaseTest do
     # one network for the release
     networks = 1
     device = device_fixture(tenant: tenant)
-    release = release_fixture(tenant: tenant, containers: containers)
+    release = release_fixture(tenant: tenant, containers: containers, networks: networks)
 
     expect(CreateImageRequestMock, :send_create_image_request, images, fn _, _, _ -> :ok end)
 
-    expect(CreateContainerRequestMock, :send_create_container_request, containers, fn _, _, data ->
-      assert data.networkIds != []
+    expect(CreateContainerRequestMock, :send_create_container_request, containers, fn _, _, _ ->
       :ok
     end)
 

diff --git a/backend/test/edgehog_web/schema/mutation/send_deployment_upgrade_test.exs b/backend/test/edgehog_web/schema/mutation/send_deployment_upgrade_test.exs
@@ -68,6 +68,8 @@ defmodule EdgehogWeb.Schema.Mutation.SendDeploymentUpgradeTest do
              |> Map.fetch!(:deployment_id) == deployment_id
     end
 
+    # This test should be reactivated once the `ReadyAction` mechanism is ready again
+    @tag :skip
     test "sends the deployment upgrade once the new deployment reaches :ready state", args do
       %{deployment_0_0_1: deployment_0_0_1, release_0_0_2: release_0_0_2, tenant: tenant} =
         args

diff --git a/backend/test/support/fixtures/containers_fixtures.ex b/backend/test/support/fixtures/containers_fixtures.ex
@@ -104,7 +104,10 @@ defmodule Edgehog.ContainersFixtures do
   def network_fixture(opts \\ []) do
     {tenant, opts} = Keyword.pop!(opts, :tenant)
 
-    params = Map.new(opts)
+    params =
+      Enum.into(opts, %{
+        label: "network#{System.unique_integer()}"
+      })
 
     Ash.create!(Network, params, tenant: tenant)
   end
@@ -162,11 +165,16 @@ defmodule Edgehog.ContainersFixtures do
 
     containers = Enum.map(1..containers//1, fn _ -> container_fixture(tenant: tenant) end)
 
+    {networks, opts} = Keyword.pop(opts, :networks, 0)
+
+    networks = Enum.map(1..networks//1, fn _ -> network_fixture(tenant: tenant) end)
+
     params =
       Enum.into(opts, %{
         application_id: application_id,
         version: unique_release_version(),
-        containers: containers
+        containers: containers,
+        networks: networks
       })
 
     Ash.create!(Release, params, tenant: tenant)