You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ma...@apache.org on 2017/11/04 11:05:10 UTC
archiva git commit: Fixing window size issues with selenium driver
Repository: archiva
Updated Branches:
refs/heads/master 8b3de94f7 -> 77c375434
Fixing window size issues with selenium driver
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/77c37543
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/77c37543
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/77c37543
Branch: refs/heads/master
Commit: 77c375434fcac4ab41a539a4aa1ab05c43b5b6ed
Parents: 8b3de94
Author: Martin Stockhammer <ma...@apache.org>
Authored: Sat Nov 4 12:04:19 2017 +0100
Committer: Martin Stockhammer <ma...@apache.org>
Committed: Sat Nov 4 12:04:19 2017 +0100
----------------------------------------------------------------------
.../org/apache/archiva/web/test/parent/AbstractSeleniumTest.java | 3 +--
src/ci/scripts/container_webtest.sh | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva/blob/77c37543/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/parent/AbstractSeleniumTest.java
----------------------------------------------------------------------
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 f7d9799..082c4b3 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")));
http://git-wip-us.apache.org/repos/asf/archiva/blob/77c37543/src/ci/scripts/container_webtest.sh
----------------------------------------------------------------------
diff --git a/src/ci/scripts/container_webtest.sh b/src/ci/scripts/container_webtest.sh
index e2268e3..b808455 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() {