diff options
| -rw-r--r-- | .coveragerc | 18 | ||||
| -rw-r--r-- | .travis.yml | 7 | ||||
| -rw-r--r-- | requirements.txt | 1 | ||||
| -rw-r--r-- | workshop_app/tests/__init__.py | 0 | ||||
| -rw-r--r-- | workshop_app/tests/test_models.py (renamed from workshop_app/test_models.py) | 6 | ||||
| -rw-r--r-- | workshop_app/tests/test_views.py (renamed from workshop_app/test_views.py) | 9 |
6 files changed, 32 insertions, 9 deletions
diff --git a/.coveragerc b/.coveragerc new file mode 100644 index 0000000..d96c65a --- /dev/null +++ b/.coveragerc @@ -0,0 +1,18 @@ +[run] +branch = True +source = . +omit = + *tests* + *migrations* + *init* + local_settings.py + workshop_app/apps.py + workshop_portal/settings.py + workshop_portal/wsgi.py + + +[report] +exclude_lines = + except ImportError: + raise NotImplementedError + if __name__ == .__main__.: diff --git a/.travis.yml b/.travis.yml index 5d52997..1ffb76a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,4 +17,9 @@ install: script: - python manage.py makemigrations - python manage.py migrate - - python manage.py test + - coverage erase + - coverage run -p manage.py test -v2 + +after_success: + - coverage combine + - coverage report diff --git a/requirements.txt b/requirements.txt index 0c22f6b..d546151 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,3 +4,4 @@ packaging==16.8 python-dateutil==2.6.0 pytz==2016.10 six==1.10.0 +coverage diff --git a/workshop_app/tests/__init__.py b/workshop_app/tests/__init__.py new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/workshop_app/tests/__init__.py diff --git a/workshop_app/test_models.py b/workshop_app/tests/test_models.py index c9ac41c..bd037ec 100644 --- a/workshop_app/test_models.py +++ b/workshop_app/tests/test_models.py @@ -1,7 +1,7 @@ from django.test import TestCase -from .models import ( - Profile, User, Workshop, WorkshopType, - RequestedWorkshop, BookedWorkshop, ProposeWorkshopDate +from workshop_app.models import ( + Profile, User, Workshop, WorkshopType, + RequestedWorkshop, BookedWorkshop, ProposeWorkshopDate ) from datetime import datetime diff --git a/workshop_app/test_views.py b/workshop_app/tests/test_views.py index ebf48c0..fd93a3a 100644 --- a/workshop_app/test_views.py +++ b/workshop_app/tests/test_views.py @@ -1,16 +1,15 @@ -from .views import view_profile, user_login, edit_profile +from workshop_app.views import view_profile, user_login, edit_profile from django.test import TestCase -from .models import Profile, User, Workshop, WorkshopType,\ +from workshop_app.models import Profile, User, Workshop, WorkshopType,\ RequestedWorkshop, BookedWorkshop, ProposeWorkshopDate,\ has_profile - from datetime import datetime from json import dumps from django.test import Client from django.contrib.auth.models import Group, Permission from django.contrib.auth import authenticate from django.core.urlresolvers import reverse -from .forms import CreateWorkshop +from workshop_app.forms import CreateWorkshop class TestProfile(TestCase): def setUp(self): @@ -242,4 +241,4 @@ class TestWorkshopDashboard(TestCase): recurrences='RRULE:FREQ=WEEKLY;UNTIL=20170624T183000Z;BYDAY=WE;' ) -
\ No newline at end of file + |