Fix an issue where installationId tests sometimes fail

- Update installationId tests to ensure the host associated with the test always has an installation id
toolsplus · Jan 11, 2024 · fcd3011 · fcd3011
1 parent 4277f86
commit fcd3011
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/src/it/scala/io/toolsplus/atlassian/connect/play/slick/SlickAtlassianHostRepositoryIt.scala b/src/it/scala/io/toolsplus/atlassian/connect/play/slick/SlickAtlassianHostRepositoryIt.scala
@@ -2,6 +2,7 @@ package io.toolsplus.atlassian.connect.play.slick
 
 import com.dimafeng.testcontainers.PostgreSQLContainer
 import com.dimafeng.testcontainers.scalatest.TestContainerForAll
+import io.toolsplus.atlassian.connect.play.api.models.DefaultAtlassianHost
 import io.toolsplus.atlassian.connect.play.slick.fixtures.AtlassianHostFixture
 import org.scalatest.TestData
 import org.scalatest.concurrent.Eventually
@@ -97,14 +98,15 @@ class SlickAtlassianHostRepositoryIt
       }
 
       "find the inserted host by installation id" in new AtlassianHostFixture {
+        val connectOnForgeHost: DefaultAtlassianHost = if (host.installationId.isDefined) host else host.copy(installationId = Some("mock-installation-id"))
         withEvolutions {
           await {
-            hostRepo.save(host)
+            hostRepo.save(connectOnForgeHost)
           }
 
           await {
-            hostRepo.findByInstallationId(host.installationId.get)
-          } mustBe Some(host)
+            hostRepo.findByInstallationId(connectOnForgeHost.installationId.get)
+          } mustBe Some(connectOnForgeHost)
         }
       }
 

diff --git a/...st/scala/io/toolsplus/atlassian/connect/play/slick/SlickAtlassianHostRepositorySpec.scala b/...st/scala/io/toolsplus/atlassian/connect/play/slick/SlickAtlassianHostRepositorySpec.scala
@@ -1,5 +1,6 @@
 package io.toolsplus.atlassian.connect.play.slick
 
+import io.toolsplus.atlassian.connect.play.api.models.DefaultAtlassianHost
 import io.toolsplus.atlassian.connect.play.slick.fixtures.AtlassianHostFixture
 import org.scalacheck.Gen._
 import org.scalatestplus.play.guice.GuiceOneAppPerTest
@@ -77,14 +78,15 @@ class SlickAtlassianHostRepositorySpec
       }
 
       "find the inserted host by installation id" in new AtlassianHostFixture {
+        val connectOnForgeHost: DefaultAtlassianHost = if (host.installationId.isDefined) host else host.copy(installationId = Some("mock-installation-id"))
         withEvolutions {
           await {
-            hostRepo.save(host)
+            hostRepo.save(connectOnForgeHost)
           }
 
           await {
-            hostRepo.findByInstallationId(host.installationId.get)
-          } mustBe Some(host)
+            hostRepo.findByInstallationId(connectOnForgeHost.installationId.get)
+          } mustBe Some(connectOnForgeHost)
         }
       }
     }