#1862 #1866 remove usages of deprecated capability "acceptSslCerts"

selenide · Jun 24, 2022 · 524a8a5 · 524a8a5
1 parent 5fce548
commit 524a8a5
Show file tree

Hide file tree

Showing 8 changed files with 1 addition and 14 deletions.
diff --git a/src/main/java/com/codeborne/selenide/webdriver/AbstractDriverFactory.java b/src/main/java/com/codeborne/selenide/webdriver/AbstractDriverFactory.java
@@ -22,7 +22,6 @@
 import static java.lang.Integer.parseInt;
 import static org.apache.commons.lang3.StringUtils.isBlank;
 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_VERSION;
 import static org.openqa.selenium.remote.CapabilityType.PAGE_LOAD_STRATEGY;
 import static org.openqa.selenium.remote.CapabilityType.PROXY;
@@ -73,7 +72,6 @@ protected <T extends MutableCapabilities> T createCommonCapabilities(T capabilit
       capabilities.setCapability(BROWSER_VERSION, config.browserVersion());
     }
     capabilities.setCapability(PAGE_LOAD_STRATEGY, config.pageLoadStrategy());
-    capabilities.setCapability(ACCEPT_SSL_CERTS, true);
 
     if (browser.supportsInsecureCerts()) {
       capabilities.setCapability(ACCEPT_INSECURE_CERTS, true);

diff --git a/src/test/java/com/codeborne/selenide/impl/CleanupTest.java b/src/test/java/com/codeborne/selenide/impl/CleanupTest.java
@@ -21,7 +21,7 @@ void cleansWebDriverExceptionMessage() {
       "System info: os.name: 'Linux', os.arch: 'amd64', os.version: '3.5.0-23-generic', java.version: '1.7.0_10'\n" +
       "Session ID: 610138404f5c180a4f3153785e66c528\n" +
       "Driver info: org.openqa.selenium.chrome.ChromeDriver\n" +
-      "Capabilities [{platform=LINUX, chrome.chromedriverVersion=26.0.1383.0, acceptSslCerts=false, " +
+      "Capabilities [{platform=LINUX, chrome.chromedriverVersion=26.0.1383.0, " +
       "javascriptEnabled=true, browserName=chrome, rotatable=false, locationContextEnabled=false, " +
       "version=24.0.1312.56, cssSelectorsEnabled=true, databaseEnabled=false, handlesAlerts=true, " +
       "browserConnectionEnabled=false, webStorageEnabled=true, nativeEvents=true, applicationCacheEnabled=false, " +

diff --git a/src/test/java/com/codeborne/selenide/webdriver/ChromeDriverFactoryTest.java b/src/test/java/com/codeborne/selenide/webdriver/ChromeDriverFactoryTest.java
@@ -60,7 +60,6 @@ void mergesDefaultCapabilities() {
     ChromeOptions options = factory.createCapabilities(new SelenideConfig(), browser, null, new File("/tmp/downloads-folder-456789"));
 
     assertThat(options.getCapability("acceptInsecureCerts")).isEqualTo(TRUE);
-    assertThat(options.getCapability("acceptSslCerts")).isEqualTo(TRUE);
     assertThat(options.getCapability("browserName")).isEqualTo("chrome");
     assertThat(options.getCapability("javascriptEnabled")).isEqualTo(TRUE);
     assertThat(options.getCapability("takesScreenshot")).isEqualTo(TRUE);

diff --git a/src/test/java/com/codeborne/selenide/webdriver/CommonCapabilitiesTest.java b/src/test/java/com/codeborne/selenide/webdriver/CommonCapabilitiesTest.java
@@ -24,7 +24,6 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
 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.PAGE_LOAD_STRATEGY;
 
 final class CommonCapabilitiesTest {
@@ -37,7 +36,6 @@ void transferCapabilitiesFromConfiguration() {
     config.pageLoadStrategy("foo");
     Capabilities commonCapabilities = driverFactory.createCommonCapabilities(config, browser(config), proxy);
     assertThat(asBool(commonCapabilities.getCapability(ACCEPT_INSECURE_CERTS))).isTrue();
-    assertThat(asBool(commonCapabilities.getCapability(ACCEPT_SSL_CERTS))).isTrue();
     assertThat(commonCapabilities.getCapability(PAGE_LOAD_STRATEGY)).isEqualTo(config.pageLoadStrategy());
   }
 
@@ -51,7 +49,6 @@ void transferCapabilitiesFromConfigurationInternetExplorer() {
       browser(config),
       proxy);
     assertThat(asBool(commonCapabilities.getCapability(ACCEPT_INSECURE_CERTS))).isFalse();
-    assertThat(asBool(commonCapabilities.getCapability(ACCEPT_SSL_CERTS))).isTrue();
   }
 
   @Test
@@ -64,7 +61,6 @@ void transferCapabilitiesFromConfigurationIE() {
       browser(config),
       proxy);
     assertThat(asBool(commonCapabilities.getCapability(ACCEPT_INSECURE_CERTS))).isFalse();
-    assertThat(asBool(commonCapabilities.getCapability(ACCEPT_SSL_CERTS))).isTrue();
   }
 
   @Test
@@ -73,7 +69,6 @@ void transferCapabilitiesFromConfigurationEdge() {
     config.browser(EDGE);
     Capabilities commonCapabilities = driverFactory.createCommonCapabilities(new EdgeOptions(), config, browser(config), proxy);
     assertThat(asBool(commonCapabilities.getCapability(ACCEPT_INSECURE_CERTS))).isTrue();
-    assertThat(asBool(commonCapabilities.getCapability(ACCEPT_SSL_CERTS))).isTrue();
   }
 
   private boolean asBool(Object raw) {

diff --git a/src/test/java/com/codeborne/selenide/webdriver/EdgeDriverFactoryTest.java b/src/test/java/com/codeborne/selenide/webdriver/EdgeDriverFactoryTest.java
@@ -60,7 +60,6 @@ void mergesDefaultCapabilities() {
     EdgeOptions options = factory.createCapabilities(new SelenideConfig(), browser, null, new File("/tmp/downloads-folder-456789"));
 
     assertThat(options.getCapability("acceptInsecureCerts")).isEqualTo(TRUE);
-    assertThat(options.getCapability("acceptSslCerts")).isEqualTo(TRUE);
     assertThat(options.getCapability("browserName")).isEqualTo("MicrosoftEdge");
     assertThat(options.getCapability("javascriptEnabled")).isEqualTo(TRUE);
     assertThat(options.getCapability("takesScreenshot")).isEqualTo(TRUE);

diff --git a/src/test/java/com/codeborne/selenide/webdriver/FirefoxDriverFactoryTest.java b/src/test/java/com/codeborne/selenide/webdriver/FirefoxDriverFactoryTest.java
@@ -49,7 +49,6 @@ void mergesDefaultCapabilities() {
     FirefoxOptions options = driverFactory.createCapabilities(new SelenideConfig(), browser, null, null);
 
     assertThat(options.getCapability("acceptInsecureCerts")).isEqualTo(TRUE);
-    assertThat(options.getCapability("acceptSslCerts")).isEqualTo(TRUE);
     assertThat(options.getCapability("browserName")).isEqualTo("firefox");
     assertThat(options.getCapability("javascriptEnabled")).isEqualTo(TRUE);
     assertThat(options.getCapability("takesScreenshot")).isEqualTo(TRUE);

diff --git a/src/test/java/com/codeborne/selenide/webdriver/SafariDriverFactoryTest.java b/src/test/java/com/codeborne/selenide/webdriver/SafariDriverFactoryTest.java
@@ -36,7 +36,6 @@ void headlessCanNotBeSet() {
   void mergesDefaultCapabilities() {
     SafariOptions options = factory.createCapabilities(config, browser, null, new File("/tmp/downloads-folder-12345"));
     assertThat(options.getCapability("acceptInsecureCerts")).isEqualTo(TRUE);
-    assertThat(options.getCapability("acceptSslCerts")).isEqualTo(TRUE);
     assertThat(options.getCapability("browserName")).isEqualTo("safari");
     assertThat(options.getCapability("javascriptEnabled")).isEqualTo(TRUE);
     assertThat(options.getCapability("takesScreenshot")).isEqualTo(TRUE);

diff --git a/statics/src/test/java/integration/IntegrationTest.java b/statics/src/test/java/integration/IntegrationTest.java
@@ -28,7 +28,6 @@
 import static com.codeborne.selenide.WebDriverRunner.hasWebDriverStarted;
 import static com.codeborne.selenide.WebDriverRunner.isIE;
 import static org.openqa.selenium.remote.CapabilityType.ACCEPT_INSECURE_CERTS;
-import static org.openqa.selenium.remote.CapabilityType.ACCEPT_SSL_CERTS;
 
 @ExtendWith(ScreenShooterExtension.class)
 public abstract class IntegrationTest extends BaseIntegrationTest {
@@ -135,7 +134,6 @@ protected static FirefoxOptions addHeadless(FirefoxOptions options) {
   }
 
   private static void addSslErrorIgnoreOptions(MutableCapabilities options) {
-    options.setCapability(ACCEPT_SSL_CERTS, true);
     options.setCapability(ACCEPT_INSECURE_CERTS, true);
   }
 }