Merge 5f8a438 into 9637b18

CHANGELOG.rst

@@ -1,6 +1,13 @@
 Toolium Changelog
 =================
 
+v1.5.0
+------
+
+*Release date: WIP*
+
+- Add `username` and `password` config properties in [Server] section to enable basic authentication in Selenium Grid (required by GGR)
+
 v1.4.3
 ------
 

VERSION

@@ -1 +1 @@
-1.4.3
+1.5.0.dev0

docs/remote_configuration.rst

@@ -13,6 +13,8 @@ section in properties.cfg file::
     enabled: true
     host: SERVER_IP
     port: SERVER_PORT
+    username: SERVER_USERNAME
+    password: SERVER_PASSWORD
     video_enabled: false
     logs_enabled: false
 
@@ -29,6 +31,14 @@ port
 ~~~~
 | Port number where server is listening
 
+username
+~~~~~~~~
+| Username that is passed to Selenium Grid hub when it requires basic authentication, like in GGR
+
+password
+~~~~~~~~
+| Password that is passed to Selenium Grid hub when it requires basic authentication, like in GGR
+
 video_enabled
 ~~~~~~~~~~~~~
 | This property is only valid using `Selenium Grid Extras <https://github.com/groupon/Selenium-Grid-Extras>`_ as

toolium/config_driver.py

@@ -76,7 +76,10 @@ def _create_remote_driver(self):
         # Get server url
         server_host = self.config.get('Server', 'host')
         server_port = self.config.get('Server', 'port')
-        server_url = 'http://{0}:{1}/wd/hub'.format(server_host, server_port)
+        server_username = self.config.get_optional('Server', 'username')
+        server_password = self.config.get_optional('Server', 'password')
+        server_auth = '{}:{}@'.format(server_username, server_password) if server_username and server_password else ''
+        server_url = 'http://{}{}:{}/wd/hub'.format(server_auth, server_host, server_port)
 
         # Get driver capabilities
         driver_type = self.config.get('Driver', 'type')