Merge pull request iommirocks#63 in COMMON/tri.table from feature/mutmut-round to master

* commit '95678ff90015c7dedef8116d9a91cae89a52c5b6':
  A round of mutmut

Author: boxed

lib/tri/table/__init__.py

@@ -81,12 +81,12 @@ def order_by_on_list(objects, order_field, is_desc=False):
 
 def yes_no_formatter(value, **_):
     """ Handle True/False from Django model and 1/0 from raw sql """
-    if value is True or value == 1:
+    if value is None:
+        return ''
+    if value == 1:  # boolean True is equal to 1
         return 'Yes'
-    if value is False or value == 0:
+    if value == 0:  # boolean False is equal to 0
         return 'No'
-    if value is None:  # pragma: no cover
-        return ''
     assert False, "Unable to convert {} to Yes/No".format(value)   # pragma: no cover  # pragma: no mutate
 
 
@@ -874,7 +874,6 @@ def render_css_class(self):
 
             group_columns.append(GroupColumn(
                 display_name=group_name,
-                sortable=False,
                 colspan=len(columns_in_group),
                 attrs__class__superheader=True,
             ))
@@ -1163,7 +1162,7 @@ def render_table(request,
                  template_name='tri_table/list.html',  # deprecated
                  template=None,
                  blank_on_empty=False,
-                 paginate_by=40,
+                 paginate_by=40,  # pragma: no mutate
                  page=None,
                  context_processors=None,
                  paginator=None,
@@ -1242,7 +1241,7 @@ def render_table(request,
         hit_label=hit_label,
     )
 
-    if not table.data and blank_on_empty:  # pragma: no cover
+    if not table.data and blank_on_empty:
         return ''
 
     if table.query_form and not table.query_form.is_valid():

tests/test_paginator.py

@@ -0,0 +1,16 @@
+import pytest
+from tri.table.templatetags.tri_table import paginator
+from tri.struct import merged
+
+expected_base = dict(extra='', page_numbers=[1, 2, 3], show_first=False, show_last=True)
+
+
+@pytest.fixture
+def context():
+    return dict(page=0, pages=[1, 2, 3], results_per_page=3, hits=11, next=1, previous=None, has_next=True, has_previous=False, show_hits=True, hit_label='hits')
+
+
+def test_paginator_basic(context):
+    actual = paginator(context=context, adjacent_pages=1)
+    expected = merged(context, **expected_base)
+    assert actual == expected

tests/test_sort.py

@@ -173,6 +173,38 @@ class TestTable(Table):
     </table>
     """)
 
+    # now reversed
+    verify_table_html(table=TestTable(data=Foo.objects.all()),
+                      query=dict(order='-a'),
+                      expected_html="""\
+    <table class="listview">
+      <thead>
+        <tr>
+          <th class="first_column sorted_column subheader">
+            <a href="?order=a"> A </a>
+          </th>
+          <th class="first_column subheader">
+            <a href="?order=b"> B </a>
+          </th>
+        </tr>
+      </thead>
+      <tbody>
+        <tr class="row1" data-pk="1">
+          <td class="rj"> 4711 </td>
+          <td> c </td>
+        </tr>
+        <tr class="row2" data-pk="3">
+          <td class="rj"> 42 </td>
+          <td> b </td>
+        </tr>
+        <tr class="row1" data-pk="2">
+          <td class="rj"> 17 </td>
+          <td> a </td>
+        </tr>
+      </tbody>
+    </table>
+    """)
+
 
 def test_order_by_on_list_nested():
     data = [Struct(foo=Struct(bar='c')),

tests/test_tri_table.py

@@ -724,6 +724,15 @@ def post_bulk_edit(table, pks, queryset, updates):
         (4, 4, u''),
     ]
 
+    # Test that empty field means "no change"
+    render_table(request=RequestFactory(HTTP_REFERER='/').post("/", dict(pk_1='', pk_2='', a='', b='')), table=TestTable(data=Foo.objects.all()))
+    assert [(x.pk, x.a, x.b) for x in Foo.objects.all()] == [
+        (1, 0, u'changed'),
+        (2, 0, u'changed'),
+        (3, 3, u''),
+        (4, 4, u''),
+    ]
+
 
 @pytest.mark.django_db
 def test_query():
@@ -1368,3 +1377,7 @@ def test_yes_no_formatter():
     assert yes_no_formatter(1) == 'Yes'
     assert yes_no_formatter(False) == 'No'
     assert yes_no_formatter(0) == 'No'
+
+
+def test_blank_on_empty():
+    assert render_table(RequestFactory().get('/'), table=Table(data=[], columns=[Column(name='foo')]), blank_on_empty=True) == ''