Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

#432 Grade selenium to last version #684

Merged
merged 2 commits into from
Dec 31, 2018
Merged

#432 Grade selenium to last version #684

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
abe55f2
#432 Grade selenium to last version
duker33 Dec 31, 2018
c5a7ad1
#432 Fix error at docker-compose
duker33 Dec 31, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docker/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ collectstatic:

test: build-static
$(dc) up -d app selenium
$(dc) exec app python manage.py test -v 3 --liveserver=app:8020-8030 --parallel
$(dc) exec app python manage.py test -v 3 --liveserver=app-server:8020-8030 --parallel
$(dc) stop

lint-code:
Expand Down
8 changes: 6 additions & 2 deletions docker/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,11 @@ x-app-base: &app-base
- $VIRTUAL_HOST_EXPOSE_PORT:$VIRTUAL_HOST_PORT
- $VIRTUAL_HOST_LIVESERVER_PORT
networks:
- se-backend
se-backend:
aliases:
# Use alias here because Chrome (and not only Chrome) supports HSTS in strange way.
# See this github comment for details: https://goo.gl/ynD1KC
- app-selenium
depends_on:
- postgres
- rabbitmq
Expand Down Expand Up @@ -94,7 +98,7 @@ services:
- 6382:6379

selenium:
image: selenium/standalone-chrome-debug:3.10.0
image: selenium/standalone-chrome-debug:3.14.0
restart: always
ports:
- 4444
Expand Down
4 changes: 2 additions & 2 deletions requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ django-mptt==0.8.7
django-widget-tweaks
ipython
openpyxl==2.5.2
psycopg2-binary==2.7.5
psycopg2-binary==2.7.6.1
requests
selenium==3.11.0
selenium==3.14.0
selenium-requests==1.3
tblib==1.3.2
Unidecode==1.0.22
Expand Down