Cleanup column tests a bit more

jieter · jieter · commit 3ef8e34fc219 · 2016-11-14T10:30:49.000+01:00
diff --git a/tests/columns/test_booleancolumn.py b/tests/columns/test_booleancolumn.py
@@ -132,9 +132,7 @@ class Meta:
     Occupation.objects.create(name='Onwaar', boolean=False),
     Occupation.objects.create(name='Onduidelijk')
 
-    table = Table(Occupation.objects.all())
-
-    html = table.as_html(build_request())
+    html = Table(Occupation.objects.all()).as_html(build_request())
 
     assert 'Waar' in html
     assert 'Onwaar' in html
diff --git a/tests/columns/test_general.py b/tests/columns/test_general.py
@@ -1,12 +1,12 @@
 # coding: utf-8
 from __future__ import unicode_literals
 
+import pytest
 from django.db import models
 from django.utils.safestring import SafeData, mark_safe
 from django.utils.translation import ugettext_lazy
 
 import django_tables2 as tables
-import pytest
 
 from ..app.models import Person
 from ..utils import build_request, parse
@@ -158,10 +158,10 @@ class SimpleTable(tables.Table):
 
 
 def test_translation():
-    """
+    '''
     Tests different types of values for the ``verbose_name`` property of a
     column.
-    """
+    '''
     class TranslationTable(tables.Table):
         text = tables.Column(verbose_name=ugettext_lazy('Text'))
 
@@ -170,9 +170,9 @@ class TranslationTable(tables.Table):
 
 
 def test_sequence():
-    """
+    '''
     Ensures that the sequence of columns is configurable.
-    """
+    '''
     class TestTable(tables.Table):
         a = tables.Column()
         b = tables.Column()
@@ -235,11 +235,11 @@ class TestTable9(TestTable):
 
 
 def test_should_support_both_meta_sequence_and_constructor_exclude():
-    """
+    '''
     Issue #32 describes a problem when both ``Meta.sequence`` and
     ``Table(..., exclude=...)`` are used on a single table. The bug caused an
     exception to be raised when the table was iterated.
-    """
+    '''
     class SequencedTable(tables.Table):
         a = tables.Column()
         b = tables.Column()
@@ -420,7 +420,6 @@ def get_column_class_names(self, classes_set, bound_column):
         {'name': 'France', 'population': 66000000},
     ]
 
-    table = MyTable(TEST_DATA)
-    html = table.as_html(build_request())
+    html = MyTable(TEST_DATA).as_html(build_request())
 
     assert '<td class="prefix-population">11200000</td>' in html
diff --git a/tests/columns/test_linkcolumn.py b/tests/columns/test_linkcolumn.py
@@ -30,10 +30,11 @@ class UnicodeTable(tables.Table):
         {'pk': 2, 'first_name': 'Chr…s', 'last_name': 'DÒble'},
     ]
 
-    table = UnicodeTable(dataset)
-    request = build_request('/some-url/')
     template = Template('{% load django_tables2 %}{% render_table table %}')
-    html = template.render(Context({'request': request, 'table': table}))
+    html = template.render(Context({
+        'request': build_request(),
+        'table': UnicodeTable(dataset)
+    }))
 
     assert 'Brädley' in html
     assert '∆yers' in html
@@ -54,8 +55,7 @@ class CustomLinkTable(tables.Table):
         {'pk': 1, 'first_name': 'John', 'last_name': 'Doe'}
     ]
 
-    table = CustomLinkTable(dataset)
-    html = table.as_html(build_request('/some-url/'))
+    html = CustomLinkTable(dataset).as_html(build_request())
 
     assert 'foo::bar' in html
     assert 'Doe John' in html
@@ -73,8 +73,7 @@ class CustomLinkTable(tables.Table):
         {'pk': 1, 'first_name': 'John', 'last_name': 'Doe'}
     ]
 
-    table = CustomLinkTable(dataset)
-    html = table.as_html(build_request('/some-url/'))
+    html = CustomLinkTable(dataset).as_html(build_request())
 
     expected = '<td class="editlink"><a href="{}">edit</a></td>'.format(
         reverse('person', args=(1, ))
@@ -118,10 +117,10 @@ def test_kwargs():
     class PersonTable(tables.Table):
         a = tables.LinkColumn('occupation', kwargs={'pk': A('a')})
 
-    request = build_request('/')
-    html = PersonTable([{'a': 0}, {'a': 1}]).as_html(request)
-    assert reverse('occupation', kwargs={'pk': 0}) in html
-    assert reverse('occupation', kwargs={'pk': 1}) in html
+    table = PersonTable([{'a': 0}, {'a': 1}])
+
+    assert reverse('occupation', kwargs={'pk': 0}) in table.rows[0].get_cell('a')
+    assert reverse('occupation', kwargs={'pk': 1}) in table.rows[1].get_cell('a')
 
 
 def test_html_escape_value():
@@ -201,6 +200,10 @@ class PersonTable(tables.Table):
 
 
 def test_get_absolute_url_not_defined():
+    '''
+    The dict doesn't have a get_absolute_url(), so creating the table should
+    raise a TypeError
+    '''
     class Table(tables.Table):
         first_name = tables.Column()
         last_name = tables.LinkColumn()
@@ -210,7 +213,7 @@ class Table(tables.Table):
     ])
 
     with pytest.raises(TypeError):
-        table.as_html(build_request('/'))
+        table.as_html(build_request())
 
 
 @pytest.mark.django_db
