Fix and update tests.

.travis.yml

@@ -3,9 +3,8 @@ python:
   - "2.7"
   - "3.4"
 env:
-  - DJANGO=1.5.12
-  - DJANGO=1.6.9
-  - DJANGO=1.7.2
+  - DJANGO=1.6.10
+  - DJANGO=1.7.4
 install:
   - pip install -q Django==$DJANGO
   - pip install coveralls

runtests.py

@@ -2,9 +2,7 @@
 from __future__ import unicode_literals
 import sys
 
-import django
 from django.conf import settings
-from django.test.utils import get_runner
 
 
 if not settings.configured:
@@ -48,7 +46,11 @@
 
 
 def runtests():
-    django.setup()
+    from django import VERSION
+    if VERSION[1] >= 7:
+        from django import setup
+        setup()
+    from django.test.utils import get_runner
     TestRunner = get_runner(settings)
     test_runner = TestRunner()
     failures = test_runner.run_tests(["tests"])

tests/tests.py

@@ -134,7 +134,7 @@ def test_invite_non_user_without_email(self):
         self.client.login(username='dany', password='secret')
         response = self.client.get(reverse('invited_only'))
         # Dany should be denied, since he has no connection with email account
-        self.assertRedirects(response, reverse('hunger-invalid', args=[code]))
+        self.assertRedirects(response, reverse('hunger-invalid', args=[code.code]))
 
     def test_invite_non_user_public_invitation(self):
         """
@@ -171,7 +171,7 @@ def test_invite_existing_user_without_email(self):
         self.client.login(username='alice', password='secret')
         response = self.client.get(reverse('invited_only'))
         # Alice should be denied, since she has no connection with email account
-        self.assertRedirects(response, reverse('hunger-invalid', args=[code]))
+        self.assertRedirects(response, reverse('hunger-invalid', args=[code.code]))
 
     def test_invalid_code(self):
         """

tox.ini

@@ -1,28 +1,28 @@
 [tox]
 envlist =
+        py34-django17,
+        py27-django17,
         py34-django16,
-        py27-django16,
-        py27-django15,
-        py26-django15
+        py27-django16
 
 [testenv]
 commands = python runtests.py
 
-[testenv:py34-django16]
+[testenv:py34-django17]
 basepython = python3.4
-deps = Django==1.6.2
+deps = Django==1.7.4
 
-[testenv:py27-django16]
+[testenv:py27-django17]
 basepython = python2.7
-deps = Django==1.6.2
+deps = Django==1.7.4
 
-[testenv:py27-django15]
-basepython = python2.7
-deps = Django==1.5.5
+[testenv:py34-django16]
+basepython = python3.4
+deps = Django==1.6.10
 
-[testenv:py26-django15]
-basepython = python2.6
-deps = Django==1.5.5
+[testenv:py27-django16]
+basepython = python2.7
+deps = Django==1.6.10
 
 [pep8]
 ignore=