support selenium 3.0.1

gdbtek · Feb 14, 2017 · dabb130 · dabb130
1 parent 3353a46
commit dabb130
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/cookbooks/selenium-server/templates/selenium-server-hub.json.conf b/cookbooks/selenium-server/templates/selenium-server-hub.json.conf
@@ -1,5 +1,5 @@
 {
-  "browserTimeout": 0,
+  "browserTimeout": 1800,
   "capabilityMatcher": "org.openqa.grid.internal.utils.DefaultCapabilityMatcher",
   "cleanUpCycle": 5000,
   "host": null,
@@ -12,5 +12,5 @@
   "role": "hub",
   "servlets": [],
   "throwOnCapabilityNotPresent": true,
-  "timeout": 300000
+  "timeout": 1800
 }
diff --git a/cookbooks/selenium-server/templates/selenium-server-node.json.conf b/cookbooks/selenium-server/templates/selenium-server-node.json.conf
@@ -11,19 +11,19 @@
     "browserName": "internet explorer",
     "maxInstances": 5,
     "seleniumProtocol": "WebDriver"
+  }, {
+    "browserName": "MicrosoftEdge",
+    "maxInstances": 5,
+    "seleniumProtocol": "WebDriver"
   }, {
     "browserName": "safari",
     "maxInstances": 5,
     "seleniumProtocol": "WebDriver"
   }],
-  "configuration": {
-    "host": "",
-    "hubHost": "__HUB_HOST__",
-    "hubPort": __HUB_PORT__,
-    "maxSession": 5,
-    "port": __PORT__,
-    "proxy": "org.openqa.grid.selenium.proxy.DefaultRemoteProxy",
-    "register": true,
-    "registerCycle": 5000
-  }
+  "hub": "http://__HUB_HOST__:__HUB_PORT__",
+  "maxSession": 5,
+  "port": __PORT__,
+  "proxy": "org.openqa.grid.selenium.proxy.DefaultRemoteProxy",
+  "register": true,
+  "registerCycle": 5000
 }
diff --git a/cookbooks/selenium-server/templates/selenium-server-node.service.systemd b/cookbooks/selenium-server/templates/selenium-server-node.service.systemd
@@ -32,5 +32,5 @@ User=__USER_NAME__
 Group=__GROUP_NAME__
 
 ExecStart=/bin/bash -c -e '\
-    java -jar \'__INSTALL_FILE__\' -role \'node\' -trustAllSSLCertificates -nodeConfig \'__CONFIG_FILE__\' \
+    java -jar \'__INSTALL_FILE__\' -role \'node\' -nodeConfig \'__CONFIG_FILE__\' \
 '