From 5a0d8a761243a7897c17ab0834553dbc7142aa52 Mon Sep 17 00:00:00 2001
From: Dominik George <dominik.george@teckids.org>
Date: Fri, 13 Dec 2019 15:02:26 +0100
Subject: [PATCH] [Tests] Include official apps in test run

---
 dev.sh  | 1 -
 tox.ini | 6 ++++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/dev.sh b/dev.sh
index 6a183f400..1840ccf81 100755
--- a/dev.sh
+++ b/dev.sh
@@ -15,7 +15,6 @@ case "$1" in
 	    poetry run sh -c "cd $d; poetry install"
 	done
 	remove_pip_metadata
-	poetry run ./manage.py migrate
 	poetry run ./manage.py compilemessages
 	poetry run ./manage.py yarn install
 	poetry run ./manage.py collectstatic --no-input
diff --git a/tox.ini b/tox.ini
index 0de057a7b..3671faf24 100644
--- a/tox.ini
+++ b/tox.ini
@@ -7,12 +7,12 @@ envlist = py37,py38
 whitelist_externals = poetry
 skip_install = true
 envdir = {toxworkdir}/globalenv
-commands_pre = poetry install
+commands_pre = ./dev.sh install-all
 commands =
     poetry run python manage.py compilemessages
     poetry run python manage.py yarn install
     poetry run python manage.py collectstatic --no-input --clear
-    poetry run pytest --cov=biscuit {posargs} biscuit/core/
+    poetry run pytest --cov=. {posargs} biscuit/ apps/official/
 
 [testenv:selenium]
 setenv =
@@ -77,3 +77,5 @@ junit_family = legacy
 omit =
     */migrations/*
     */tests/*
+    .tox/*
+    manage.py
-- 
GitLab