Move test inside package

wagtail-nest · Nov 23, 2016 · bbd1e27 · bbd1e27
1 parent 7e35093
commit bbd1e27
Show file tree

Hide file tree

Showing 18 changed files with 17 additions and 24 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -7,6 +7,7 @@ install:
   - pip install coveralls
   - pip install -e .[test]
 script:
-  - python -m py.test --cov=src/wagtailbakery --cov-report=xml tests/
+  - pytest --cov=wagtailbakery --cov-report=xml
+  - flake8 src/
 after_success:
   - coveralls
diff --git a/Makefile b/Makefile
@@ -3,21 +3,22 @@
 all: install clean test lint docs
 
 clean:
-	find . -name '*.pyc' | xargs rm
+	find . -type f -name "*.py[co]" -delete
+	find . -type d -name "__pycache__" -delete
 
 docs:
 	cd docs && make clean && make html
 
 flake8:
-	flake8 src/ tests/
+	flake8 src/
 
 install:
 	pip install -e .[docs,test]
 
 isort:
-	isort --check-only --diff --recursive src/ tests/
+	isort --check-only --diff --recursive src/
 
 lint: flake8 isort
 
 test:
-	python -m py.test tests/
+	pytest
diff --git a/setup.cfg b/setup.cfg
@@ -1,3 +1,6 @@
+[coverage:run]
+omit=src/wagtailbakery/tests/*
+
 [isort]
 line_length=80
 
@@ -6,8 +9,7 @@ exclude=src/wagtailbakery/migrations/
 max-line-length=80
 
 [tool:pytest]
-DJANGO_SETTINGS_MODULE=tests.settings
-django_find_project=false
+DJANGO_SETTINGS_MODULE=wagtailbakery.tests.settings
 
 [wheel]
 universal=1
diff --git a/tests/__init__.py → src/wagtailbakery/tests/__init__.py b/tests/__init__.py → src/wagtailbakery/tests/__init__.py
diff --git a/src/wagtailbakery/tests/conftest.py b/src/wagtailbakery/tests/conftest.py
@@ -0,0 +1 @@
+pytest_plugins = 'wagtailbakery.tests.fixtures'
diff --git a/src/wagtailbakery/tests/factories/__init__.py b/src/wagtailbakery/tests/factories/__init__.py
@@ -0,0 +1,2 @@
+from wagtailbakery.tests.factories.page import * # noqa
+from wagtailbakery.tests.factories.site import * # noqa
diff --git a/tests/factories/page.py → src/wagtailbakery/tests/factories/page.py b/tests/factories/page.py → src/wagtailbakery/tests/factories/page.py
diff --git a/tests/factories/site.py → src/wagtailbakery/tests/factories/site.py b/tests/factories/site.py → src/wagtailbakery/tests/factories/site.py
diff --git a/tests/fixtures.py → src/wagtailbakery/tests/fixtures.py b/tests/fixtures.py → src/wagtailbakery/tests/fixtures.py
@@ -1,9 +1,8 @@
 import pytest
 
 from wagtail.wagtailcore.models import Page, Site
-
-from tests.factories.page import PageFactory
-from tests.factories.site import SiteFactory
+from wagtailbakery.tests.factories.page import PageFactory
+from wagtailbakery.tests.factories.site import SiteFactory
 
 
 @pytest.fixture

diff --git a/tests/integration/__init__.py → ...gtailbakery/tests/integration/__init__.py b/tests/integration/__init__.py → ...gtailbakery/tests/integration/__init__.py
diff --git a/tests/integration/test_models.py → ...ilbakery/tests/integration/test_models.py b/tests/integration/test_models.py → ...ilbakery/tests/integration/test_models.py
diff --git a/tests/integration/test_views.py → ...ailbakery/tests/integration/test_views.py b/tests/integration/test_views.py → ...ailbakery/tests/integration/test_views.py
diff --git a/tests/settings.py → src/wagtailbakery/tests/settings.py b/tests/settings.py → src/wagtailbakery/tests/settings.py
@@ -40,8 +40,6 @@
 
     'bakery',
     'wagtailbakery',
-
-    'tests',
 ]
 
 LANGUAGES = [
@@ -76,7 +74,7 @@
     'django.contrib.auth.hashers.MD5PasswordHasher',
 )
 
-ROOT_URLCONF = 'tests.urls'
+ROOT_URLCONF = 'wagtailbakery.tests.urls'
 
 SECRET_KEY = '7b&ova34-9b(dj$gevm65$lc!m3#^#g1z*v#gv-g8k0wlo7#l8'
 

diff --git a/tests/urls.py → src/wagtailbakery/tests/urls.py b/tests/urls.py → src/wagtailbakery/tests/urls.py
diff --git a/tests/conftest.py b/tests/conftest.py
diff --git a/tests/factories/__init__.py b/tests/factories/__init__.py
diff --git a/tests/templates/wagtailcore/page_detail.html b/tests/templates/wagtailcore/page_detail.html
diff --git a/tests/unit/__init__.py b/tests/unit/__init__.py