diff options
| author | Martin Stockhammer <martin_s@apache.org> | 2017-11-04 12:04:19 +0100 |
|---|---|---|
| committer | Martin Stockhammer <martin_s@apache.org> | 2017-11-04 12:04:19 +0100 |
| commit | 77c375434fcac4ab41a539a4aa1ab05c43b5b6ed (patch) | |
| tree | 2e715f57f3dc07803c750b140262566d41f84f58 | |
| parent | 8b3de94f7738c897acdc7d18bed1f0fa9bd90c0f (diff) | |
| download | archiva-77c375434fcac4ab41a539a4aa1ab05c43b5b6ed.tar.gz archiva-77c375434fcac4ab41a539a4aa1ab05c43b5b6ed.zip | |
Fixing window size issues with selenium driver
| -rw-r--r-- | archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/parent/AbstractSeleniumTest.java | 3 | ||||
| -rw-r--r-- | src/ci/scripts/container_webtest.sh | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/parent/AbstractSeleniumTest.java b/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/parent/AbstractSeleniumTest.java index f7d979973..082c4b373 100644 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/parent/AbstractSeleniumTest.java +++ b/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/parent/AbstractSeleniumTest.java @@ -87,8 +87,8 @@ public abstract class AbstractSeleniumTest p.load( this.getClass().getClassLoader().getResourceAsStream( "test.properties" ) ); baseUrl = WebdriverUtility.getBaseUrl()+"/index.html?request_lang=en"; - open( baseUrl, browser, seleniumHost, seleniumPort, maxWaitTimeInMs, remoteSelenium ); + getWebDriver().manage().window().maximize(); assertAdminCreated(); } @@ -149,7 +149,6 @@ public abstract class AbstractSeleniumTest { open( baseUrl, browser, seleniumHost, seleniumPort, maxWaitTimeInMs, remoteSelenium); - loadPage(baseUrl, 30); WebDriverWait wait = new WebDriverWait(getWebDriver(),30); wait.until(ExpectedConditions.presenceOfElementLocated(By.id("topbar-menu"))); diff --git a/src/ci/scripts/container_webtest.sh b/src/ci/scripts/container_webtest.sh index e2268e301..b80845598 100644 --- a/src/ci/scripts/container_webtest.sh +++ b/src/ci/scripts/container_webtest.sh @@ -61,7 +61,7 @@ function stop_instance() { function start_instance() { echo "Starting container ${INSTANCE_NAME}" - docker run -d --net="${NETWORK_TYPE}" -p "${PORT_MAPPING}" --name "${INSTANCE_NAME}" "${TAG}" + docker run -d -e "SCREEN_WIDTH=${SCREEN_WIDTH}" -e "SCREEN_HEIGHT=${SCREEN_HEIGHT}" --net="${NETWORK_TYPE}" -p "${PORT_MAPPING}" --name "${INSTANCE_NAME}" "${TAG}" } function print_usage() { |