changed travis' conf

.travis.yml

@@ -2,18 +2,17 @@ sudo: false
 language: python
 python:
   - "3.4"
-  - "2.7"
 
 # command to install dependencies, e.g. pip install -r requirements.txt --use-mirrors
 install:
   - pip install -e .
-  - python setup.py test
+  - pip install nose django_nose ddt
+  - pip install python-coveralls
   - pip install tox-travis
 
-script: tox
+script:
+  - tox
+  - coverage run --source dedal runtests.py
 
-# command to run tests using coverage, e.g. python setup.py test
-# script: coverage run --source dedal runtests.py
-
-# report coverage to coveralls.io
-# after_success: coveralls
+after_success:
+  - coveralls

runtests.py

@@ -17,12 +17,15 @@
             "django.contrib.auth",
             "django.contrib.contenttypes",
             "django.contrib.sites",
+            "django.contrib.staticfiles",
             "dedal",
             "example.blog",
+            "bootstrapform",
         ],
         SITE_ID=1,
         NOSE_ARGS=['-s'],
         MIDDLEWARE_CLASSES=(),
+        STATIC_URL='/static/'
     )
 
     try:

tests/test_models.py

@@ -36,7 +36,7 @@ def test_unregister_should_raise_error_when_not_in_register(self):
 class DedalObject(TestCase):
     def test_actions(self):
         actions = [ACTION_CREATE]
-        instance = Dedal(Post, actions)
+        instance = Dedal(site, Post, actions)
         for action in actions:
             self.assertTrue(hasattr(instance, action), action)
 

tox.ini

@@ -2,7 +2,7 @@
 envlist =
 	{py27,py34,py35}-dj16
 	{py27,py34,py35}-dj{17,18}
-	{py27,py34,py35}-dj{19,master}
+	{py27,py34,py35}-dj{19}
 
 [testenv]
 commands = python runtests.py
@@ -11,11 +11,10 @@ deps =
 	dj17: Django>=1.7,<1.8
 	dj18: Django>=1.8,<1.9
 	dj19: Django>=1.9,<1.10
-	djmaster: https://github.com/django/django/archive/master.tar.gz
 	nose
 	django-nose
+	ddt
 
 
 [tox:travis]
-2.7 = py27
 3.4 = py34