Merge pull request #1 from robotframework/master

merge rf-sl

Author: andreagubellini

.github/workflows/CI.yml

@@ -0,0 +1,49 @@
+name: SeleniumLibrary CI
+
+on: [push, pull_request]
+
+jobs:
+ build:
+
+ runs-on: ubuntu-latest
+ strategy:
+ matrix:
+ python-version: [3.6, 3.8, pypy3]
+ rf-version: [3.1.2, 3.2.1]
+
+ steps:
+ - uses: actions/checkout@v2
+ - name: Set up Python ${{ matrix.python-version }} with Robot Framework ${{ matrix.rf-version }}
+ uses: actions/setup-python@v1
+ with:
+ python-version: ${{ matrix.python-version }}
+ - name: Start xvfb
+ run: |
+ export DISPLAY=:99.0
+ Xvfb -ac :99 -screen 0 1280x1024x16 > /dev/null 2>&1 &
+ - name: Install dependencies
+ run: |
+ python -m pip install --upgrade pip
+ pip install -r requirements-dev.txt
+ - name: Install RF ${{ matrix.rf-version }}
+ run: |
+ pip install -U --pre robotframework==${{ matrix.rf-version }}
+ - name: Run tests with headless Chrome and with Python != 3.8
+ if: matrix.python-version != '3.8'
+ run: |
+ xvfb-run --auto-servernum python atest/run.py --zip headlesschrome
+ - name: Run tests normal Chrome with Python 3.8
+ if: matrix.python-version == '3.8' && matrix.rf-version != '3.1.2'
+ run: |
+ xvfb-run --auto-servernum python atest/run.py --zip chrome
+ - name: Run tests with Selenium Grid
+ if: matrix.python-version == '3.8' && matrix.rf-version == '3.1.2'
+ run: |
+ 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: Failed Test results
+ path: atest/zip_results

.gitignore

@@ -2,6 +2,7 @@
 .pydevproject
 .idea
 atest/results
+atest/zip_results
 utest/output_dir
 *.pyc
 *.orig
@@ -10,6 +11,8 @@ MANIFEST
 *.egg-info
 *.egg
 chromedriver.log
+.pytest_cache
 
 dist
 build
+.pabotsuitenames

.travis.yml

@@ -10,8 +10,8 @@ SeleniumLibrary_ is a web testing library for `Robot Framework`_ that
 utilizes the Selenium_ tool internally. The project is hosted on GitHub_
 and downloads can be found from PyPI_.
 
-SeleniumLibrary works with Selenium 3. It supports Python 2.7 as well as
-Python 3.4 or newer. In addition to the normal Python_ interpreter, it
+SeleniumLibrary works with Selenium 3 and 4. It supports Python 2.7 as well as
+Python 3.6 or newer. In addition to the normal Python_ interpreter, it
 works also with PyPy_ and Jython_. Unfortunately Selenium_ is not
 currently supported by IronPython_ and thus this library does not work with
 IronPython either.
@@ -23,12 +23,15 @@ different versions and the overall project history.
 
 .. image:: https://img.shields.io/pypi/v/robotframework-seleniumlibrary.svg?label=version
  :target: https://pypi.python.org/pypi/robotframework-seleniumlibrary
+ 
+.. image:: https://img.shields.io/pypi/dm/robotframework-seleniumlibrary.svg
+ :target: https://pypi.python.org/pypi/robotframework-seleniumlibrary
 
 .. image:: https://img.shields.io/pypi/l/robotframework-seleniumlibrary.svg
  :target: https://www.apache.org/licenses/LICENSE-2.0
 
-.. image:: https://api.travis-ci.org/robotframework/SeleniumLibrary.png
- :target: https://travis-ci.org/robotframework/SeleniumLibrary
+.. image:: https://github.com/robotframework/SeleniumLibrary/workflows/SeleniumLibrary%20CI/badge.svg
+  :target: https://github.com/robotframework/SeleniumLibrary/actions?query=workflow%3A%22SeleniumLibrary+CI%22
 
 Keyword documentation
 ---------------------
@@ -220,6 +223,9 @@ Selenium2Library 1.8.0 and earlier Selenium 2 and 3 Python 2.6-2.7
 SeleniumLibrary 3.0 and 3.1 Selenium 2 and 3 Python 2.7 and 3.3+ Selenium2Library renamed and with Python 3 support and new architecture.
 SeleniumLibrary 3.2 Selenium 3 Python 2.7 and 3.4+ Drops Selenium 2 support.
 SeleniumLibrary 4.0 Selenium 3 Python 2.7 and 3.4+ Plugin API and support for event friging webdriver.
+SeleniumLibrary 4.1 Selenium 3 Python 2.7 and 3.5+ Drops Python 3.4 support.
+SeleniumLibrary 4.2 Selenium 3 Python 2.7 and 3.5+ Supports only Selenium 3.141.0 or newer.
+SeleniumLibrary 4.4 Selenium 3 and 4 Python 2.7 and 3.6+ New PythonLibCore and dropped Python 3.5 support.
 Selenium2Library 3.0 Depends on SeleniumLibrary Depends on SeleniumLibrary Thin wrapper for SeleniumLibrary 3.0 to ease transition.
 ================================== ========================== ========================== ===============
 
@@ -263,7 +269,7 @@ Going forward, all new development will happen in the new SeleniumLibrary
 project.
 
 .. _Robot Framework: https://robotframework.org
-.. _Selenium: https://seleniumhq.org
+.. _Selenium: https://www.seleniumhq.org/
 .. _SeleniumLibrary: https://github.com/robotframework/SeleniumLibrary
 .. _Selenium2Library: https://github.com/robotframework/Selenium2Library
 .. _Old SeleniumLibrary: https://github.com/robotframework/OldSeleniumLibrary

README.rst

@@ -36,6 +36,21 @@ system settings, which python is used by default. It is possible to run test
 by using different interpreter by using the `--interpreter` command line
 argument.
 
+Running test with Selenium Grid
+-------------------------------
+It is possible to run test by using `Selenium Grid`_ if keywords contains
+some grid specific implementation. Running test Selenium Grid requires
+that latest released selenium-server-standalone-*.jar is downloaded
+in the project root and Java is installed. The `run.py` will start and
+stop Selenium servers automatically. The testing with Selenium Grid
+can done by using `--grid true` argument. In some cases Selenium Grid adds
+some extra logging and causes test to fail when `robotstatuschecker`_ is
+used. In this case, these test should be tagged with `NoGrid` tag to
+exclude the test when Selenium Grid is being used. Also there might
+be need write test that are only run when Selenium Grid is used.
+Then in this case, test should be tagged with `OnlyGrid` tag to
+include them only when Selenium Grid is used.
+
 Robot Framework command line arguments
 --------------------------------------
 It is possible to pass Robot Framework command line arguments to the test
@@ -44,26 +59,13 @@ to use arguments to select required suite or test for the execution when
 developing new functionality for the library. Example like --test, --suite,
 --include and --exclude.
 
-Using Sauce Labs for acceptance tests
--------------------------------------
-When running test by using browser from Sauce labs, it is required that the
-Sauce Connect is used. The Sauce Connect allows the browser from Sauce Labs
-reach the acceptance test web server. The acceptance test uses tunnel with
-name `localtunnel` and therefore when establishing the Sauce Connect tunnel
-use the following command::
-
- bin/sc -u YOUR_USERNAME -k YOUR_ACCESS_KEY -i localtunnel
-
-More details and to download Sauce Connect visit:
-https://wiki.saucelabs.com/display/DOCS/High+Availability+Sauce+Connect+Proxy+Setup
-
 Examples
 --------
 Examples::
 
  run.py chrome
  run.py --interpreter jython firefox --suite javascript
- run.py chrome --sauceusername your_username --saucekey account_key --suite javascript
+ run.py headlesschrome --nounit --grid true
  run.py --interpreter "py -2" chrome --suite javascript
 
 To run just the unit tests, run::
@@ -79,13 +81,12 @@ Travis CI integration
 `Travis CI`_ is used to automatically test all new pull request to the
 repository. The detailed information about execution matrix can be found
 from the `.travis.yam`_. Generally speaking the test are automatically run
-by using Chrome and Firefox browsers. The project uses Python 2.7, Python 3.4,
-Python 3.6 and PyPy 3.5 for test execution. The project uses and latest available 
-Selenium 3 version for test execution. Test uses Robot Framework versions 
-2.9.2 and 3.0.4 for acceptance test execution.
+by using Chrome browser and by using supported Python and Robot Framework
+versions. But in Travis only the latest released Selenium version is used.
 
 .. _browser driver: https://github.com/robotframework/SeleniumLibrary#browser-drivers
 .. _PATH: https://en.wikipedia.org/wiki/PATH_(variable)
 .. _robotstatuschecker: https://github.com/robotframework/statuschecker/
 .. _Travis CI: https://travis-ci.org/robotframework/SeleniumLibrary
 .. _.travis.yam: https://github.com/robotframework/SeleniumLibrary/blob/master/.travis.yml
+.. _Selenium Grid: https://github.com/SeleniumHQ/selenium/wiki/Grid2

atest/README.rst

@@ -16,20 +16,20 @@ def __init__(self, ctx):
  def open_browser(self, url, browser='firefox', alias=None,
  remote_url=False, desired_capabilities=None,
  ff_profile_dir=None, options=None, service_log_path=None,
- extra_dictionary=None):
+ extra_dictionary=None, executable_path=None):
  self._new_creator.extra_dictionary = extra_dictionary
  browser_manager = BrowserManagementKeywords(self.ctx)
  browser_manager._make_driver = self._make_driver
  browser_manager.open_browser(url, browser=browser, alias=alias,
  remote_url=remote_url, desired_capabilities=desired_capabilities,
  ff_profile_dir=ff_profile_dir, options=options,
- service_log_path=service_log_path)
+ service_log_path=service_log_path, executable_path=None)
 
  def _make_driver(self, browser, desired_capabilities=None, profile_dir=None,
- remote=None, options=None, service_log_path=None):
+ remote=None, options=None, service_log_path=None, executable_path=None):
  driver = self._new_creator.create_driver(
  browser=browser, desired_capabilities=desired_capabilities, remote_url=remote,
- profile_dir=profile_dir, options=options, service_log_path=service_log_path)
+ profile_dir=profile_dir, options=options, service_log_path=service_log_path, executable_path=executable_path)
  driver.set_script_timeout(self.ctx.timeout)
  driver.implicitly_wait(self.ctx.implicit_wait)
  if self.ctx.speed:
@@ -40,7 +40,7 @@ def _make_driver(self, browser, desired_capabilities=None, profile_dir=None,
 class NewWebDriverCreator(WebDriverCreator):
 
  def create_driver(self, browser, desired_capabilities, remote_url,
- profile_dir=None, options=None, service_log_path=None):
+ profile_dir=None, options=None, service_log_path=None, executable_path=None):
  self.browser_names['seleniumwire'] = 'seleniumwire'
  browser = self._normalise_browser_name(browser)
  creation_method = self._get_creator_method(browser)

atest/acceptance/1-plugin/OpenBrowserExample.py

@@ -31,9 +31,8 @@ Event Firing Webdriver Input Text (WebElement)
  ... LOG 1:14 INFO After clear and send_keys
  Input Text //input[@name="textfield"] FooBar
 
-Event Firing Webdriver Click Element (WebElement)
+Event Firing Webdriver With Get WebElement (WebElement)
  [Tags] NoGrid
- [Documentation]
- ... LOG 1:5 INFO Before click
- ... LOG 1:9 INFO After click
- Click Element //input[@name="ok_button"]
+ Go To ${ROOT}/nested_divs.html
+ ${link}= Get WebElement //a[@id="needleC"]
+ Wait Until Element Contains ${link} top/c/needle

atest/acceptance/2-event_firing_webdriver/event_firing_webdriver.robot

@@ -8,8 +8,9 @@ Big List Of Naughty Strings
  ... https://github.com/minimaxir/big-list-of-naughty-strings
  Open Browser To Start Page
  ${blns} = blns.Get Blns
- :FOR ${string} IN @{blns}
- \ Check Blns Error Check ${string}
+ FOR ${string} IN @{blns}
+ Check Blns Error Check ${string}
+ END
 
 *** Keywords ***
 Check Blns Error Check

atest/acceptance/big_list_of_naught_strings.robot

@@ -28,8 +28,9 @@ Create Webdriver With Duplicate Arguments
 
 Create Webdriver With Bad Keyword Argument Dictionary
  [Documentation] Invalid arguments types
- Run Keyword And Expect Error kwargs must be a dictionary.
- ... Create Webdriver Firefox kwargs={'spam': 'eggs'}
+ ${status} ${error} = Run Keyword And Ignore Error Create Webdriver Firefox kwargs={'spam': 'eggs'}
+ Should Be Equal ${status} FAIL
+ Should Match Regexp ${error} (TypeError: __init__\\(\\) got an unexpected keyword argument 'spam'|kwargs must be a dictionary\.)
 
 *** Keywords ***
 Set Driver Variables
@@ -46,10 +47,9 @@ Set Driver Variables
  ... htmlunitwithjs=HTMLUNITWITHJS android=ANDROID iphone=IPHONE
  ... safari=SAFARI headlessfirefox=FIREFOX headlesschrome=CHROME
  ${dc name}= Get From Dictionary ${dc names} ${BROWSER.lower().replace(' ', '')}
- ${caps}= Evaluate sys.modules['selenium.webdriver'].DesiredCapabilities.${dc name}
- ... selenium.webdriver,sys
- ${url as str}= Evaluate str('${REMOTE_URL}') # cannot be unicode for versions >= 2.32
+ ${caps}= Evaluate selenium.webdriver.DesiredCapabilities.${dc name}
+ ... modules=selenium, selenium.webdriver
  ${kwargs}= Create Dictionary
  Run Keyword If "${name}"=="Remote" Set To Dictionary ${kwargs} command_executor
- ... ${url as str} desired_capabilities ${caps}
+ ... ${REMOTE_URL} desired_capabilities ${caps}
  Set Test Variable ${KWARGS} ${kwargs}

atest/acceptance/create_webdriver.robot

@@ -120,6 +120,16 @@ Alert Should Be Present with custom timeout
  ... Alert Should Be Present timeout=1ms
  Alert Should Be Present Alert after 500ms! ACCEPT 3s
 
+Handle Alert when popup window closes
+ [Documentation] Popup window is closed by javascript while
+ ... 'Handle Alert' keyword is waiting for alert
+ ... FAIL GLOB: An exception occurred waiting for alert*
+ [Setup] Go To Page "javascript/self_closing_popup.html"
+ Click Button Self Closing
+ ${handle} = Switch Window NEW
+ Handle Alert timeout=10s
+ [Teardown] Switch Window ${handle}
+
 *** Keywords ***
 Wait For Title Change
  [Arguments] ${expected}