Skip to content

Commit 3a16734

Browse files
lmartorellalmartorella
committed
Merge tag 'v6.1.1' into feat/minimize
Release 6.1.1 # Conflicts: # utest/test/api/test_plugins.py
2 parents 994a138 + 53b0aa9 commit 3a16734

File tree

60 files changed

+4362
-3688
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+4362
-3688
lines changed

‎.github/workflows/CI.yml

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ jobs:
99
strategy:
1010
matrix:
1111
python-version: [3.7, 3.9, pypy-3.7]
12-
rf-version: [3.2.2, 4.1.3]
12+
rf-version: [4.1.3, 5.0.1, 6.0.1]
1313

1414
steps:
15-
- uses: actions/checkout@v2
15+
- uses: actions/checkout@v3
1616
- name: Set up Python ${{ matrix.python-version }} with Robot Framework ${{ matrix.rf-version }}
17-
uses: actions/setup-python@v2
17+
uses: actions/setup-python@v4
1818
with:
1919
python-version: ${{ matrix.python-version }}
2020
- name: Start xvfb
@@ -44,24 +44,34 @@ jobs:
4444
if: matrix.python-version != 'pypy-3.7'
4545
run: |
4646
which python
47+
4748
- name: Run tests with headless Chrome and with PyPy
4849
if: matrix.python-version == 'pypy-3.7'
4950
run: |
5051
xvfb-run --auto-servernum python atest/run.py --nounit --zip headlesschrome
51-
- name: Run tests with headless Chrome and with Python != 3.8
52-
if: matrix.python-version != '3.8' && matrix.python-version != 'pypy-3.7'
53-
run: |
54-
xvfb-run --auto-servernum python atest/run.py --zip headlesschrome
55-
- name: Run tests normal Chrome with Python 3.8
56-
if: matrix.python-version == '3.8' && matrix.rf-version != '3.2.2' && matrix.python-version != 'pypy-3.7'
52+
53+
- name: Run tests with normal Chrome and with Python 3.7
54+
if: matrix.python-version == '3.7'
5755
run: |
5856
xvfb-run --auto-servernum python atest/run.py --zip chrome
57+
58+
- name: Run tests with headless Firefox with Python 3.9 and RF 4.1.3
59+
if: matrix.python-version == '3.9' && matrix.rf-version == '4.1.3'
60+
run: |
61+
xvfb-run --auto-servernum python atest/run.py --zip headlessfirefox
62+
63+
- name: Run tests with normal Firefox with Python 3.9 and RF != 4.1.3
64+
if: matrix.python-version == '3.9' && matrix.rf-version != '4.1.3'
65+
run: |
66+
xvfb-run --auto-servernum python atest/run.py --zip firefox
67+
5968
- name: Run tests with Selenium Grid
6069
if: matrix.python-version == '3.8' && matrix.rf-version == '3.2.2' && matrix.python-version != 'pypy-3.7'
6170
run: |
6271
wget --no-verbose --output-document=./selenium-server-standalone.jar http://selenium-release.storage.googleapis.com/3.141/selenium-server-standalone-3.141.59.jar
6372
sudo chmod u+x ./selenium-server-standalone.jar
6473
xvfb-run --auto-servernum python atest/run.py --zip headlesschrome --grid True
74+
6575
- uses: actions/upload-artifact@v1
6676
if: success() || failure()
6777
with:

‎.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
.project
22
.pydevproject
33
.idea
4+
.vscode
45
atest/results
56
atest/zip_results
67
utest/output_dir
@@ -10,7 +11,7 @@ utest/output_dir
1011
MANIFEST
1112
*.egg-info
1213
*.egg
13-
chromedriver.log
14+
*driver.log
1415
.pytest_cache
1516

1617
dist

‎BUILD.rst

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -164,22 +164,25 @@ Generate Stub file
164164

165165
Documentation
166166
-------------
167-
If generating release candidate or final release documentation, use `invoke kw-docs`
168-
but if this alpha or beta release, use `invoke kw-docs $VERSION`. The `invoke kw-docs $VERSION`
167+
If generating release candidate or final release documentation, use ``invoke kw-docs```
168+
but if this alpha or beta release, use ``invoke kw-docs $VERSION``. The ``invoke kw-docs $VERSION``
169169
does not replace the previous final release documentation, instead it will create new file
170-
with docs/SeleniumLibrary-$VERSION.html. From the below, execute either 1.1 or 1.2 step. The step
170+
with docs/SeleniumLibrary-$VERSION.html. From the below, execute either 1.A or 1.B step. The step
171171
2. is done always.
172172

173-
Note that this *must* be done after`setting version <Set version>`_ above
173+
Note that this *must* be done after `setting version <Set version>`_ above
174174
or docs will have wrong version number.
175175

176-
1.1. Generate pre or final release keyword documentation::
176+
1.
177+
A. Generate *pre or final release* keyword documentation::
177178

178179
invoke kw-docs
179180
git commit -m "Generated docs for version $VERSION" docs/SeleniumLibrary.html
180181
git push
181182

182-
1.2 Generate alpha or beta release keyword documentation::
183+
**OR**
184+
185+
B. Generate *alpha or beta release* keyword documentation::
183186

184187
invoke kw-docs -v $VERSION
185188
git add docs/SeleniumLibrary-$VERSION.html
@@ -192,7 +195,8 @@ push the new README.rst::
192195
git commit -m "Add alpha/beta kw docs for version $VERSION in README.rst" README.rst
193196
git push
194197

195-
2. If README.rst has changed, generate project documentation based on it::
198+
2. If README.rst has changed, generate project documentation based on it. One can check with
199+
the command ``git log <previousversiontag>..HEAD --oneline README.rst``::
196200

197201
invoke project-docs
198202
git commit -m "Regenerated project docs" docs/index.html

‎atest/acceptance/2-event_firing_webdriver/event_firing_webdriver.robot

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ ${event_firing_or_none} ${NONE}
1212
Open Browser To Start Page
1313
[Tags] NoGrid
1414
[Documentation]
15-
... LOG 1:12 DEBUG Wrapping driver to event_firing_webdriver.
16-
... LOG 1:14 INFO Got driver also from SeleniumLibrary.
15+
... LOG 1:37 DEBUG Wrapping driver to event_firing_webdriver.
16+
... LOG 1:39 INFO Got driver also from SeleniumLibrary.
1717
Open Browser ${FRONT PAGE} ${BROWSER} remote_url=${REMOTE_URL}
1818
... desired_capabilities=${DESIRED_CAPABILITIES}
1919

@@ -22,16 +22,16 @@ Event Firing Webdriver Go To (WebDriver)
2222
[Documentation]
2323
... LOG 1:2 INFO STARTS: Before navigate to
2424
... LOG 1:3 INFO Got driver also from SeleniumLibrary.
25-
... LOG 1:7 INFO STARTS: After navigate to
25+
... LOG 1:8 INFO STARTS: After navigate to
2626
Go To ${ROOT}/forms/named_submit_buttons.html
2727

2828
Event Firing Webdriver Input Text (WebElement)
2929
[Tags] NoGrid
3030
[Documentation]
31-
... LOG 1:5 INFO Before clear and send_keys
32-
... LOG 1:9 INFO After clear and send_keys
33-
... LOG 1:10 INFO Before clear and send_keys
34-
... LOG 1:14 INFO After clear and send_keys
31+
... LOG 1:6 INFO Before clear and send_keys
32+
... LOG 1:11 INFO After clear and send_keys
33+
... LOG 1:12 INFO Before clear and send_keys
34+
... LOG 1:17 INFO After clear and send_keys
3535
Input Text //input[@name="textfield"] FooBar
3636

3737
Event Firing Webdriver With Get WebElement (WebElement)

0 commit comments

Comments
 (0)