Fix parameters in the test

octopusden · May 27, 2024 · 31d68f9 · 31d68f9
1 parent ac90e44
commit 31d68f9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/server/src/test/kotlin/org/octopusden/octopus/vcsfacade/vcs/VcsFacadeUnitTestBitbucket.kt b/server/src/test/kotlin/org/octopusden/octopus/vcsfacade/vcs/VcsFacadeUnitTestBitbucket.kt
@@ -1,13 +1,16 @@
 package org.octopusden.octopus.vcsfacade.vcs
 
 import org.octopusden.octopus.infastructure.bitbucket.test.BitbucketTestClient
+import org.octopusden.octopus.vcsfacade.BITBUCKET
+import org.octopusden.octopus.vcsfacade.Configuration
 import org.springframework.test.context.junit.jupiter.EnabledIf
 
 private const val VCS_HOST = "localhost:7990"
 
-@EnabledIf("#{environment.getActiveProfiles().$[#this == 'bitbucket'] == 'bitbucket'}", loadContext = true)
+@EnabledIf("#{environment.getActiveProfiles().$[#this == '$BITBUCKET'] == '$BITBUCKET'}", loadContext = true)
 class VcsFacadeUnitTestBitbucket : BaseVcsFacadeUnitTest(
-    BitbucketTestClient("http://$VCS_HOST", BITBUCKET_USER, BITBUCKET_PASSWORD),
+    BitbucketTestClient(
+        Configuration.model.bitbucket.url, BITBUCKET_USER, BITBUCKET_PASSWORD),
     "ssh://git@$VCS_HOST/%s/%s.git"
 ) {
     override val exceptionsMessageInfo: Map<String, String> by lazy {

diff --git a/test-common/src/main/resources/test-properties.yaml b/test-common/src/main/resources/test-properties.yaml
@@ -2,17 +2,19 @@ bitbucket:
   host: "bitbucket:7990"
   user: "admin"
   password: "admin"
-  url: "http://bitbucket:7990"
+  url: "http://localhost:7990"
 
 gitlab:
   host: "gitlab:8990"
   user: "root"
   password: "VomkaEa6PD1OIgY7dQVbPUuO8wi9RMCaZw/i9yPXcI0="
+  url: "http://localhost:8990"
 
 gitea:
   host: "gitea:3000"
   user: "test-admin"
   password: "test-admin"
+  url: "http://localhost:3000"
 
 vcsFacadeUrl: "http://vcs-facade:8080"