Remove 'personality' and 'pluginClass' from caps (#276)

Author: sbabcoc

src/main/java/com/nordstrom/automation/selenium/core/GridUtility.java

@@ -36,6 +36,7 @@
 import org.apache.http.entity.StringEntity;
 import org.apache.http.impl.client.HttpClientBuilder;
 import org.openqa.selenium.Capabilities;
+import org.openqa.selenium.MutableCapabilities;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.remote.RemoteWebDriver;
 import org.slf4j.Logger;
@@ -162,9 +163,30 @@ public static WebDriver getDriver(URL remoteAddress, Capabilities desiredCapabil
         // get constructor for RemoteWebDriver class corresponding to desired capabilities
         Constructor<RemoteWebDriver> ctor = getRemoteWebDriverCtor(config, desiredCapabilities);
 
+        Map<String, Object> capsMap = new HashMap<>(desiredCapabilities.asMap());
+        
+        // if capabilities contain 'nord:options'
+        if (capsMap.containsKey("nord:options")) {
+            // get map of custom options from capabilities
+            Map<String, Object> options = getNordOptions(desiredCapabilities);
+            // remove 'personality'
+            options.remove("personality");
+            // remove 'pluginClass'
+            options.remove("pluginClass");
+            // if options are empty
+            if (options.isEmpty()) {
+                // remove 'nord:options'
+                capsMap.remove("nord:options");
+            // otherwise (non-empty)
+            } else {
+                // update 'nord:options'
+                capsMap.put("nord:options", options);
+            }
+        }
+        
         try {
             // instantiate desired driver via configured grid
-            return ctor.newInstance(remoteAddress, desiredCapabilities);
+            return ctor.newInstance(remoteAddress, new MutableCapabilities(capsMap));
         } catch (InstantiationException | IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
             throw UncheckedThrow.throwUnchecked(e);
         }

src/main/java/com/nordstrom/automation/selenium/model/ContainerMethodInterceptor.java

@@ -130,11 +130,11 @@ public Object intercept(@This final Object obj, @Origin final Method method, @Al
             // if expecting page without load logic
             if (returnsPage && !detectsCompletion) {
                 try {
-                    // get stale wait reference element by CSS selector
-                    reference = driver.findElement(By.cssSelector("*"));
-                } catch (WebDriverException e) {
                     // get stale wait reference element by XPath
                     reference = driver.findElement(By.xpath("/*"));
+                } catch (WebDriverException e) {
+                    // get stale wait reference element by CSS selector
+                    reference = driver.findElement(By.cssSelector("*"));
                 }
             }
 

src/main/java/com/nordstrom/automation/selenium/model/RobustElementFactory.java

@@ -121,9 +121,9 @@ private static synchronized InstanceCreator getCreator(final WrapsContext contex
         }
 
         try {
-            reference = driver.findElement(By.cssSelector("*"));
-        } catch (WebDriverException e) {
             reference = driver.findElement(By.xpath("/*"));
+        } catch (WebDriverException e) {
+            reference = driver.findElement(By.cssSelector("*"));
         }
 
         Class<? extends WebElement> refClass = reference.getClass();

src/test/java/com/nordstrom/automation/selenium/android/AndroidTest.java

@@ -13,14 +13,6 @@
 @InitialPage(AndroidPage.class)
 public class AndroidTest extends TestNgTargetRoot {
 
-//    private final String MY_PACKAGE = "com.example.myapplication";
-//    private final String SETTINGS_ACTIVITY = ".SettingsActivity";
-    
-//    private final String KEY_SIGNATURE = "signature";
-//    private final String KEY_REPLY = "reply";
-//    private final String KEY_SYNC = "sync";
-//    private final String KEY_ATTACHMENT = "attachment";
-    
     @Test
     @TargetPlatform(ANDROID_NAME)
     public void testSearchActivity() {