changed travis' conf

ar4s · Mar 26, 2016 · e48f6d5 · e48f6d5
1 parent 1d3e58c
commit e48f6d5
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -7,7 +7,6 @@ python:
 # command to install dependencies, e.g. pip install -r requirements.txt --use-mirrors
 install:
   - pip install -e .
-  - python setup.py test
   - pip install tox-travis
 
 script: tox

diff --git a/runtests.py b/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:

diff --git a/tests/test_models.py b/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)
 

diff --git a/tox.ini b/tox.ini
@@ -14,8 +14,11 @@ deps =
 	djmaster: https://github.com/django/django/archive/master.tar.gz
 	nose
 	django-nose
+	ddt
 
 
 [tox:travis]
-2.7 = py27
-3.4 = py34
+3.4-1.8 = py34-dj18
+3.4-1.7 = py34-dj17
+3.4-1.9 = py34-dj19
+3.4-master = py34-djmaster