diff --git a/.github/workflows/linters.yml b/.github/workflows/linters.yml index b453d365..8840d3db 100644 --- a/.github/workflows/linters.yml +++ b/.github/workflows/linters.yml @@ -26,23 +26,7 @@ jobs: - name: Pycodestyle run: | pip install pycodestyle - pycodestyle $(pwd) --ignore=E501,W503,E402,E731 --exclude=.venv,tests_from_past - - Pycodestyle-full-report: - name: Lint Pycodestyle Full Report - runs-on: ubuntu-20.04 - steps: - - name: Checkout code - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v2 - with: - python-version: '3.7' - - name: Pycodestyle Full Report - run: | - pip install pycodestyle - pycodestyle $(pwd) --ignore=E501,W503 --exclude=.venv,tests_from_past - continue-on-error: true + pycodestyle $(pwd) --ignore=E501,W503,E402,E731 --exclude=.venv Pylint: name: Lint Pylint @@ -58,7 +42,7 @@ jobs: run: | pip install pylint touch __init__.py - pylint $(pwd) --rcfile=.pylintrc --disable="$(cat .pylint-disabled-rules)" --ignore-patterns=.venv,tests_from_past + pylint $(pwd) --rcfile=.pylintrc --disable="$(cat .pylint-disabled-rules)" --ignore-patterns=.venv rm __init__.py Pylint-full-report: @@ -75,5 +59,5 @@ jobs: run: | pip install pylint touch __init__.py - pylint $(pwd) --rcfile=.pylintrc --disable="" --ignore-patterns=.venv,tests_from_past --exit-zero + pylint $(pwd) --rcfile=.pylintrc --disable="" --ignore-patterns=.venv --exit-zero rm __init__.py diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index a488bc1a..4e11cc05 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -5,7 +5,7 @@ on: [push, pull_request] jobs: test: - name: Test selene + name: Tests runs-on: ubuntu-20.04 env: DISPLAY: ":99" @@ -36,17 +36,15 @@ jobs: poetry install if: env.GIT_DIFF - # can be packaged as Docker-image - - name: Install Firefox & Chrome & xvfb + # can be packaged as Docker-image; p.s.: no need to install chrome or firefox on github-actions + - name: Install xvfb run: | sudo apt-get update - sudo apt-get install firefox - sudo apt-get install google-chrome-stable sudo apt-get install xvfb sudo Xvfb -ac :99 -screen 0 1280x1024x24 > /dev/null 2>&1 & if: env.GIT_DIFF - - name: Test selene with pytest + - name: Tests run: | poetry run pytest -sv --cov-config .coveragerc --cov-report html:skip-covered --cov-report term:skip-covered --cov=selene --cov-report xml:coverage.xml --tb=short tests/ --headless=True mkdir -p Artifacts/skip-covered diff --git a/selene/api/shared/__init__.py b/selene/api/shared/__init__.py index c5d56462..a9de959c 100644 --- a/selene/api/shared/__init__.py +++ b/selene/api/shared/__init__.py @@ -22,4 +22,4 @@ from selene.api.base import * -from selene.support.shared import browser, config, s, ss +from selene.support.shared import browser, config, jquery_style diff --git a/tests/examples/test_wait_until.py b/tests/examples/test_wait_until.py index 611d998f..dddf85da 100644 --- a/tests/examples/test_wait_until.py +++ b/tests/examples/test_wait_until.py @@ -48,7 +48,7 @@ def test_progress_bar_disappears_in_time(browser): show_dialog_btn = browser.element('.btn-primary') dialog = browser.element('.modal-backdrop.fade.in') browser.open( - 'https://www.seleniumeasy.com/test/bootstrap-progress-bar-dialog-demo.html' + 'https://demo.seleniumeasy.com/bootstrap-progress-bar-dialog-demo.html' ) show_dialog_btn.click() @@ -70,7 +70,7 @@ def test_progress_bar_does_not_disappear_in_time(browser): show_dialog_btn = browser.element('.btn-primary') dialog = browser.element('.modal-backdrop.fade.in') browser.open( - 'https://www.seleniumeasy.com/test/bootstrap-progress-bar-dialog-demo.html' + 'https://demo.seleniumeasy.com/bootstrap-progress-bar-dialog-demo.html' ) show_dialog_btn.click()