implement getting context from Firefox driver

SeleniumHQ · Sep 28, 2021 · b8caa25 · b8caa25
1 parent c66b1ea
commit b8caa25
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 18 deletions.
diff --git a/java/src/org/openqa/selenium/firefox/AddHasContext.java b/java/src/org/openqa/selenium/firefox/AddHasContext.java
@@ -35,10 +35,12 @@
 @AutoService({AdditionalHttpCommands.class, AugmenterProvider.class})
 public class AddHasContext implements AugmenterProvider<HasContext>, AdditionalHttpCommands {
 
-  public static final String CONTEXT = "context";
+  public static final String SET_CONTEXT = "setContext";
+  public static final String GET_CONTEXT = "getContext";
 
   private static final Map<String, CommandInfo> COMMANDS = ImmutableMap.of(
-    CONTEXT, new CommandInfo("/session/:sessionId/moz/context", HttpMethod.POST));
+    SET_CONTEXT, new CommandInfo("/session/:sessionId/moz/context", HttpMethod.POST),
+    GET_CONTEXT, new CommandInfo("/session/:sessionId/moz/context", HttpMethod.GET));
 
   @Override
   public Map<String, CommandInfo> getAdditionalCommands() {
@@ -63,8 +65,16 @@ public void setContext(FirefoxCommandContext context) {
         Require.nonNull("Firefox Command Context", context);
 
         executeMethod.execute(
-          CONTEXT,
-          ImmutableMap.of(CONTEXT, context));
+          SET_CONTEXT,
+          ImmutableMap.of("context", context));
+      }
+
+      @Override public FirefoxCommandContext getContext() {
+        String context = (String) executeMethod.execute(
+          GET_CONTEXT,
+          null);
+
+        return FirefoxCommandContext.fromString(context);
       }
     };
   }

diff --git a/java/src/org/openqa/selenium/firefox/FirefoxCommandContext.java b/java/src/org/openqa/selenium/firefox/FirefoxCommandContext.java
@@ -34,4 +34,15 @@ public enum FirefoxCommandContext {
   public String toString() {
     return String.valueOf(text);
   }
+
+  public static FirefoxCommandContext fromString(String text) {
+    if (text != null) {
+      for (FirefoxCommandContext b : FirefoxCommandContext.values()) {
+        if (text.equalsIgnoreCase(b.text)) {
+          return b;
+        }
+      }
+    }
+    return null;
+  }
 }
diff --git a/java/src/org/openqa/selenium/firefox/FirefoxDriver.java b/java/src/org/openqa/selenium/firefox/FirefoxDriver.java
@@ -296,6 +296,11 @@ public void setContext(FirefoxCommandContext commandContext) {
     context.setContext(commandContext);
   }
 
+  @Override
+  public FirefoxCommandContext getContext() {
+    return context.getContext();
+  }
+
   private static Boolean forceMarionetteFromSystemProperty() {
     String useMarionette = System.getProperty(SystemProperty.DRIVER_USE_MARIONETTE);
     if (useMarionette == null) {

diff --git a/java/src/org/openqa/selenium/firefox/HasContext.java b/java/src/org/openqa/selenium/firefox/HasContext.java
@@ -33,4 +33,11 @@ public interface HasContext {
    */
   void setContext(FirefoxCommandContext context);
 
+  /**
+   * Current context commands are operating on.
+   *
+   * @return {@link FirefoxCommandContext} value currently operating on commands
+   */
+  FirefoxCommandContext getContext();
+
 }
diff --git a/java/test/org/openqa/selenium/firefox/FirefoxDriverTest.java b/java/test/org/openqa/selenium/firefox/FirefoxDriverTest.java
@@ -516,21 +516,11 @@ public void canTakeFullPageScreenshot() {
 
   @Test
   public void canSetContext() {
-    FirefoxOptions options = new FirefoxOptions();
-    String dir = "foo/bar";
-    options.addPreference("browser.download.dir", dir);
-
-    // Need to set the preference to be able to read it
-    WebDriver driver = new WebDriverBuilder().get(options);
+    HasContext context = (HasContext) driver;
 
-    try {
-      ((HasContext) driver).setContext(FirefoxCommandContext.CHROME);
-      String result = (String) ((JavascriptExecutor) driver)
-        .executeScript("return Services.prefs.getStringPref('browser.download.dir')");
-      assertThat(result).isEqualTo(dir);
-    } finally {
-      driver.quit();
-    }
+    assertThat(context.getContext()).isEqualTo(FirefoxCommandContext.CONTENT);
+    context.setContext(FirefoxCommandContext.CHROME);
+    assertThat(context.getContext()).isEqualTo(FirefoxCommandContext.CHROME);
   }
 
   private static class CustomFirefoxProfile extends FirefoxProfile {}