Docker - add commands for lint and tests
This commit is contained in:
parent
721937e425
commit
6dffecb9bb
23
Makefile
23
Makefile
@ -55,6 +55,13 @@ docker-init: docker-init-db docker-restart docker-run-workers
|
|||||||
docker-init-db:
|
docker-init-db:
|
||||||
docker-compose -f docker-compose-dev.yml exec fittrackee docker/init-database.sh
|
docker-compose -f docker-compose-dev.yml exec fittrackee docker/init-database.sh
|
||||||
|
|
||||||
|
docker-lint-client:
|
||||||
|
docker-compose -f docker-compose-dev.yml up -d fittrackee_client
|
||||||
|
docker-compose -f docker-compose-dev.yml exec fittrackee_client yarn lint
|
||||||
|
|
||||||
|
docker-lint-python: docker-run
|
||||||
|
docker-compose -f docker-compose-dev.yml exec fittrackee docker/lint-python.sh
|
||||||
|
|
||||||
docker-logs:
|
docker-logs:
|
||||||
docker-compose -f docker-compose-dev.yml logs --follow
|
docker-compose -f docker-compose-dev.yml logs --follow
|
||||||
|
|
||||||
@ -85,6 +92,18 @@ docker-shell:
|
|||||||
docker-stop:
|
docker-stop:
|
||||||
docker-compose -f docker-compose-dev.yml stop
|
docker-compose -f docker-compose-dev.yml stop
|
||||||
|
|
||||||
|
docker-test-client:
|
||||||
|
docker-compose -f docker-compose-dev.yml up -d fittrackee_client
|
||||||
|
docker-compose -f docker-compose-dev.yml exec fittrackee_client yarn test:unit
|
||||||
|
|
||||||
|
# needs a running application
|
||||||
|
docker-test-e2e: docker-run
|
||||||
|
docker-compose -f docker-compose-dev.yml up -d selenium
|
||||||
|
docker-compose -f docker-compose-dev.yml exec fittrackee docker/test-e2e.sh $(PYTEST_ARGS)
|
||||||
|
|
||||||
|
docker-test-python: docker-run
|
||||||
|
docker-compose -f docker-compose-dev.yml exec fittrackee docker/test-python.sh $(PYTEST_ARGS)
|
||||||
|
|
||||||
docker-up:
|
docker-up:
|
||||||
docker-compose -f docker-compose-dev.yml up fittrackee
|
docker-compose -f docker-compose-dev.yml up fittrackee
|
||||||
|
|
||||||
@ -184,11 +203,11 @@ set-admin:
|
|||||||
echo "Deprecated command, will be removed in a next version. Use 'user-set-admin' instead."
|
echo "Deprecated command, will be removed in a next version. Use 'user-set-admin' instead."
|
||||||
$(FTCLI) users update $(USERNAME) --set-admin true
|
$(FTCLI) users update $(USERNAME) --set-admin true
|
||||||
|
|
||||||
|
test-all: test-client test-python
|
||||||
|
|
||||||
test-e2e:
|
test-e2e:
|
||||||
$(PYTEST) e2e --driver firefox $(PYTEST_ARGS)
|
$(PYTEST) e2e --driver firefox $(PYTEST_ARGS)
|
||||||
|
|
||||||
test-all: test-client test-python
|
|
||||||
|
|
||||||
test-e2e-client:
|
test-e2e-client:
|
||||||
E2E_ARGS=client $(PYTEST) e2e --driver firefox $(PYTEST_ARGS)
|
E2E_ARGS=client $(PYTEST) e2e --driver firefox $(PYTEST_ARGS)
|
||||||
|
|
||||||
|
@ -64,3 +64,9 @@ services:
|
|||||||
ports:
|
ports:
|
||||||
- "1025:1025"
|
- "1025:1025"
|
||||||
- "8025:8025"
|
- "8025:8025"
|
||||||
|
|
||||||
|
selenium:
|
||||||
|
image: selenium/standalone-firefox:latest
|
||||||
|
hostname: selenium
|
||||||
|
privileged: true
|
||||||
|
shm_size: 2g
|
@ -2,7 +2,7 @@
|
|||||||
set -e
|
set -e
|
||||||
cd /usr/src/app
|
cd /usr/src/app
|
||||||
|
|
||||||
source .env.docker
|
source .env
|
||||||
|
|
||||||
ftcli db drop
|
ftcli db drop
|
||||||
ftcli db upgrade
|
ftcli db upgrade
|
7
docker/lint-python.sh
Executable file
7
docker/lint-python.sh
Executable file
@ -0,0 +1,7 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
set -e
|
||||||
|
cd /usr/src/app
|
||||||
|
|
||||||
|
source .env
|
||||||
|
|
||||||
|
pytest --flake8 --isort --black -m "flake8 or isort or black" fittrackee e2e --ignore=fittrackee/migrations
|
@ -2,6 +2,6 @@
|
|||||||
set -e
|
set -e
|
||||||
cd /usr/src/app
|
cd /usr/src/app
|
||||||
|
|
||||||
source .env.docker
|
source .env
|
||||||
|
|
||||||
flask worker --processes=$WORKERS_PROCESSES >> dramatiq.log 2>&1
|
flask worker --processes=$WORKERS_PROCESSES >> dramatiq.log 2>&1
|
||||||
|
@ -2,6 +2,6 @@
|
|||||||
set -e
|
set -e
|
||||||
cd /usr/src/app
|
cd /usr/src/app
|
||||||
|
|
||||||
source .env.docker
|
source .env
|
||||||
|
|
||||||
ftcli users update $1 --set-admin true
|
ftcli users update $1 --set-admin true
|
||||||
|
@ -2,6 +2,6 @@
|
|||||||
set -e
|
set -e
|
||||||
cd /usr/src/app
|
cd /usr/src/app
|
||||||
|
|
||||||
source .env.docker
|
source .env
|
||||||
|
|
||||||
/bin/bash
|
/bin/bash
|
8
docker/test-e2e.sh
Executable file
8
docker/test-e2e.sh
Executable file
@ -0,0 +1,8 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
set -e
|
||||||
|
cd /usr/src/app
|
||||||
|
|
||||||
|
source .env
|
||||||
|
|
||||||
|
export TEST_APP_URL=http://$(hostname --ip-address):5000
|
||||||
|
pytest e2e --driver Remote --capability browserName firefox --selenium-host selenium --selenium-port 4444 $*
|
7
docker/test-python.sh
Executable file
7
docker/test-python.sh
Executable file
@ -0,0 +1,7 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
set -e
|
||||||
|
cd /usr/src/app
|
||||||
|
|
||||||
|
source .env
|
||||||
|
|
||||||
|
pytest fittrackee $*
|
Loading…
Reference in New Issue
Block a user