Sync WebDriver options for E2E and integration tests

Author: tyranron

Makefile

@@ -1153,7 +1153,7 @@ docker-up-e2e-env = RUST_BACKTRACE=1 \
 			$(CHROME_VERSION) )) \
 	COMPOSE_WEBDRIVER_ENTRYPOINT=$(strip \
 		$(if $(call eq,$(browser),firefox),\
-			"geckodriver --binary=/opt/firefox/firefox" ,\
+			"geckodriver --binary=/opt/firefox/firefox --log=debug" ,\
 			"sh -c \"/opt/bin/start-xvfb.sh 2>/dev/null & \
 			         exec chromedriver --port=4444 --allowed-ips='' \
 			                                       --allowed-origins='*'\"" ))
@@ -1219,7 +1219,7 @@ ifeq ($(browser),firefox)
 	docker run --rm -d --network=host --shm-size 512m \
 		--name medea-webdriver-firefox \
 		ghcr.io/instrumentisto/geckodriver:$(FIREFOX_VERSION) \
-			--binary=/opt/firefox/firefox
+			--binary=/opt/firefox/firefox --log=debug
 else
 	docker run --rm -d --network=host --shm-size 512m \
 		--name medea-webdriver-chrome --entrypoint sh \

e2e/src/browser/client.rs

@@ -18,18 +18,6 @@ use tokio::task;
 
 use super::{js::Statement, Error, Result};
 
-/// Arguments for Chrome browser.
-const CHROME_ARGS: &[&str] = &[
-    "--use-fake-device-for-media-stream",
-    "--use-fake-ui-for-media-stream",
-    "--disable-web-security",
-    "--disable-dev-shm-usage",
-    "--no-sandbox",
-];
-
-/// Arguments for Firefox browser.
-const FIREFOX_ARGS: &[&str] = &[];
-
 /// Result returned from all the JS code executed in a browser.
 #[derive(Debug, Deserialize)]
 #[serde(rename_all = "lowercase")]
@@ -337,30 +325,42 @@ pub struct AutoCapabilities {
 impl AutoCapabilities {
     /// Returns `moz:firefoxOptions` for a Firefox browser.
     fn firefox(self) -> serde_json::Value {
-        let mut args = FIREFOX_ARGS.to_vec();
+        let mut args = Vec::new();
         if self.headless_firefox {
             args.push("--headless");
         }
         json!({
             "prefs": {
-                "media.navigator.streams.fake": true,
                 "media.navigator.permission.disabled": true,
-                "media.autoplay.enabled": true,
-                "media.autoplay.enabled.user-gestures-needed ": false,
+                "media.navigator.streams.fake": true,
                 "media.autoplay.ask-permission": false,
                 "media.autoplay.default": 0,
+                "media.autoplay.enabled": true,
+                "media.autoplay.enabled.user-gestures-needed": false,
             },
             "args": args,
         })
     }
 
     /// Returns `goog:chromeOptions` for a Chrome browser.
     fn chrome(self) -> serde_json::Value {
-        let mut args = CHROME_ARGS.to_vec();
+        let mut args = [
+            "--disable-browser-side-navigation",
+            "--disable-dev-shm-usage",
+            "--disable-extensions",
+            "--disable-gpu",
+            "--disable-web-security",
+            "--dns-prefetch-disable",
+            "--no-sandbox",
+            "--use-fake-device-for-media-stream",
+            "--use-fake-ui-for-media-stream",
+            "--window-size=1920,1080",
+        ]
+        .to_vec();
         if self.headless_chrome {
             args.push("--headless");
         }
-        json!({ "args": args })
+        json!({"args": args})
     }
 }
 

webdriver.json

@@ -1,8 +1,12 @@
 {
   "moz:firefoxOptions": {
     "prefs": {
+      "media.navigator.permission.disabled": true,
       "media.navigator.streams.fake": true,
-      "media.navigator.permission.disabled": true
+      "media.autoplay.ask-permission": false,
+      "media.autoplay.default": 0,
+      "media.autoplay.enabled": true,
+      "media.autoplay.enabled.user-gestures-needed": false
     },
     "args": []
   },
@@ -12,6 +16,7 @@
       "--disable-dev-shm-usage",
       "--disable-extensions",
       "--disable-gpu",
+      "--disable-web-security",
       "--dns-prefetch-disable",
       "--no-sandbox",
       "--use-fake-device-for-media-stream",