mirror of
https://github.com/Hopiu/django-fobi.git
synced 2026-05-21 19:01:53 +00:00
switch to chromedriver, update travis (yet failing)
This commit is contained in:
parent
6260cb48b6
commit
3613971d87
4 changed files with 66 additions and 14 deletions
51
.travis.yml
51
.travis.yml
|
|
@ -1,21 +1,52 @@
|
|||
dist: xenial
|
||||
|
||||
language: python
|
||||
|
||||
cache: pip
|
||||
|
||||
sudo: false
|
||||
|
||||
matrix:
|
||||
fast_finish: true
|
||||
include:
|
||||
- env: TOXENV=py34-django18
|
||||
- env: TOX_ENV=py27-django18
|
||||
python: 2.7
|
||||
- env: TOX_ENV=py35-django18
|
||||
python: 3.5
|
||||
- env: TOX_ENV=py36-django18
|
||||
python: 3.6
|
||||
- env: TOXENV=py34-django19
|
||||
|
||||
- env: TOX_ENV=py27-django111
|
||||
python: 2.7
|
||||
- env: TOX_ENV=py35-django111
|
||||
python: 3.5
|
||||
- env: TOX_ENV=py36-django111
|
||||
python: 3.6
|
||||
- env: TOXENV=py34-django110
|
||||
|
||||
- env: TOX_ENV=py35-django20
|
||||
python: 3.5
|
||||
- env: TOX_ENV=py36-django20
|
||||
python: 3.6
|
||||
- env: TOXENV=py35-django110
|
||||
- env: TOX_ENV=py37-django22
|
||||
python: 3.7
|
||||
|
||||
- env: TOX_ENV=py36-django21
|
||||
python: 3.6
|
||||
- env: TOXENV=py35-django111
|
||||
python: 3.6
|
||||
- env: TOXENV=py35-django20
|
||||
- env: TOX_ENV=py37-django21
|
||||
python: 3.7
|
||||
|
||||
- env: TOX_ENV=py36-django22
|
||||
python: 3.6
|
||||
- env: TOX_ENV=py37-django22
|
||||
python: 3.7
|
||||
|
||||
install:
|
||||
- pip install tox
|
||||
script:
|
||||
- tox
|
||||
- wget http://chromedriver.storage.googleapis.com/2.42/chromedriver_linux64.zip
|
||||
- unzip chromedriver_linux64.zip -d /home/travis/
|
||||
- pip install -r examples/requirements/test.txt
|
||||
|
||||
before_script:
|
||||
- export CHROME_BIN=/home/travis/chromedriver
|
||||
- sleep 2
|
||||
|
||||
script: travis_retry tox -e $TOX_ENV
|
||||
|
|
|
|||
|
|
@ -5,5 +5,5 @@ pytest-cov==2.6.1
|
|||
pytest-django==3.4.8
|
||||
pytest-ordering==0.6
|
||||
pytest==4.3.0
|
||||
selenium==2.53.6
|
||||
selenium==3.141.0
|
||||
tox==3.7.0
|
||||
|
|
|
|||
|
|
@ -518,7 +518,6 @@ PACKAGE_NAME_GRAPPELLI = "grappelli_safe" # Just for tests
|
|||
# ********************* Registration settings ******************
|
||||
# **************************************************************
|
||||
|
||||
|
||||
ACCOUNT_ACTIVATION_DAYS = 7
|
||||
REGISTRATION_FORM = 'registration_addons.forms.CaptchaRegistrationForm'
|
||||
SIMPLE_BACKEND_REDIRECT_URL = '/en/'
|
||||
|
|
@ -752,6 +751,14 @@ if DJANGO_GTE_1_8:
|
|||
FIREFOX_BIN_PATH = ''
|
||||
PHANTOM_JS_EXECUTABLE_PATH = None
|
||||
|
||||
CHROME_DRIVER_EXECUTABLE_PATH = os.environ.get('CHROME_BIN', None)
|
||||
|
||||
from selenium import webdriver
|
||||
CHROME_DRIVER_OPTIONS = webdriver.ChromeOptions()
|
||||
CHROME_DRIVER_OPTIONS.add_argument('-headless')
|
||||
CHROME_DRIVER_OPTIONS.add_argument('-no-sandbox')
|
||||
CHROME_DRIVER_OPTIONS.add_argument('-single-process')
|
||||
|
||||
# Testing mode
|
||||
TESTING = False
|
||||
|
||||
|
|
|
|||
|
|
@ -67,12 +67,26 @@ class BaseFobiBrowserBuldDynamicFormsTest(LiveServerTestCase):
|
|||
@classmethod
|
||||
def setUpClass(cls):
|
||||
"""Set up class."""
|
||||
# cls.driver = WebDriver()
|
||||
chrome_driver_path = getattr(
|
||||
settings,
|
||||
'CHROME_DRIVER_EXECUTABLE_PATH',
|
||||
None
|
||||
)
|
||||
chrome_driver_options = getattr(
|
||||
settings,
|
||||
'CHROME_DRIVER_OPTIONS',
|
||||
None
|
||||
)
|
||||
firefox_bin_path = getattr(settings, 'FIREFOX_BIN_PATH', None)
|
||||
phantom_js_executable_path = getattr(
|
||||
settings, 'PHANTOM_JS_EXECUTABLE_PATH', None
|
||||
)
|
||||
if phantom_js_executable_path is not None:
|
||||
if chrome_driver_path is not None:
|
||||
cls.driver = webdriver.Chrome(
|
||||
executable_path=chrome_driver_path,
|
||||
chrome_options=chrome_driver_options
|
||||
)
|
||||
elif phantom_js_executable_path is not None:
|
||||
if phantom_js_executable_path:
|
||||
cls.driver = webdriver.PhantomJS(
|
||||
executable_path=phantom_js_executable_path
|
||||
|
|
|
|||
Loading…
Reference in a new issue