SHIBUI-1281

Simple changes to get tests to work again. WIP.
TIER · Jul 1, 2019 · 03784f9 · 03784f9
1 parent bb34bcf
commit 03784f9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/backend/build.gradle b/backend/build.gradle
@@ -317,6 +317,6 @@ dockerRun {
     image 'unicon/shibui'
     ports '10101:8080'
     daemonize true
-    command '--spring.profiles.include=very-dangerous,dev'
+    command '--spring.profiles.include=very-dangerous,dev', '--shibui.default-password={noop}password'
     clean true
-}
+}
diff --git a/...end/src/integration/groovy/edu/internet2/tier/shibboleth/admin/ui/SeleniumSIDETest.groovy b/...end/src/integration/groovy/edu/internet2/tier/shibboleth/admin/ui/SeleniumSIDETest.groovy
@@ -14,7 +14,7 @@ import spock.lang.Unroll
 import java.nio.file.Paths
 
 //TODO: make config configurable
-@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = [ShibbolethUiApplication])
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT, classes = [ShibbolethUiApplication])
 @ActiveProfiles(['dev'])
 @DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD, methodMode = DirtiesContext.MethodMode.AFTER_METHOD)
 class SeleniumSIDETest extends Specification {
@@ -60,7 +60,11 @@ class SeleniumSIDETest extends Specification {
                 it.remoteUrl = 'http://selenium-hub:4444/wd/hub'
                 it.remoteBrowser = 'firefox'
             }
-            it.baseurl = "http://jenkins:${this.randomPort}"
+            if (System.properties.getProperty('selenium.host')) {
+                it.baseurl = System.properties.getProperty('selenium.host')
+            } else {
+                it.baseurl = "http://jenkins:${this.randomPort}"
+            }
             it
         }
         def runner = new Runner()