Removed deprecated drivers

emanlove · emanlove · commit 86bb274b7360 · 2023-08-15T21:30:51.000-04:00
Removed phantomjs, iphone, android, htmlunit, htmlunit_js from both code
and tests.
diff --git a/atest/acceptance/create_webdriver.robot b/atest/acceptance/create_webdriver.robot
@@ -42,8 +42,7 @@ Set Driver Variables
     Set Test Variable    ${DRIVER_NAME}    ${name}
     ${dc names}=    Create Dictionary    ff=FIREFOX    firefox=FIREFOX    ie=INTERNETEXPLORER
     ...    internetexplorer=INTERNETEXPLORER    googlechrome=CHROME    gc=CHROME
-    ...    chrome=CHROME    htmlunit=HTMLUNIT    htmlunitwithjs=HTMLUNITWITHJS
-    ...    safari=SAFARI    headlessfirefox=FIREFOX    headlesschrome=CHROME
+    ...    chrome=CHROME    safari=SAFARI    headlessfirefox=FIREFOX    headlesschrome=CHROME
     ${dc name}=    Get From Dictionary    ${dc names}    ${BROWSER.lower().replace(' ', '')}
     ${caps}=    Evaluate    selenium.webdriver.DesiredCapabilities.${dc name}
     ...                     modules=selenium, selenium.webdriver
diff --git a/src/SeleniumLibrary/keywords/browsermanagement.py b/src/SeleniumLibrary/keywords/browsermanagement.py
@@ -83,10 +83,6 @@ def open_browser(
         | Internet Explorer | internetexplorer, ie     |
         | Edge              | edge                     |
         | Safari            | safari                   |
-        | Iphone            | iphone                   |
-        | PhantomJS         | phantomjs                |
-        | HTMLUnit          | htmlunit                 |
-        | HTMLUnit with Javascript | htmlunitwithjs    |
 
         To be able to actually use one of these browsers, you need to have
         a matching Selenium browser driver available. See the
@@ -140,9 +136,7 @@ def open_browser(
         are available. Please note that not all browsers, supported by the
         SeleniumLibrary, have Selenium options available. Therefore please
         consult the Selenium documentation which browsers do support
-        the Selenium options. If ``browser`` argument is `android` then
-        [https://seleniumhq.github.io/selenium/docs/api/py/webdriver_chrome/selenium.webdriver.chrome.options.html#selenium.webdriver.chrome.options.Options|Chrome options]
-        is used. Selenium options are also supported, when ``remote_url``
+        the Selenium options. Selenium options are also supported, when ``remote_url``
         argument is used.
 
         The SeleniumLibrary ``options`` argument accepts Selenium
@@ -362,9 +356,6 @@ def create_webdriver(
         | ${proxy}=                  | `Evaluate`     | selenium.webdriver.Proxy()   | modules=selenium, selenium.webdriver |
         | ${proxy.http_proxy}=       | `Set Variable` | localhost:8888               |                                      |
         | `Create Webdriver`         | Firefox        | proxy=${proxy}               |                                      |
-        | # Use proxy with PhantomJS |                |                              |                                      |
-        | ${service args}=           | `Create List`  | --proxy=192.168.132.104:8888 |                                      |
-        | `Create Webdriver`         | PhantomJS      | service_args=${service args} |                                      |
 
         Returns the index of this browser instance which can be used later to
         switch back to it. Index starts from 1 and is reset back to it when
diff --git a/src/SeleniumLibrary/keywords/webdrivertools/webdrivertools.py b/src/SeleniumLibrary/keywords/webdrivertools/webdrivertools.py
@@ -53,11 +53,6 @@ class WebDriverCreator:
         "internetexplorer": "ie",
         "edge": "edge",
         "safari": "safari",
-        "phantomjs": "phantomjs",
-        "htmlunit": "htmlunit",
-        "htmlunitwithjs": "htmlunit_with_js",
-        "android": "android",
-        "iphone": "iphone",
     }
 
     def __init__(self, log_dir):
@@ -336,106 +331,6 @@ def create_safari(
         service = SafariService(executable_path=executable_path, log_path=service_log_path)
         return webdriver.Safari(options=options, service=service)
 
-    def create_phantomjs(
-        self,
-        desired_capabilities,
-        remote_url,
-        options=None,
-        service_log_path=None,
-        executable_path="phantomjs",
-    ):
-        warnings.warn(
-            "SeleniumLibrary support for PhantomJS has been deprecated, "
-            "please use headlesschrome or headlessfirefox instead."
-        )
-        if remote_url:
-            defaul_caps = webdriver.DesiredCapabilities.PHANTOMJS.copy()
-            desired_capabilities = self._remote_capabilities_resolver(
-                desired_capabilities, defaul_caps
-            )
-            return self._remote(desired_capabilities, remote_url)
-        if options:
-            logger.warn("PhantomJS browser does not support Selenium options.")
-        if not executable_path:
-            executable_path = self._get_executable_path(webdriver.PhantomJS)
-        return webdriver.PhantomJS(
-            service_log_path=service_log_path,
-            executable_path=executable_path,
-            **desired_capabilities,
-        )
-
-    def create_htmlunit(
-        self,
-        desired_capabilities,
-        remote_url,
-        options=None,
-        service_log_path=None,
-        executable_path=None,
-    ):
-        if service_log_path or options or executable_path:
-            logger.warn(
-                "Htmlunit does not support Selenium options, service_log_path or executable_path argument."
-            )
-        defaul_caps = webdriver.DesiredCapabilities.HTMLUNIT.copy()
-        desired_capabilities = self._remote_capabilities_resolver(
-            desired_capabilities, defaul_caps
-        )
-        return self._remote(desired_capabilities, remote_url, options=options)
-
-    def create_htmlunit_with_js(
-        self,
-        desired_capabilities,
-        remote_url,
-        options=None,
-        service_log_path=None,
-        executable_path=None,
-    ):
-        if service_log_path or options or executable_path:
-            logger.warn(
-                "Htmlunit with JS does not support Selenium options, service_log_path or executable_path argument."
-            )
-        defaul_caps = webdriver.DesiredCapabilities.HTMLUNITWITHJS.copy()
-        desired_capabilities = self._remote_capabilities_resolver(
-            desired_capabilities, defaul_caps
-        )
-        return self._remote(desired_capabilities, remote_url, options=options)
-
-    def create_android(
-        self,
-        desired_capabilities,
-        remote_url,
-        options=None,
-        service_log_path=None,
-        executable_path=None,
-    ):
-        if service_log_path or executable_path:
-            logger.warn(
-                "Android does not support Selenium options or executable_path argument."
-            )
-        defaul_caps = webdriver.DesiredCapabilities.ANDROID.copy()
-        desired_capabilities = self._remote_capabilities_resolver(
-            desired_capabilities, defaul_caps
-        )
-        return self._remote(desired_capabilities, remote_url, options=options)
-
-    def create_iphone(
-        self,
-        desired_capabilities,
-        remote_url,
-        options=None,
-        service_log_path=None,
-        executable_path=None,
-    ):
-        if service_log_path or executable_path:
-            logger.warn(
-                "iPhone does not support service_log_path or executable_path argument."
-            )
-        defaul_caps = webdriver.DesiredCapabilities.IPHONE.copy()
-        desired_capabilities = self._remote_capabilities_resolver(
-            desired_capabilities, defaul_caps
-        )
-        return self._remote(desired_capabilities, remote_url, options=options)
-
     def _remote(self, desired_capabilities, remote_url, profile_dir=None, options=None):
         remote_url = str(remote_url)
         file_detector = self._get_sl_file_detector()
@@ -620,8 +515,6 @@ def create(self, browser, options):
         return selenium_options
 
     def _import_options(self, browser):
-        if browser == "android":
-            browser = "chrome"  # Android uses ChromeOptions()
         browser = browser.replace("headless_", "", 1)
         options = importlib.import_module(f"selenium.webdriver.{browser}.options")
         return options.Options
diff --git a/utest/test/keywords/IGNOREDtest_webdrivercreator.py b/utest/test/keywords/IGNOREDtest_webdrivercreator.py
@@ -590,113 +590,6 @@ def test_safari_no_broser_name(creator):
     assert driver == expected_webdriver
 
 
-def test_htmlunit_no_caps(creator):
-    caps = webdriver.DesiredCapabilities.HTMLUNIT
-    expected_webdriver = mock()
-    file_detector = mock_file_detector(creator)
-    when(webdriver).Remote(
-        command_executor="None",
-        desired_capabilities=caps,
-        browser_profile=None,
-        options=None,
-        file_detector=file_detector,
-    ).thenReturn(expected_webdriver)
-    driver = creator.create_htmlunit({}, None)
-    assert driver == expected_webdriver
-
-
-def test_htmlunit_remote_caps(creator):
-    caps = {"browserName": "htmlunit"}
-    expected_webdriver = mock()
-    file_detector = mock_file_detector(creator)
-    when(webdriver).Remote(
-        command_executor="None",
-        desired_capabilities=caps,
-        browser_profile=None,
-        options=None,
-        file_detector=file_detector,
-    ).thenReturn(expected_webdriver)
-    driver = creator.create_htmlunit({"desired_capabilities": caps}, None)
-    assert driver == expected_webdriver
-
-
-def test_htmlunit_no_browser_name(creator):
-    capabilities = {"browserName": "htmlunit", "key": "value"}
-    expected_webdriver = mock()
-    file_detector = mock_file_detector(creator)
-    when(webdriver).Remote(
-        command_executor="None",
-        desired_capabilities=capabilities,
-        browser_profile=None,
-        options=None,
-        file_detector=file_detector,
-    ).thenReturn(expected_webdriver)
-    driver = creator.create_htmlunit({"desired_capabilities": {"key": "value"}}, None)
-    assert driver == expected_webdriver
-
-
-def test_htmlunit_with_js(creator):
-    caps = webdriver.DesiredCapabilities.HTMLUNITWITHJS.copy()
-    expected_webdriver = mock()
-    file_detector = mock_file_detector(creator)
-    when(webdriver).Remote(
-        command_executor="None",
-        desired_capabilities=caps,
-        browser_profile=None,
-        options=None,
-        file_detector=file_detector,
-    ).thenReturn(expected_webdriver)
-    driver = creator.create_htmlunit_with_js({}, None)
-    assert driver == expected_webdriver
-
-
-def test_htmlunit_with_js_no_browser_name(creator):
-    capabilities = {"browserName": "htmlunit", "key": "value"}
-    expected_webdriver = mock()
-    file_detector = mock_file_detector(creator)
-    when(webdriver).Remote(
-        command_executor="None",
-        desired_capabilities=capabilities,
-        browser_profile=None,
-        options=None,
-        file_detector=file_detector,
-    ).thenReturn(expected_webdriver)
-    driver = creator.create_htmlunit_with_js(
-        {"desired_capabilities": {"key": "value"}}, None
-    )
-    assert driver == expected_webdriver
-
-
-def test_iphone(creator):
-    caps = webdriver.DesiredCapabilities.IPHONE
-    expected_webdriver = mock()
-    file_detector = mock_file_detector(creator)
-    when(webdriver).Remote(
-        command_executor="None",
-        desired_capabilities=caps,
-        browser_profile=None,
-        options=None,
-        file_detector=file_detector,
-    ).thenReturn(expected_webdriver)
-    driver = creator.create_iphone({}, None)
-    assert driver == expected_webdriver
-
-
-def test_iphone_no_browser_name(creator):
-    capabilities = {"browserName": "iPhone", "key": "value"}
-    expected_webdriver = mock()
-    file_detector = mock_file_detector(creator)
-    when(webdriver).Remote(
-        command_executor="None",
-        desired_capabilities=capabilities,
-        browser_profile=None,
-        options=None,
-        file_detector=file_detector,
-    ).thenReturn(expected_webdriver)
-    driver = creator.create_iphone({"desired_capabilities": {"key": "value"}}, None)
-    assert driver == expected_webdriver
-
-
 def test_create_driver_chrome(creator):
     expected_webdriver = mock()
     executable_path = "chromedriver"
diff --git a/utest/test/keywords/IGNOREtest_webdrivercreator_executable_path.py b/utest/test/keywords/IGNOREtest_webdrivercreator_executable_path.py
@@ -227,54 +227,6 @@ def test_create_safari_executable_path_not_set(creator):
     assert driver == expected_webdriver
 
 
-def test_create_htmlunit_executable_path_set(creator):
-    executable_path = "path/to/bin"
-    caps = webdriver.DesiredCapabilities.HTMLUNIT.copy()
-    expected_webdriver = mock()
-    file_detector = mock_file_detector(creator)
-    when(webdriver).Remote(
-        command_executor="None",
-        desired_capabilities=caps,
-        browser_profile=None,
-        options=None,
-        file_detector=file_detector,
-    ).thenReturn(expected_webdriver)
-    driver = creator.create_htmlunit({}, None, executable_path=executable_path)
-    assert driver == expected_webdriver
-
-
-def test_create_htmlunit_with_js_executable_path_set(creator):
-    executable_path = "path/to/bin"
-    caps = webdriver.DesiredCapabilities.HTMLUNITWITHJS.copy()
-    expected_webdriver = mock()
-    file_detector = mock_file_detector(creator)
-    when(webdriver).Remote(
-        command_executor="None",
-        desired_capabilities=caps,
-        browser_profile=None,
-        options=None,
-        file_detector=file_detector,
-    ).thenReturn(expected_webdriver)
-    driver = creator.create_htmlunit_with_js({}, None, executable_path=executable_path)
-    assert driver == expected_webdriver
-
-
-def test_create_iphone_executable_path_set(creator):
-    executable_path = "path/to/bin"
-    caps = webdriver.DesiredCapabilities.IPHONE.copy()
-    expected_webdriver = mock()
-    file_detector = mock_file_detector(creator)
-    when(webdriver).Remote(
-        command_executor="None",
-        desired_capabilities=caps,
-        browser_profile=None,
-        options=None,
-        file_detector=file_detector,
-    ).thenReturn(expected_webdriver)
-    driver = creator.create_iphone({}, None, executable_path=executable_path)
-    assert driver == expected_webdriver
-
-
 def test_open_browser_executable_path_set(creator):
     expected_webdriver = mock()
     when(webdriver).Chrome(
diff --git a/utest/test/keywords/approved_files/test_selenium_options_parser.test_create_with_android.approved.txt b/utest/test/keywords/approved_files/test_selenium_options_parser.test_create_with_android.approved.txt
diff --git a/utest/test/keywords/approved_files/test_selenium_options_parser.test_importer.approved.txt b/utest/test/keywords/approved_files/test_selenium_options_parser.test_importer.approved.txt
@@ -7,6 +7,3 @@ Selenium options import
 4) <class 'selenium.webdriver.ie.options.Options'>
 5) <class 'selenium.webdriver.edge.options.Options'>
 6) <class 'selenium.webdriver.safari.options.Options'>
-7) htmlunit No module named
-8) htmlunit_with_js No module named
-9) iphone No module named
diff --git a/utest/test/keywords/test_selenium_options_parser.py b/utest/test/keywords/test_selenium_options_parser.py
