Adding a method to enable insecure cert support via FirefoxOptions

Author: barancev

java/client/src/org/openqa/selenium/firefox/FirefoxOptions.java

@@ -22,6 +22,7 @@
 import static org.openqa.selenium.firefox.FirefoxDriver.MARIONETTE;
 import static org.openqa.selenium.firefox.FirefoxDriver.PROFILE;
 import static org.openqa.selenium.remote.BrowserType.FIREFOX;
+import static org.openqa.selenium.remote.CapabilityType.ACCEPT_INSECURE_CERTS;
 import static org.openqa.selenium.remote.CapabilityType.ACCEPT_SSL_CERTS;
 import static org.openqa.selenium.remote.CapabilityType.BROWSER_NAME;
 import static org.openqa.selenium.remote.CapabilityType.LOGGING_PREFS;
@@ -413,6 +414,11 @@ public FirefoxOptions setUnhandledPromptBehaviour(UnexpectedAlertBehaviour behav
     return this;
   }
 
+  public FirefoxOptions setAcceptInsecureCerts(boolean acceptInsecureCerts) {
+    desiredCapabilities.setCapability(ACCEPT_INSECURE_CERTS, acceptInsecureCerts);
+    return this;
+  }
+
   public FirefoxOptions addCapabilities(Capabilities capabilities) {
     return validateAndAmendUsing(this.desiredCapabilities, capabilities);
   }

java/client/test/org/openqa/selenium/firefox/MarionetteTest.java

@@ -28,6 +28,9 @@
 
 import org.junit.After;
 import org.junit.Test;
+import org.openqa.selenium.Capabilities;
+import org.openqa.selenium.PageLoadStrategy;
+import org.openqa.selenium.UnexpectedAlertBehaviour;
 import org.openqa.selenium.remote.CapabilityType;
 import org.openqa.selenium.remote.DesiredCapabilities;
 import org.openqa.selenium.testing.Ignore;
@@ -211,6 +214,25 @@ public void canSetPreferencesAndProfileInFirefoxOptions() {
     verifyItIsMarionette(localDriver);
   }
 
+  @Test
+  public void canSetPageLoadStrategyViaOptions() {
+    localDriver = new FirefoxDriver(
+        new FirefoxOptions().setPageLoadStrategy(PageLoadStrategy.NONE));
+
+    verifyItIsMarionette(localDriver);
+    assertEquals(localDriver.getCapabilities()
+                     .getCapability(CapabilityType.PAGE_LOAD_STRATEGY), "none");
+  }
+
+  @Test
+  public void canSetInsecureCertSupportViaOptions() {
+    localDriver = new FirefoxDriver(new FirefoxOptions().setAcceptInsecureCerts(true));
+
+    verifyItIsMarionette(localDriver);
+    assertEquals(localDriver.getCapabilities()
+                     .getCapability(CapabilityType.ACCEPT_INSECURE_CERTS), true);
+  }
+
   private void verifyItIsMarionette(FirefoxDriver driver) {
     assertNotNull(
         Optional.ofNullable(driver.getCapabilities().getCapability("moz:processID"))