tox

fabiogibson · May 9, 2017 · 9503d00 · 9503d00
1 parent 8b48cb9
commit 9503d00
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 3 deletions.
diff --git a/livesync/tests/test_middleware.py b/livesync/tests/test_middleware.py
@@ -1,15 +1,15 @@
 from unittest import TestCase
+# from django.test import TestCase
 from mock import Mock, PropertyMock, patch
 from livesync.core.middleware import DjangoLiveSyncMiddleware
-# from django.conf import settings
 
 
 class LiveSyncMiddlewareTestCase(TestCase):
     def setUp(self):
         self.mocked_response = Mock()
         self.get_response = Mock(return_value=self.mocked_response)
         self.middleware = DjangoLiveSyncMiddleware(self.get_response)
-        self.mock_content_property = PropertyMock(return_value="<body></body>")
+        self.mock_content_property = PropertyMock(return_value=b"<body></body>")
         type(self.mocked_response).content = self.mock_content_property
 
     @patch('livesync.core.middleware.settings.DEBUG', True)
@@ -20,7 +20,7 @@ def test_middleware_injects_js_file_correctly(self):
         # assert
 
         self.mock_content_property.assert_called()
-        self.assertTrue("<script src='/static/livesync.js'></script>" in self.mock_content_property.call_args[0][0])
+        self.assertTrue(b"<script src='/static/livesync.js'></script>" in self.mock_content_property.call_args[0][0])
 
     @patch('livesync.core.middleware.settings.DEBUG', True)
     @patch('django.conf.settings.DEBUG', True)

diff --git a/requirements.txt b/requirements.txt
@@ -4,3 +4,4 @@ coverage==4.3.4
 Django==1.11
 mock==2.0.0
 nose2==0.6.5
+tox==2.7.0
diff --git a/runtests.py b/runtests.py
@@ -9,11 +9,13 @@
 import sys
 
 import nose2
+import django
 from django.conf import settings
 
 
 if __name__ == '__main__':
     settings.configure()
+    django.setup()
     settings.BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
     settings.DJANGO_LIVESYNC = {'PORT': 9001, 'HOST': '127.0.0.1'}
     result = nose2.discover()

diff --git a/tox.ini b/tox.ini
@@ -0,0 +1,15 @@
+[tox]
+envlist =
+    py33-django8
+    py36-django11
+    py{27,34,35}-django{8,9,10,11}
+
+[testenv]
+deps=
+    mock
+    nose2
+    django8: Django==1.8
+    django9: Django==1.9
+    django10: Django==1.10
+    django11: Django==1.11
+commands=python runtests.py