Chrome binary passed in capabilities has higher priority than node configuration

Author: barancev

java/server/src/org/openqa/grid/selenium/proxy/DefaultRemoteProxy.java

@@ -238,7 +238,9 @@ public void beforeSession(TestSession session) {
           if (options == null) {
             options = new HashMap<String, Object>();
           }
-          options.put("binary", session.getSlot().getCapabilities().get("chrome_binary"));
+          if (!options.containsKey("binary")) {
+            options.put("binary", session.getSlot().getCapabilities().get("chrome_binary"));
+          }
           cap.put(ChromeOptions.CAPABILITY, options);
         }
       }

java/server/test/org/openqa/grid/e2e/node/DefaultProxyFindsFirefoxLocationsTest.java

@@ -20,8 +20,6 @@
 import static org.junit.Assert.assertEquals;
 import static org.mockito.Mockito.mock;
 
-import com.google.gson.JsonObject;
-
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -152,61 +150,60 @@ public void testBrowserLocations() throws MalformedURLException {
     newSessionRequest = new MockedRequestHandler(getNewRequest(req_caps));
     newSessionRequest.process();
 
-    JsonObject json = (JsonObject) newSessionRequest.getSession().getRequestedCapabilities().get(ChromeOptions.CAPABILITY);
-    assertEquals(locationChrome27, json.get("binary").getAsString());
+    Map<String, Object> json = (Map<String, Object>) newSessionRequest.getSession().getRequestedCapabilities().get(ChromeOptions.CAPABILITY);
+    assertEquals(locationChrome27, json.get("binary"));
 
     req_caps = new HashMap<String, Object>();
     req_caps.put(CapabilityType.BROWSER_NAME, BrowserType.CHROME);
     req_caps.put(CapabilityType.VERSION, "29");
     newSessionRequest = new MockedRequestHandler(getNewRequest(req_caps));
     newSessionRequest.process();
 
-    json = (JsonObject) newSessionRequest.getSession().getRequestedCapabilities().get(ChromeOptions.CAPABILITY);
-    assertEquals(locationChrome29, json.get("binary").getAsString());
+    json = (Map<String, Object>) newSessionRequest.getSession().getRequestedCapabilities().get(ChromeOptions.CAPABILITY);
+    assertEquals(locationChrome29, json.get("binary"));
 
     req_caps = new HashMap<String, Object>();
     req_caps.put(CapabilityType.BROWSER_NAME, BrowserType.CHROME);
     req_caps.put(CapabilityType.VERSION, "29");
-    JsonObject options = new JsonObject();
-    options.addProperty("test1", "test2");
+    Map<String, Object> options = new HashMap<String, Object>();
+    options.put("test1", "test2");
     req_caps.put(ChromeOptions.CAPABILITY, options);
     newSessionRequest = new MockedRequestHandler(getNewRequest(req_caps));
     newSessionRequest.process();
 
-    json = (JsonObject) newSessionRequest.getSession().getRequestedCapabilities().get(ChromeOptions.CAPABILITY);
-    assertEquals(locationChrome29, json.get("binary").getAsString());
-    assertEquals("test2", json.get("test1").getAsString());
+    json = (Map<String, Object>) newSessionRequest.getSession().getRequestedCapabilities().get(ChromeOptions.CAPABILITY);
+    assertEquals(locationChrome29, json.get("binary"));
+    assertEquals("test2", json.get("test1"));
 
     req_caps = new HashMap<String, Object>();
     req_caps.put(CapabilityType.BROWSER_NAME, BrowserType.CHROME);
     req_caps.put(CapabilityType.VERSION, "30");
-    options = new JsonObject();
-    options.addProperty("test11", "test22");
-    options.addProperty("binary", "custom");
+    options = new HashMap<String, Object>();
+    options.put("test11", "test22");
+    options.put("binary", "custom");
     req_caps.put(ChromeOptions.CAPABILITY, options);
     newSessionRequest = new MockedRequestHandler(getNewRequest(req_caps));
     newSessionRequest.process();
 
-    json = (JsonObject) newSessionRequest.getSession().getRequestedCapabilities().get(ChromeOptions.CAPABILITY);
-    // Ignored due it fails
-    //Assert.assertEquals("custom", json.get("binary").getAsString());
-    assertEquals("test22", json.get("test11").getAsString());
+    json = (Map<String, Object>) newSessionRequest.getSession().getRequestedCapabilities().get(ChromeOptions.CAPABILITY);
+    assertEquals("custom", json.get("binary"));
+    assertEquals("test22", json.get("test11"));
   }
 
   @AfterClass
   public static void teardown() throws Exception {
     remote.stopRemoteServer();
     hub.stop();
   }
-  
+
   private SeleniumBasedRequest getNewRequest(Map<String, Object> desiredCapability) {
     HttpServletRequest httpreq = mock(HttpServletRequest.class);
     return new SeleniumBasedRequest(httpreq, registry, RequestType.START_SESSION, desiredCapability) {
 
       public String getNewSessionRequestedCapability(TestSession session) {
         return null;
       }
-     
+
       public ExternalSessionKey extractSession() {
         return null;
       }
@@ -239,4 +236,4 @@ public void forwardNewSessionRequestAndUpdateRegistry(TestSession session)
         throws NewSessionException {}
   }
 
-}
+}