Executable path for Edge

Author: aaltat

src/SeleniumLibrary/keywords/webdrivertools/webdrivertools.py

@@ -205,16 +205,20 @@ def _has_options(self, web_driver):
         signature = inspect.getargspec(web_driver.__init__)
         return 'options' in signature.args
 
-    def create_edge(self, desired_capabilities, remote_url, options=None, service_log_path=None):
+    def create_edge(self, desired_capabilities, remote_url, options=None, service_log_path=None,
+                    executable_path='MicrosoftWebDriver.exe'):
         if is_truthy(remote_url):
             defaul_caps = webdriver.DesiredCapabilities.EDGE.copy()
             desired_capabilities = self._remote_capabilities_resolver(desired_capabilities, defaul_caps)
             return self._remote(desired_capabilities, remote_url)
+        if is_falsy(executable_path):
+            executable_path = self._get_executable_path(webdriver.Edge)
         if self._has_options(webdriver.Edge):
             # options is supported from Selenium 4.0 onwards
             # If can be removed when minimum Selenium version is 4.0 or greater
-            return webdriver.Edge(options=options, service_log_path=service_log_path, **desired_capabilities)
-        return webdriver.Edge(service_log_path=service_log_path, **desired_capabilities)
+            return webdriver.Edge(options=options, service_log_path=service_log_path, executable_path=executable_path,
+                                  **desired_capabilities)
+        return webdriver.Edge(service_log_path=service_log_path, executable_path=executable_path, **desired_capabilities)
 
     def create_opera(self, desired_capabilities, remote_url, options=None, service_log_path=None):
         if is_truthy(remote_url):

utest/test/keywords/test_webdrivercreator.py

@@ -393,8 +393,9 @@ def test_ie_no_browser_name(creator):
 
 
 def test_edge(creator):
+    executable_path = 'MicrosoftWebDriver.exe'
     expected_webdriver = mock()
-    when(webdriver).Edge(service_log_path=None).thenReturn(expected_webdriver)
+    when(webdriver).Edge(service_log_path=None, executable_path=executable_path).thenReturn(expected_webdriver)
     when(creator)._has_options(ANY).thenReturn(False)
     driver = creator.create_edge({}, None)
     assert driver == expected_webdriver

utest/test/keywords/test_webdrivercreator_executable_path.py

@@ -55,6 +55,9 @@ def test_get_executable_path(creator):
     executable_path = creator._get_executable_path(webdriver.Opera)
     assert executable_path == None
 
+    executable_path = creator._get_executable_path(webdriver.Edge)
+    assert executable_path == 'MicrosoftWebDriver.exe'
+
 
 def test_create_chrome_executable_path_and_remote(creator):
     url = 'http://localhost:4444/wd/hub'
@@ -152,6 +155,25 @@ def test_create_ie_executable_path_not_set(creator):
     assert driver == expected_webdriver
 
 
+def test_create_edge_executable_path_set(creator):
+    executable_path = '/path/to/MicrosoftWebDriver.exe'
+    expected_webdriver = mock()
+    when(webdriver).Edge(service_log_path=None,
+                         executable_path=executable_path).thenReturn(expected_webdriver)
+    driver = creator.create_edge({}, None, executable_path=executable_path)
+    assert driver == expected_webdriver
+
+
+def test_create_edge_executable_path_not_set(creator):
+    executable_path = 'MicrosoftWebDriver.exe'
+    expected_webdriver = mock()
+    when(creator)._get_executable_path(ANY).thenReturn(executable_path)
+    when(webdriver).Edge(service_log_path=None,
+                         executable_path=executable_path).thenReturn(expected_webdriver)
+    driver = creator.create_edge({}, None, executable_path=None)
+    assert driver == expected_webdriver
+
+
 def mock_file_detector(creator):
     file_detector = mock()
     when(creator)._get_sl_file_detector().thenReturn(file_detector)

utest/test/keywords/test_webdrivercreator_service_log_path.py

@@ -137,10 +137,11 @@ def test_create_ie_with_service_log_path_real_path(creator):
 
 
 def test_create_edge_with_service_log_path_real_path(creator):
+    executable_path = 'MicrosoftWebDriver.exe'
     log_file = os.path.join(creator.output_dir, 'ie-1.log')
     expected_webdriver = mock()
     when(creator.creator)._has_options(ANY).thenReturn(False)
-    when(webdriver).Edge(service_log_path=log_file).thenReturn(expected_webdriver)
+    when(webdriver).Edge(service_log_path=log_file, executable_path=executable_path).thenReturn(expected_webdriver)
     driver = creator.creator.create_edge({}, None, service_log_path=log_file)
     assert driver == expected_webdriver