From 7ab82161a13021e5ebef095e588ad1a80b088b16 Mon Sep 17 00:00:00 2001
From: Quantum <quantum2048@gmail.com>
Date: Sun, 13 Aug 2017 20:58:53 -0400
Subject: [PATCH] Make django tests work properly on Travis.

---
 .travis.yml                                                | 2 +-
 {testproject/testapp => optimize_later/tests}/__init__.py  | 0
 .../tests.py => optimize_later/tests/test_django.py        | 7 +++++--
 optimize_later/{tests.py => tests/test_standard.py}        | 0
 testproject/testproject/settings.py                        | 1 -
 5 files changed, 6 insertions(+), 4 deletions(-)
 rename {testproject/testapp => optimize_later/tests}/__init__.py (100%)
 rename testproject/testapp/tests.py => optimize_later/tests/test_django.py (90%)
 rename optimize_later/{tests.py => tests/test_standard.py} (100%)

diff --git a/.travis.yml b/.travis.yml
index 91ad2d7..b028e7a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,7 +14,7 @@ script:
   - if [ -n "$DJANGO_VERSION" ]; then
       coverage run --source=optimize_later testproject/manage.py test;
     else
-      coverage run --source=optimize_later -m unittest optimize_later.tests;
+      coverage run --source=optimize_later -m unittest discover optimize_later/;
     fi
 after_script:
   - codecov
diff --git a/testproject/testapp/__init__.py b/optimize_later/tests/__init__.py
similarity index 100%
rename from testproject/testapp/__init__.py
rename to optimize_later/tests/__init__.py
diff --git a/testproject/testapp/tests.py b/optimize_later/tests/test_django.py
similarity index 90%
rename from testproject/testapp/tests.py
rename to optimize_later/tests/test_django.py
index 90d1a76..0fa3705 100644
--- a/testproject/testapp/tests.py
+++ b/optimize_later/tests/test_django.py
@@ -5,10 +5,13 @@ import uuid
 from optimize_later.core import optimize_later, OptimizeReport
 
 try:
-    import django
+    from django.conf import settings
 except ImportError:
-    pass
+    use_django = False
 else:
+    use_django = settings.configured
+
+if use_django:
     from django.test import TestCase
     from optimize_later import apps
 
diff --git a/optimize_later/tests.py b/optimize_later/tests/test_standard.py
similarity index 100%
rename from optimize_later/tests.py
rename to optimize_later/tests/test_standard.py
diff --git a/testproject/testproject/settings.py b/testproject/testproject/settings.py
index 159d1c0..8907734 100644
--- a/testproject/testproject/settings.py
+++ b/testproject/testproject/settings.py
@@ -38,7 +38,6 @@ INSTALLED_APPS = [
     'django.contrib.messages',
     'django.contrib.staticfiles',
     'optimize_later',
-    'testapp',
 ]
 
 MIDDLEWARE = [