From 7042689340a3aa84fbd294fb55409afd64f2e29f Mon Sep 17 00:00:00 2001 From: Jj! Date: Tue, 12 Mar 2019 14:58:58 -0500 Subject: [PATCH] [NOJIRA] update test configuration --- .../tier/shibboleth/admin/ui/SeleniumSIDETest.groovy | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/backend/src/integration/groovy/edu/internet2/tier/shibboleth/admin/ui/SeleniumSIDETest.groovy b/backend/src/integration/groovy/edu/internet2/tier/shibboleth/admin/ui/SeleniumSIDETest.groovy index bc74994a7..a1640322d 100644 --- a/backend/src/integration/groovy/edu/internet2/tier/shibboleth/admin/ui/SeleniumSIDETest.groovy +++ b/backend/src/integration/groovy/edu/internet2/tier/shibboleth/admin/ui/SeleniumSIDETest.groovy @@ -3,8 +3,6 @@ package edu.internet2.tier.shibboleth.admin.ui import jp.vmi.selenium.selenese.Main import jp.vmi.selenium.selenese.Runner import jp.vmi.selenium.selenese.config.DefaultConfig -import org.openqa.selenium.remote.DesiredCapabilities -import org.openqa.selenium.remote.RemoteWebDriver import org.springframework.beans.factory.annotation.Value import org.springframework.boot.test.context.SpringBootTest import org.springframework.test.annotation.DirtiesContext @@ -32,10 +30,10 @@ class SeleniumSIDETest extends Specification { it.driver = System.properties.getProperty('webdriver.driver') } else { it.driver = 'remote' - it.remoteUrl = 'http://localhost:4444/wd/hub' + it.remoteUrl = 'http://selenium-hub:4444/wd/hub' it.remoteBrowser = 'firefox' } - it.baseurl = "http://localhost:${this.randomPort}" + it.baseurl = "http://jenkins:${this.randomPort}" it } def runner = new Runner() @@ -56,8 +54,12 @@ class SeleniumSIDETest extends Specification { def config = new DefaultConfig([] as String[]).with { if (System.properties.getProperty('webdriver.driver')) { it.driver = System.properties.getProperty('webdriver.driver') + } else { + it.driver = 'remote' + it.remoteUrl = 'http://selenium-hub:4444/wd/hub' + it.remoteBrowser = 'firefox' } - it.baseurl = "http://localhost:${this.randomPort}" + it.baseurl = "http://jenkins:${this.randomPort}" it } def runner = new Runner()