Skip to content

Commit c1b6e1f

Browse files
committed
TST: Implement edge and concurrency in CI
1 parent c78b010 commit c1b6e1f

File tree

2 files changed

+12
-5
lines changed

2 files changed

+12
-5
lines changed

.github/workflows/ci.yml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ on:
44
push:
55
pull_request:
66

7+
concurrency:
8+
group: ${{ github.workflow }}-${{ github.ref }}
9+
cancel-in-progress: true
710

811
env:
912
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -19,7 +22,8 @@ jobs:
1922
matrix:
2023
os: [ubuntu-latest]
2124
python-version: ["3.10"]
22-
browser: [firefox, chrome]
25+
browser: [firefox, chrome, edge]
26+
headless: [true]
2327

2428
steps:
2529
- uses: actions/checkout@v2
@@ -50,6 +54,9 @@ jobs:
5054
- uses: browser-actions/setup-firefox@latest
5155
if: ${{ matrix.browser }} == "firefox"
5256

57+
- uses: browser-actions/setup-edge@latest
58+
if: ${{ matrix.browser }} == "edge"
59+
5360
- name: Run Tests in ${{ matrix.browser }}
5461
run: |
55-
pytest -v -vrxs --headless --browser=${{ matrix.browser }}
62+
pytest -v -vrxs --headless=${{ matrix.headless }} --browser=${{ matrix.browser }}

conftest.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,8 @@ def download_driver(request):
105105
@pytest.fixture
106106
def web(request, tmp_folder: str, download_driver: str):
107107
browser = request.config.getoption("--browser") or Browser.CHROME
108-
is_headless = request.config.getoption("--headless")
109-
108+
is_headless = request.config.getoption("--headless") or "false"
109+
is_headless = True if is_headless.lower() == "true" else False
110110
web = factory_setup_browser(browser=browser, is_headless=is_headless, tmp_folder=tmp_folder,
111111
download_driver=download_driver)
112112
yield web
@@ -119,6 +119,6 @@ def get_event_result(id_event: str, web: WebBot) -> typing.Dict:
119119

120120

121121
def pytest_addoption(parser):
122-
parser.addoption('--headless', action='store_const', const=True)
122+
parser.addoption('--headless', action='store', default="true")
123123
parser.addoption('--browser', action='store', default='chrome')
124124

0 commit comments

Comments
 (0)