Merge branch 'trunk' into py-bidi-storage

Author: shbenzer

.skipped-tests

@@ -22,7 +22,6 @@
 -//javascript/selenium-webdriver:test-builder-test.js-chrome
 -//javascript/selenium-webdriver:test-chrome-devtools-test.js-chrome
 -//javascript/selenium-webdriver:test-firefox-options-test.js-firefox
--//javascript/selenium-webdriver:test-lib-capabilities-test.js-chrome
 -//rb/spec/integration/selenium/webdriver/chrome:service-chrome
 -//rb/spec/integration/selenium/webdriver/chrome:service-chrome-bidi
 -//rb/spec/integration/selenium/webdriver/chrome:service-chrome-remote

java/test/org/openqa/selenium/bidi/storage/BUILD.bazel

@@ -8,6 +8,7 @@ java_selenium_test_suite(
     browsers = [
         "chrome",
         "firefox",
+        "edge",
     ],
     tags = [
         "selenium-remote",

java/test/org/openqa/selenium/bidi/storage/StorageCommandsTest.java

@@ -63,7 +63,6 @@ public void setUp() {
   }
 
   @Test
-  @NotYetImplemented(EDGE)
   public void canGetCookieByName() {
     String key = generateUniqueKey();
     String value = "set";
@@ -124,7 +123,6 @@ public void canGetCookieInDefaultUserContext() {
   }
 
   @Test
-  @NotYetImplemented(EDGE)
   public void canGetCookieInAUserContext() {
     Browser browser = new Browser(driver);
     String userContext = browser.createUserContext();
@@ -177,7 +175,6 @@ key, new BytesValue(BytesValue.Type.STRING, value), appServer.getHostName()),
   }
 
   @Test
-  @NotYetImplemented(EDGE)
   public void canAddCookie() {
     String key = generateUniqueKey();
     String value = "foo";
@@ -289,7 +286,6 @@ public void canGetAllCookies() {
   }
 
   @Test
-  @NotYetImplemented(EDGE)
   public void canDeleteAllCookies() {
     addCookieOnServerSide(new Cookie("foo", "set"));
     assertSomeCookiesArePresent();
@@ -303,7 +299,6 @@ public void canDeleteAllCookies() {
   }
 
   @Test
-  @NotYetImplemented(EDGE)
   public void canDeleteCookieWithName() {
     String key1 = generateUniqueKey();
     String key2 = generateUniqueKey();
@@ -325,7 +320,6 @@ public void canDeleteCookieWithName() {
   }
 
   @Test
-  @NotYetImplemented(EDGE)
   public void testAddCookiesWithDifferentPathsThatAreRelatedToOurs() {
     driver.get(appServer.whereIs("/common/animals"));
 

javascript/selenium-webdriver/test/firefox/options_test.js

@@ -63,7 +63,7 @@ suite(
 
         describe('setProfile', function () {
           it('use profile with custom prefs', async function () {
-            let options = new firefox.Options()
+            let options = env.builder().getFirefoxOptions() || new firefox.Options()
             options.setProfile(profileWithUserPrefs)
 
             driver = env.builder().setFirefoxOptions(options).build()
@@ -73,7 +73,7 @@ suite(
           })
 
           it('use profile with extension', async function () {
-            let options = new firefox.Options()
+            let options = env.builder().getFirefoxOptions() || new firefox.Options()
             options.setProfile(profileWithWebExtension)
 
             driver = env.builder().setFirefoxOptions(options).build()
@@ -116,7 +116,7 @@ suite(
           })
 
           it('can start Firefox with custom preferences', async function () {
-            let options = new firefox.Options()
+            let options = env.builder().getFirefoxOptions() || new firefox.Options()
             options.setPreference('general.useragent.override', 'foo;bar')
 
             driver = env.builder().setFirefoxOptions(options).build()
@@ -126,9 +126,9 @@ suite(
           })
 
           it('can add extra prefs on top of an existing profile', async function () {
-            let options = new firefox.Options()
-              .setPreference('general.useragent.override', 'foo;bar')
-              .setProfile(profileWithWebExtension)
+            let options = env.builder().getFirefoxOptions() || new firefox.Options()
+            options.setPreference('general.useragent.override', 'foo;bar')
+            options.setProfile(profileWithWebExtension)
 
             driver = env.builder().setFirefoxOptions(options).build()
 
@@ -140,7 +140,7 @@ suite(
 
         describe('addExtensions', function () {
           it('can add extension to brand new profile', async function () {
-            let options = new firefox.Options()
+            let options = env.builder().getFirefoxOptions() || new firefox.Options()
             options.addExtensions(EXT_XPI)
 
             driver = env.builder().setFirefoxOptions(options).build()
@@ -150,7 +150,8 @@ suite(
           })
 
           it('can add extension to custom profile', async function () {
-            let options = new firefox.Options().addExtensions(EXT_XPI).setProfile(profileWithUserPrefs)
+            let options = env.builder().getFirefoxOptions() || new firefox.Options()
+            options.addExtensions(EXT_XPI).setProfile(profileWithUserPrefs)
 
             driver = env.builder().setFirefoxOptions(options).build()
 
@@ -160,9 +161,9 @@ suite(
           })
 
           it('can addExtensions and setPreference', async function () {
-            let options = new firefox.Options()
-              .addExtensions(EXT_XPI)
-              .setPreference('general.useragent.override', 'foo;bar')
+            let options = env.builder().getFirefoxOptions() || new firefox.Options()
+            options.addExtensions(EXT_XPI)
+            options.setPreference('general.useragent.override', 'foo;bar')
 
             driver = env.builder().setFirefoxOptions(options).build()
 
@@ -172,7 +173,7 @@ suite(
           })
 
           it('can load .zip webextensions', async function () {
-            let options = new firefox.Options()
+            let options = env.builder().getFirefoxOptions() || new firefox.Options()
             options.addExtensions(EXT_XPI)
 
             driver = env.builder().setFirefoxOptions(options).build()

javascript/selenium-webdriver/test/lib/capabilities_test.js

@@ -142,7 +142,7 @@ test.suite(function (env) {
     .it(
       'should fail to upload files to a non interactable input when StrictFileInteractability is on',
       async function () {
-        const options = new chrome.Options()
+        const options = env.builder().getChromeOptions() || new chrome.Options()
         options.setStrictFileInteractability(true)
         const driver = env.builder().setChromeOptions(options).build()
 
@@ -181,7 +181,7 @@ test.suite(function (env) {
         return fp
       })
 
-      const options = new chrome.Options()
+      const options = env.builder().getChromeOptions() || new chrome.Options()
       options.setStrictFileInteractability(false)
       const driver = env.builder().setChromeOptions(options).build()