Merge pull request #1757 from robotframework/selenium-4

Selenium 4

Author: emanlove

.github/workflows/CI.yml

@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.6, 3.9, pypy3]
+        python-version: [3.7, 3.9, pypy3]
         rf-version: [3.2.2, 4.0.1]
 
     steps:
@@ -42,6 +42,10 @@ jobs:
       if: matrix.python-version != 'pypy3'
       run: |
         invoke gen-stub
+    - name: Debugging
+      if: matrix.python-version != 'pypy3'
+      run: |
+        which python
     - name: Run tests with headless Chrome and with Python != 3.8
       if: matrix.python-version != '3.8'
       run: |
@@ -56,6 +60,11 @@ jobs:
         wget --no-verbose --output-document=./selenium-server-standalone.jar http://selenium-release.storage.googleapis.com/3.141/selenium-server-standalone-3.141.59.jar
         sudo chmod u+x ./selenium-server-standalone.jar
         xvfb-run --auto-servernum python atest/run.py --zip headlesschrome  --grid True
+    - uses: actions/upload-artifact@v1
+      if: success() || failure()
+      with:
+        name: Unit Test results
+        path: utest/output_dir
     - uses: actions/upload-artifact@v1
       if: success() || failure()
       with:

utest/test/api/approved_files/PluginDocumentation.test_many_plugins.approved.txt

@@ -378,4 +378,4 @@ This is heading 1 documentation.
 
 = Plugin: my_lib_args =
 
-No plugin documentation found.
+No plugin documentation found.

utest/test/api/approved_files/PluginDocumentation.test_parse_plugin_init_doc.approved.txt

@@ -14,4 +14,4 @@ SeleniumLibrary can be imported with several optional arguments.
   Allows extending the SeleniumLibrary with external Python classes.
 - ``event_firing_webdriver``:
   Class for wrapping Selenium with
-  [https://seleniumhq.github.io/selenium/docs/api/py/webdriver_support/selenium.webdriver.support.event_firing_webdriver.html#module-selenium.webdriver.support.event_firing_webdriver|EventFiringWebDriver]
+  [https://seleniumhq.github.io/selenium/docs/api/py/webdriver_support/selenium.webdriver.support.event_firing_webdriver.html#module-selenium.webdriver.support.event_firing_webdriver|EventFiringWebDriver]

utest/test/api/approved_files/PluginDocumentation.test_parse_plugin_kw_doc.approved.txt

@@ -33,4 +33,4 @@ Examples:
 | `Execute JavaScript` | window.myFunc('arg1', 'arg2') |
 | `Execute JavaScript` | ${CURDIR}/js_to_execute.js    |
 | `Execute JavaScript` | alert(arguments[0]); | ARGUMENTS | 123 |
-| `Execute JavaScript` | ARGUMENTS | 123 | JAVASCRIPT | alert(arguments[0]); |
+| `Execute JavaScript` | ARGUMENTS | 123 | JAVASCRIPT | alert(arguments[0]); |

utest/test/keywords/approved_files/FireFoxProfileParsingTests.test_single_method.approved.txt

@@ -5,4 +5,4 @@ Firefox profile parsing
 2)  key1 arg1 key2 arg2
 3) True
 4) 'FirefoxProfile' object has no attribute 'wrong_name'
-5) 'str' object has no attribute 'proxy_type'
+5) 'FirefoxProfile' object has no attribute 'set_proxy'

utest/test/keywords/approved_files/JavaScriptKeywordsTest.test_get_javascript.approved.txt

@@ -1 +1 @@
-codehere + []
+codehere + []

utest/test/keywords/approved_files/JavaScriptKeywordsTest.test_get_javascript_no_code.approved.txt

@@ -1 +1 @@
-JavaScript code was not found from code argument.
+JavaScript code was not found from code argument.

utest/test/keywords/approved_files/test_selenium_options_parser.test_importer.approved.txt

@@ -7,9 +7,7 @@ Selenium options import
 4) <class 'selenium.webdriver.ie.options.Options'>
 5) <class 'selenium.webdriver.opera.options.Options'>
 6) <class 'selenium.webdriver.edge.options.Options'>
-7) phantomjs No module named
-8) safari No module named
-9) htmlunit No module named
-10) htmlunit_with_js No module named
-11) <class 'selenium.webdriver.chrome.options.Options'>
-12) iphone No module named
+7) <class 'selenium.webdriver.safari.options.Options'>
+8) htmlunit No module named
+9) htmlunit_with_js No module named
+10) iphone No module named

utest/test/keywords/test_selenium_options_parser.py

@@ -189,11 +189,9 @@ def test_importer(options, reporter):
     results.append(options._import_options("ie"))
     results.append(options._import_options("opera"))
     results.append(options._import_options("edge"))
-    results.append(error_formatter(options._import_options, "phantomjs"))
     results.append(error_formatter(options._import_options, "safari"))
     results.append(error_formatter(options._import_options, "htmlunit"))
     results.append(error_formatter(options._import_options, "htmlunit_with_js"))
-    results.append(options._import_options("android"))
     results.append(error_formatter(options._import_options, "iphone"))
     verify_all("Selenium options import", results, reporter=reporter)
 
@@ -350,9 +348,9 @@ def test_has_options(creator):
     assert creator._has_options(webdriver.Chrome)
     assert creator._has_options(webdriver.Firefox)
     assert creator._has_options(webdriver.Ie)
-    assert creator._has_options(webdriver.Edge) is False
+    assert creator._has_options(webdriver.Edge)
     assert creator._has_options(webdriver.Opera)
-    assert creator._has_options(webdriver.Safari) is False
+    assert creator._has_options(webdriver.Safari)
 
 
 def test_create_opera_with_options(creator):
@@ -394,17 +392,6 @@ def test_create_safari_no_options_support(creator):
     assert driver == expected_webdriver
 
 
-def test_create_phantomjs_no_options_support(creator):
-    options = mock()
-    expected_webdriver = mock()
-    executable_path = "phantomjs"
-    when(webdriver).PhantomJS(
-        service_log_path=None, executable_path=executable_path
-    ).thenReturn(expected_webdriver)
-    driver = creator.create_phantomjs({}, None, options=options)
-    assert driver == expected_webdriver
-
-
 def test_create_htmlunit_no_options_support(creator):
     caps = webdriver.DesiredCapabilities.HTMLUNIT.copy()
     options = mock()
@@ -439,22 +426,6 @@ def test_create_htmlunit_with_js_no_options_support(creator):
     assert driver == expected_webdriver
 
 
-def test_android_options_support(creator):
-    caps = webdriver.DesiredCapabilities.ANDROID.copy()
-    options = mock()
-    expected_webdriver = mock()
-    file_detector = mock_file_detector(creator)
-    when(webdriver).Remote(
-        command_executor="None",
-        desired_capabilities=caps,
-        browser_profile=None,
-        options=options,
-        file_detector=file_detector,
-    ).thenReturn(expected_webdriver)
-    driver = creator.create_android({}, None, options=options)
-    assert driver == expected_webdriver
-
-
 def test_iphone_options_support(creator):
     caps = webdriver.DesiredCapabilities.IPHONE.copy()
     options = mock()

utest/test/keywords/test_webdrivercreator.py

@@ -646,64 +646,6 @@ def test_safari_no_broser_name(creator):
     assert driver == expected_webdriver
 
 
-def test_phantomjs(creator):
-    expected_webdriver = mock()
-    executable_path = "phantomjs"
-    when(webdriver).PhantomJS(
-        service_log_path=None, executable_path=executable_path
-    ).thenReturn(expected_webdriver)
-    driver = creator.create_phantomjs({}, None)
-    assert driver == expected_webdriver
-
-
-def test_phantomjs_remote_no_caps(creator):
-    url = "http://localhost:4444/wd/hub"
-    expected_webdriver = mock()
-    capabilities = webdriver.DesiredCapabilities.PHANTOMJS.copy()
-    file_detector = mock_file_detector(creator)
-    when(webdriver).Remote(
-        command_executor=url,
-        browser_profile=None,
-        desired_capabilities=capabilities,
-        options=None,
-        file_detector=file_detector,
-    ).thenReturn(expected_webdriver)
-    driver = creator.create_phantomjs({}, url)
-    assert driver == expected_webdriver
-
-
-def test_phantomjs_remote_caps(creator):
-    url = "http://localhost:4444/wd/hub"
-    expected_webdriver = mock()
-    capabilities = {"browserName": "phantomjs"}
-    file_detector = mock_file_detector(creator)
-    when(webdriver).Remote(
-        command_executor=url,
-        browser_profile=None,
-        desired_capabilities=capabilities,
-        options=None,
-        file_detector=file_detector,
-    ).thenReturn(expected_webdriver)
-    driver = creator.create_phantomjs({"desired_capabilities": capabilities}, url)
-    assert driver == expected_webdriver
-
-
-def test_phantomjs_no_browser_name(creator):
-    url = "http://localhost:4444/wd/hub"
-    expected_webdriver = mock()
-    capabilities = {"browserName": "phantomjs", "key": "value"}
-    file_detector = mock_file_detector(creator)
-    when(webdriver).Remote(
-        command_executor=url,
-        browser_profile=None,
-        desired_capabilities=capabilities,
-        options=None,
-        file_detector=file_detector,
-    ).thenReturn(expected_webdriver)
-    driver = creator.create_phantomjs({"desired_capabilities": {"key": "value"}}, url)
-    assert driver == expected_webdriver
-
-
 def test_htmlunit_no_caps(creator):
     caps = webdriver.DesiredCapabilities.HTMLUNIT
     expected_webdriver = mock()
@@ -781,36 +723,6 @@ def test_htmlunit_with_js_no_browser_name(creator):
     assert driver == expected_webdriver
 
 
-def test_android(creator):
-    caps = webdriver.DesiredCapabilities.ANDROID
-    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_android({}, None)
-    assert driver == expected_webdriver
-
-
-def test_android_no_browser_name(creator):
-    capabilities = {"browserName": "android", "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_android({"desired_capabilities": {"key": "value"}}, None)
-    assert driver == expected_webdriver
-
-
 def test_iphone(creator):
     caps = webdriver.DesiredCapabilities.IPHONE
     expected_webdriver = mock()