diff --git a/openvidu-test-browsers/pom.xml b/openvidu-test-browsers/pom.xml index f3dc1b1a..a398970a 100644 --- a/openvidu-test-browsers/pom.xml +++ b/openvidu-test-browsers/pom.xml @@ -77,16 +77,6 @@ selenium-java ${version.selenium} - - org.seleniumhq.selenium - selenium-chrome-driver - ${version.selenium} - - - org.seleniumhq.selenium - selenium-firefox-driver - ${version.selenium} - com.google.code.gson gson @@ -100,7 +90,7 @@ junit junit - 4.13.1 + ${version.junit} test 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 6c3b39b2..7048077a 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 @@ -22,6 +22,7 @@ import java.net.URL; import org.openqa.selenium.UnexpectedAlertBehaviour; import org.openqa.selenium.firefox.FirefoxDriver; +import org.openqa.selenium.firefox.FirefoxOptions; import org.openqa.selenium.firefox.FirefoxProfile; import org.openqa.selenium.remote.CapabilityType; import org.openqa.selenium.remote.DesiredCapabilities; @@ -54,7 +55,7 @@ public class FirefoxUser extends BrowserUser { } } else { log.info("Using local web driver"); - this.driver = new FirefoxDriver(capabilities); + this.driver = new FirefoxDriver(new FirefoxOptions(capabilities)); } this.configureDriver(); 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 0de43097..eb56e400 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 @@ -4,10 +4,8 @@ import java.net.MalformedURLException; import java.net.URL; import java.util.concurrent.TimeUnit; -import org.openqa.selenium.UnexpectedAlertBehaviour; import org.openqa.selenium.opera.OperaDriver; import org.openqa.selenium.opera.OperaOptions; -import org.openqa.selenium.remote.CapabilityType; import org.openqa.selenium.remote.DesiredCapabilities; import org.openqa.selenium.remote.RemoteWebDriver; @@ -16,27 +14,28 @@ public class OperaUser extends BrowserUser { public OperaUser(String userName, int timeOfWaitInSeconds) { super(userName, timeOfWaitInSeconds); - OperaOptions options = new OperaOptions(); - options.setBinary("/usr/bin/opera"); DesiredCapabilities capabilities = DesiredCapabilities.operaBlink(); capabilities.setAcceptInsecureCerts(true); - capabilities.setCapability(CapabilityType.UNEXPECTED_ALERT_BEHAVIOUR, UnexpectedAlertBehaviour.IGNORE); - + OperaOptions options = new OperaOptions(); + // This flag avoids to grant the user media options.addArguments("--use-fake-ui-for-media-stream"); + // This flag fakes user media with synthetic video options.addArguments("--use-fake-device-for-media-stream"); - capabilities.setCapability(OperaOptions.CAPABILITY, options); + // This flag selects the entire screen as video source when screen sharing + options.addArguments("--auto-select-desktop-capture-source=Entire screen"); + options.merge(capabilities); String REMOTE_URL = System.getProperty("REMOTE_URL_OPERA"); if (REMOTE_URL != null) { log.info("Using URL {} to connect to remote web driver", REMOTE_URL); try { - this.driver = new RemoteWebDriver(new URL(REMOTE_URL), capabilities); + this.driver = new RemoteWebDriver(new URL(REMOTE_URL), options); } catch (MalformedURLException e) { e.printStackTrace(); } } else { log.info("Using local web driver"); - this.driver = new OperaDriver(capabilities); + this.driver = new OperaDriver(options); } this.driver.manage().timeouts().setScriptTimeout(this.timeOfWaitInSeconds, TimeUnit.SECONDS); diff --git a/openvidu-test-e2e/pom.xml b/openvidu-test-e2e/pom.xml index f2eabf8c..3c74d227 100644 --- a/openvidu-test-e2e/pom.xml +++ b/openvidu-test-e2e/pom.xml @@ -91,18 +91,6 @@ ${version.selenium} test - - org.seleniumhq.selenium - selenium-chrome-driver - ${version.selenium} - test - - - org.seleniumhq.selenium - selenium-firefox-driver - ${version.selenium} - test - org.seleniumhq.selenium selenium-api @@ -123,7 +111,7 @@ org.jcodec jcodec-javase - 0.2.3 + ${version.jcodec} test diff --git a/pom.xml b/pom.xml index ed5de35f..e3c536da 100644 --- a/pom.xml +++ b/pom.xml @@ -58,6 +58,7 @@ 1.7.30 2.8.6 1.4.9 + 0.2.5 4.2.2