Merge branch 'development'

[django-tables2.git] / tests / models.py

diff --git a/tests/models.py b/tests/models.py
index af311262e97c7388f3aca3eb3b92c9ac66f8a662..0f9b5e48d1c42632e1b1fcb2e734f292506c77b1 100644 (file)
--- a/tests/models.py
+++ b/tests/models.py
@@ -1,6 +1,5 @@
 import itertools
 from django.conf import settings
-from django.test.client import RequestFactory
 from django.template import Template, Context
 import django_tables2 as tables
 from django_attest import TransactionTestContext
@@ -100,6 +99,8 @@ def verbose_name():
         r1 = tables.Column(accessor='occupation.region.name')
         r2 = tables.Column(accessor='occupation.region.name.upper')
         r3 = tables.Column(accessor='occupation.region.name', verbose_name='OVERRIDE')
+        trans_test = tables.Column()
+        trans_test_lazy = tables.Column()
 
     # The Person model has a ``first_name`` and ``last_name`` field, but only
     # the ``last_name`` field has an explicit ``verbose_name`` set. This means
@@ -122,6 +123,20 @@ def verbose_name():
     Assert('Name') == table.columns['r1'].verbose_name
     Assert('Name') == table.columns['r2'].verbose_name
     Assert('OVERRIDE') == table.columns['r3'].verbose_name
+    Assert("Translation Test") == table.columns["trans_test"].verbose_name
+    Assert("Translation Test Lazy") == table.columns["trans_test_lazy"].verbose_name
+
+    # -------------------------------------------------------------------------
+
+    # Now we'll try using a table with Meta.model
+    class PersonTable(tables.Table):
+        class Meta:
+            model = Person
+    # Issue #16
+    table = PersonTable([])
+    Assert("Translation Test") == table.columns["trans_test"].verbose_name
+    Assert("Translation Test Lazy") == table.columns["trans_test_lazy"].verbose_name
+
 
 @models.test
 def column_mapped_to_nonexistant_field():