Merge pull request #5 from browserstack/minor-code-fixes

Removing the specific capabilities functionality

Author: anirudha13

pom.xml

@@ -8,6 +8,7 @@
 
 
     <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
         <maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>

src/test/java/com/browserstack/examples/core/ManagedWebDriver.java

@@ -3,7 +3,6 @@
 import org.openqa.selenium.WebDriver;
 
 import com.browserstack.examples.core.config.Platform;
-import com.browserstack.examples.core.WebDriverFactory;
 
 /**
  * Created with IntelliJ IDEA.
@@ -31,10 +30,9 @@ public String getTestName() {
     }
 
     public WebDriver getWebDriver() {
-        String[] specificCapabilities = new String[0];
 
         if (this.webDriver == null) {
-            this.webDriver = this.webDriverFactory.createWebDriverForPlatform(platform, testName, specificCapabilities);
+            this.webDriver = this.webDriverFactory.createWebDriverForPlatform(platform, testName);
         }
         return this.webDriver;
     }

src/test/java/com/browserstack/examples/core/WebDriverFactory.java

@@ -4,7 +4,6 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.nio.file.Paths;
-import java.util.Arrays;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -103,17 +102,10 @@ private WebDriverConfiguration parseWebDriverConfig() {
         return webDriverConfiguration;
     }
 
-    public WebDriver createWebDriverForPlatform(Platform platform, String testName, String[] specificCapabilitiesKeys) {
+    public WebDriver createWebDriverForPlatform(Platform platform, String testName) {
         WebDriver webDriver = null;
         try {
             Map<String, Object> specificCapabilitiesMap = new LinkedHashMap<>();
-            if (webDriverConfiguration.getSpecificCapabilities() != null && specificCapabilitiesKeys.length > 0) {
-                Arrays.stream(specificCapabilitiesKeys)
-                  .forEach(specificCapabilityKey -> webDriverConfiguration
-                                                      .getSpecificCapabilities()
-                                                      .getSpecificCapabilities(specificCapabilityKey)
-                                                      .forEach(caps -> caps.getCapabilityMap().forEach(specificCapabilitiesMap::put)));
-            }
             switch (this.webDriverConfiguration.getDriverType()) {
                 case onPremDriver:
                     webDriver = createOnPremWebDriver(platform, specificCapabilitiesMap);

src/test/java/com/browserstack/examples/core/config/SpecificCapabilities.java

@@ -25,9 +25,6 @@ public class WebDriverConfiguration {
     @JsonProperty("cloudDriver")
     private RemoteDriverConfig cloudDriverConfig;
 
-    @JsonProperty("specific_capabilities")
-    private SpecificCapabilities specificCapabilities;
-
     public List<Platform> getActivePlatforms() {
         List<Platform> activePlatforms = Collections.emptyList();
         switch (driverType) {
@@ -83,12 +80,4 @@ public RemoteDriverConfig getCloudDriverConfig() {
     public void setCloudDriverConfig(RemoteDriverConfig cloudDriverConfig) {
         this.cloudDriverConfig = cloudDriverConfig;
     }
-
-    public SpecificCapabilities getSpecificCapabilities() {
-        return specificCapabilities;
-    }
-
-    public void setSpecificCapabilities(SpecificCapabilities specificCapabilities) {
-        this.specificCapabilities = specificCapabilities;
-    }
 }

src/test/java/com/browserstack/examples/core/config/WebDriverConfiguration.java

@@ -54,15 +54,3 @@ cloudDriver:
 #      os_version: '13.0'
 #      device: iPhone XS
 #      real_mobile: true
-
-specific_capabilities:
-  apply_auth_mask:
-    - browserstack.maskBasicAuth: true
-  apply_command_mask:
-    - browserstack.maskCommands: setValues, getValues, setCookies, getCookies
-  debug_test:
-    - browserstack.debug: true
-      browserstack.console: verbose
-      browserstack.networkLogs: true
-      browserstack.video: true
-      browserstack.seleniumLogs: true