Skip to content

Commit

Permalink
Merge pull request #156 from ElSnoMan/fix/mac-edge
Browse files Browse the repository at this point in the history
removed `options` from build_edge() to fix mac-edge issue
  • Loading branch information
ElSnoMan authored Jan 28, 2021
2 parents bd384e9 + e328088 commit 1480e4b
Show file tree
Hide file tree
Showing 5 changed files with 43 additions and 37 deletions.
21 changes: 13 additions & 8 deletions .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,31 +20,36 @@ jobs:
uses: actions/setup-python@v2
with:
python-version: 3.8

-
name: Install dependencies
run: |
pip install pipenv
# install non-dev dependencies from Pipfile
pipenv install --skip-lock
pip install poetry
# install dependencies from pyproject.toml
poetry install
# install flake8 for linting step
pipenv install flake8 --skip-lock
poetry add flake8
-
name: Lint with flake8
run: |
# stop the build if there are Python syntax errors or undefined names
pipenv run flake8 ./tests --count --select=E9,F63,F7,F82 --show-source --statistics
poetry run flake8 ./tests --count --select=E9,F63,F7,F82 --show-source --statistics
# exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
pipenv run flake8 ./tests --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
poetry run flake8 ./tests --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
-
name: Run Unit Tests
run: |
pipenv run pytest tests/unit
poetry run pytest tests/unit
-

name: Start Selenoid Server
# You may pin to the exact commit or the version.
# uses: Xotabu4/selenoid-github-action@abe532e06774138cf8c38c5dac461071de092504
uses: Xotabu4/selenoid-github-action@v1

-
name: Run UI Tests
run: |
pipenv run pytest tests/ui -n 2 --remote_url "http://localhost:4444/wd/hub"
poetry run pytest tests/ui -n 2 --remote_url "http://localhost:4444/wd/hub"
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ test_results
test_env
tests/data
data

poetry.lock

# Byte-compiled / optimized / DLL files
__pycache__/
Expand Down
26 changes: 0 additions & 26 deletions Pipfile

This file was deleted.

2 changes: 0 additions & 2 deletions pylenium/webdriver_factory.py
Original file line number Diff line number Diff line change
Expand Up @@ -198,8 +198,6 @@ def build_edge(version: str,
driver = WebDriverFactory().build_edge('latest', ['headless', 'incognito'], None)
"""
caps = build_capabilities(Browser.EDGE, capabilities)
options = build_options(Browser.EDGE, browser_options, experimental_options, extension_paths).to_capabilities()
caps.update(options)
if local_path:
return webdriver.Edge(local_path, capabilities=caps)
return webdriver.Edge(EdgeChromiumDriverManager(version=version).install(), capabilities=caps)
Expand Down
29 changes: 29 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
[tool.poetry]
name = "pyleniumio"
version = "1.12.2"
description = "The best of Selenium and Cypress in a single Python Package"
authors = ["Carlos <carlos@qap.dev>"]
license = "MIT"

[tool.poetry.dependencies]
python = "^3.8"
selenium = "^3.141.0"
webdriver-manager = "^3.3.0"
pydantic = "^1.7.3"
Faker = "^5.8.0"
requests = "^2.25.1"
click = "^7.1.2"
pyfiglet = "^0.8.post1"
pytest = "<6.1.0"
pytest-reportportal = "^5.0.7"
pytest-xdist = "^2.2.0"
pytest-parallel = "^0.1.0"
axe-selenium-python = "^2.1.6"

[tool.poetry.dev-dependencies]
flake8 = "^3.8.4"
autopep8 = "^1.5.4"

[build-system]
requires = ["poetry-core>=1.0.0"]
build-backend = "poetry.core.masonry.api"

0 comments on commit 1480e4b

Please sign in to comment.