Add ModelForm test and some cleanup

modeltrans/fields.py

@@ -52,7 +52,6 @@ def __init__(self, original_field, language=None, *args, **kwargs):
 
         self.blank = kwargs['blank']
         self.null = kwargs['null']
-        self.editable = kwargs.get('editable', True)
 
         self.concrete = False
 

tests/test_forms.py

@@ -1,18 +1,40 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.test import TestCase
 from django.forms import ModelForm
+from django.test import TestCase
+from django.utils.translation import override
+
+from .app.models import Blog
+
+
+class ModelFormTest(TestCase):
+    def test_modelform(self):
+        class BlogForm(ModelForm):
+            class Meta:
+                model = Blog
+                fields = ('title_i18n', 'body_i18n', )
+
+        article = Blog(title='English', title_nl='Nederlands')
 
-from modeltrans.migration import I18nDataMigration, I18nIndexMigration, get_translatable_models
+        with override('nl'):
+            form = BlogForm(instance=article, data={
+                'title_i18n': 'Nederlandse taal',
+                'body_i18n': 'foo'
+            })
+            form.save()
 
-from .app.models import Blog, Category
+        article.refresh_from_db()
+        self.assertEqual(article.title_nl, 'Nederlandse taal')
+        self.assertEqual(article.title_en, 'English')
 
+        with override('en'):
+            form = BlogForm(instance=article, data={
+                'title_i18n': 'English language',
+                'body_i18n': 'foo'
+            })
+            form.save()
 
-# class ModelFormTest(TestCase):
-#     def test_modelform(self):
-#
-#         class BlogForm(ModelForm):
-#             class Meta:
-#                 model = Blog
-#                 fields = ('title_i18n', 'body_i18n', )
+        article.refresh_from_db()
+        self.assertEqual(article.title_nl, 'Nederlandse taal')
+        self.assertEqual(article.title_en, 'English language')

tests/test_querysets.py

@@ -18,10 +18,10 @@
 
 
 def key(queryset, key, sep=None):
-    l = list([getattr(model, key) for model in queryset])
+    items = list([getattr(model, key) for model in queryset])
     if sep is not None:
-        l = sep.join(l)
-    return l
+        items = sep.join(items)
+    return items
 
 
 class GetFieldTest(TestCase):
@@ -303,19 +303,19 @@ def setUpTestData(self):
     def test_regular_fields(self):
         qs = Blog.objects.all().order_by('-title')
 
-        self.assertEquals(key(qs, 'title'), 'G,F,E,D,C,B,A'.split(','))
+        self.assertEquals(key(qs, 'title', sep=' '), 'G F E D C B A')
 
     def test_order_by_two_fields(self):
         '''Multiple translated fields should work too'''
         qs = Blog.objects.all().order_by('-title_fr', 'title_nl')
 
-        self.assertEquals(key(qs, 'title_nl'), 'X Y Z A B C D'.split())
+        self.assertEquals(key(qs, 'title_nl', sep=' '), 'X Y Z A B C D')
 
     def test_order_asc(self):
         qs = Blog.objects.all().order_by('title_nl')
 
         self.assertEquals(key(qs, 'title_nl'), sorted(self.NL))
-        self.assertEquals(key(qs, 'title'), 'A B C D G F E'.split())
+        self.assertEquals(key(qs, 'title', sep=' '), 'A B C D G F E')
 
     def test_order_desc(self):
         qs = Blog.objects.all().order_by('-title_nl')
@@ -395,10 +395,10 @@ def test_annotate_upper(self):
 
     def test_annotate_length(self):
         with override('nl'):
-            qs = Blog.objects.annotate(l=models.functions.Length('title_i18n'))
+            qs = Blog.objects.annotate(len=models.functions.Length('title_i18n'))
 
             self.assertEquals(
-                list(qs.values_list('l', flat=True)),
+                list(qs.values_list('len', flat=True)),
                 list(map(len, ['VALK', 'VULTURE', 'BAT', 'DOLFIN', 'ZEBRA']))
             )
 

tox.ini

@@ -51,8 +51,9 @@ commands =
 
 [testenv:flake8]
 basepython = python2.7
-commands = flake8
 deps = flake8==3.5.0
+skip_install = True
+commands = flake8
 
 [flake8]
 exclude = **/migrations/*.py,.git,.tox,__pycache__
@@ -61,6 +62,7 @@ max-line-length = 120
 [testenv:isort]
 whitelist_externals = make
 deps = isort==4.2.15
+skip_install = True
 basepython = python3.6
 commands = make isort
 
@@ -69,5 +71,6 @@ basepython = python3.6
 whitelist_externals = make
 changedir = docs
 commands = make html
+skip_install = True
 deps =
     -r{toxinidir}/docs/requirements.txt