Executable path for Opera

Author: aaltat

src/SeleniumLibrary/keywords/webdrivertools/webdrivertools.py

@@ -220,12 +220,16 @@ def create_edge(self, desired_capabilities, remote_url, options=None, service_lo
                                   **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):
+    def create_opera(self, desired_capabilities, remote_url, options=None, service_log_path=None,
+                     executable_path='operadriver'):
         if is_truthy(remote_url):
             defaul_caps = webdriver.DesiredCapabilities.OPERA.copy()
             desired_capabilities = self._remote_capabilities_resolver(desired_capabilities, defaul_caps)
             return self._remote(desired_capabilities, remote_url, options=options)
-        return webdriver.Opera(options=options, service_log_path=service_log_path, **desired_capabilities)
+        if is_falsy(executable_path):
+            executable_path = self._get_executable_path(webdriver.Opera)
+        return webdriver.Opera(options=options, service_log_path=service_log_path, executable_path=executable_path,
+                               **desired_capabilities)
 
     def create_safari(self, desired_capabilities, remote_url, options=None, service_log_path=None):
         if is_truthy(remote_url):

utest/test/keywords/test_selenium_options_parser.py

@@ -355,7 +355,9 @@ def test_create_edge_with_options(creator):
 def test_create_opera_with_options(creator):
     options = mock()
     expected_webdriver = mock()
-    when(webdriver).Opera(options=options, service_log_path=None).thenReturn(expected_webdriver)
+    executable_path = 'operadriver'
+    when(webdriver).Opera(options=options, service_log_path=None,
+                          executable_path=executable_path).thenReturn(expected_webdriver)
     driver = creator.create_opera({}, None, options=options)
     assert driver == expected_webdriver
 

utest/test/keywords/test_webdrivercreator.py

@@ -438,7 +438,9 @@ def test_edge_no_browser_name(creator):
 
 def test_opera(creator):
     expected_webdriver = mock()
-    when(webdriver).Opera(options=None, service_log_path=None).thenReturn(expected_webdriver)
+    executable_path = 'operadriver'
+    when(webdriver).Opera(options=None, service_log_path=None,
+                          executable_path=executable_path).thenReturn(expected_webdriver)
     driver = creator.create_opera({}, None)
     assert driver == expected_webdriver
 

utest/test/keywords/test_webdrivercreator_executable_path.py

@@ -163,7 +163,6 @@ def test_create_edge_executable_path_set(creator):
     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()
@@ -174,6 +173,25 @@ def test_create_edge_executable_path_not_set(creator):
     assert driver == expected_webdriver
 
 
+def test_create_opera_executable_path_set(creator):
+    executable_path = '/path/to/operadriver'
+    expected_webdriver = mock()
+    when(webdriver).Opera(service_log_path=None, options=None,
+                          executable_path=executable_path).thenReturn(expected_webdriver)
+    driver = creator.create_opera({}, None, executable_path=executable_path)
+    assert driver == expected_webdriver
+
+
+def test_create_opera_executable_path_not_set(creator):
+    executable_path = 'operadriver'
+    expected_webdriver = mock()
+    when(creator)._get_executable_path(ANY).thenReturn(executable_path)
+    when(webdriver).Opera(service_log_path=None, options=None,
+                          executable_path=executable_path).thenReturn(expected_webdriver)
+    driver = creator.create_opera({}, 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

@@ -147,9 +147,11 @@ def test_create_edge_with_service_log_path_real_path(creator):
 
 
 def test_create_opera_with_service_log_path_real_path(creator):
+    executable_path = 'operadriver'
     log_file = os.path.join(creator.output_dir, 'ie-1.log')
     expected_webdriver = mock()
-    when(webdriver).Opera(options=None, service_log_path=log_file).thenReturn(expected_webdriver)
+    when(webdriver).Opera(options=None, service_log_path=log_file,
+                          executable_path=executable_path).thenReturn(expected_webdriver)
     driver = creator.creator.create_opera({}, None, service_log_path=log_file)
     assert driver == expected_webdriver