From e619fd06f81c717454bcd56eeca4ba2f989ce081 Mon Sep 17 00:00:00 2001 From: pabloFuente Date: Fri, 5 Nov 2021 00:39:09 +0100 Subject: [PATCH] openvidu-test-browsers: set dimensions manually --- .../main/java/io/openvidu/test/browsers/BrowserUser.java | 9 ++++++++- .../main/java/io/openvidu/test/browsers/ChromeUser.java | 2 +- .../main/java/io/openvidu/test/browsers/EdgeUser.java | 2 +- .../main/java/io/openvidu/test/browsers/FirefoxUser.java | 2 +- .../main/java/io/openvidu/test/browsers/OperaUser.java | 2 +- openvidu-test-e2e/jenkins/Jenkinsfile | 2 +- 6 files changed, 13 insertions(+), 6 deletions(-) diff --git a/openvidu-test-browsers/src/main/java/io/openvidu/test/browsers/BrowserUser.java b/openvidu-test-browsers/src/main/java/io/openvidu/test/browsers/BrowserUser.java index beaffa8e..dfb339f4 100644 --- a/openvidu-test-browsers/src/main/java/io/openvidu/test/browsers/BrowserUser.java +++ b/openvidu-test-browsers/src/main/java/io/openvidu/test/browsers/BrowserUser.java @@ -20,6 +20,7 @@ package io.openvidu.test.browsers; import java.time.Duration; import java.time.temporal.ChronoUnit; +import org.openqa.selenium.Dimension; import org.openqa.selenium.WebDriver; import org.openqa.selenium.support.ui.ExpectedCondition; import org.openqa.selenium.support.ui.WebDriverWait; @@ -61,7 +62,13 @@ public class BrowserUser { protected void configureDriver() { this.waiter = new WebDriverWait(this.driver, Duration.ofSeconds(timeOfWaitInSeconds)); - this.driver.manage().window().setSize(new org.openqa.selenium.Dimension(1920, 1080)); + } + + protected void configureDriver(Dimension windowDimensions) { + this.configureDriver(); + if (windowDimensions != null) { + this.driver.manage().window().setSize(windowDimensions); + } } public void dispose() { diff --git a/openvidu-test-browsers/src/main/java/io/openvidu/test/browsers/ChromeUser.java b/openvidu-test-browsers/src/main/java/io/openvidu/test/browsers/ChromeUser.java index c74e5a30..0fefdc11 100644 --- a/openvidu-test-browsers/src/main/java/io/openvidu/test/browsers/ChromeUser.java +++ b/openvidu-test-browsers/src/main/java/io/openvidu/test/browsers/ChromeUser.java @@ -72,7 +72,7 @@ public class ChromeUser extends BrowserUser { } this.driver.manage().timeouts().scriptTimeout(Duration.ofSeconds(timeOfWaitInSeconds)); - this.configureDriver(); + this.configureDriver(new org.openqa.selenium.Dimension(1920, 1080)); } private static ChromeOptions generateDefaultScreenChromeOptions(boolean runningAsRoot) { diff --git a/openvidu-test-browsers/src/main/java/io/openvidu/test/browsers/EdgeUser.java b/openvidu-test-browsers/src/main/java/io/openvidu/test/browsers/EdgeUser.java index f682b1bd..12fe6884 100644 --- a/openvidu-test-browsers/src/main/java/io/openvidu/test/browsers/EdgeUser.java +++ b/openvidu-test-browsers/src/main/java/io/openvidu/test/browsers/EdgeUser.java @@ -37,7 +37,7 @@ public class EdgeUser extends BrowserUser { } this.driver.manage().timeouts().scriptTimeout(Duration.ofSeconds(timeOfWaitInSeconds)); - this.configureDriver(); + this.configureDriver(new org.openqa.selenium.Dimension(1920, 1080)); } } diff --git a/openvidu-test-browsers/src/main/java/io/openvidu/test/browsers/FirefoxUser.java b/openvidu-test-browsers/src/main/java/io/openvidu/test/browsers/FirefoxUser.java index 1ea88489..ebce261f 100644 --- a/openvidu-test-browsers/src/main/java/io/openvidu/test/browsers/FirefoxUser.java +++ b/openvidu-test-browsers/src/main/java/io/openvidu/test/browsers/FirefoxUser.java @@ -68,7 +68,7 @@ public class FirefoxUser extends BrowserUser { } this.driver.manage().timeouts().scriptTimeout(Duration.ofSeconds(timeOfWaitInSeconds)); - this.configureDriver(); + this.configureDriver(new org.openqa.selenium.Dimension(1920, 1080)); } } \ No newline at end of file diff --git a/openvidu-test-browsers/src/main/java/io/openvidu/test/browsers/OperaUser.java b/openvidu-test-browsers/src/main/java/io/openvidu/test/browsers/OperaUser.java index 73b8cbd0..b68f89c1 100644 --- a/openvidu-test-browsers/src/main/java/io/openvidu/test/browsers/OperaUser.java +++ b/openvidu-test-browsers/src/main/java/io/openvidu/test/browsers/OperaUser.java @@ -37,7 +37,7 @@ public class OperaUser extends BrowserUser { } this.driver.manage().timeouts().scriptTimeout(Duration.ofSeconds(timeOfWaitInSeconds)); - this.configureDriver(); + this.configureDriver(new org.openqa.selenium.Dimension(1920, 1080)); } } diff --git a/openvidu-test-e2e/jenkins/Jenkinsfile b/openvidu-test-e2e/jenkins/Jenkinsfile index e7f998a4..6961d732 100644 --- a/openvidu-test-e2e/jenkins/Jenkinsfile +++ b/openvidu-test-e2e/jenkins/Jenkinsfile @@ -16,7 +16,7 @@ node('container') { '-v /opt/openvidu-cache/.m2:/root/.m2'].join(' ') // Run openvidu/openvidu-test-e2e container - docker.image("openvidu/openvidu-test-e2e:${DISTRO}").inside('--name e2e -p 4200:4200 -p 4443:4443 -p 5555:5555 -u root -e MY_UID=0 ' + "${bindsArray}" + ' --privileged') { + docker.image("openvidu/openvidu-test-e2e:${DISTRO}").inside('--privileged -p 4200:4200 -p 4443:4443 -p 5555:5555 -u root -e MY_UID=0 ' + "${bindsArray}") { stage('Build 1') { parallel 'OpenVidu Browser build': { stage('OpenVidu Browser build') {