fix: add WebDiff class now that Diff lives in wuttjamaican

tests/test_diffs.py

@@ -4,114 +4,10 @@ from wuttaweb import diffs as mod
 from wuttaweb.testing import WebTestCase, VersionWebTestCase
 
 
-# nb. using WebTestCase here only for mako support in render_html()
-class TestDiff(WebTestCase):
+class TestWebDiff(WebTestCase):
 
     def make_diff(self, *args, **kwargs):
-        return mod.Diff(*args, **kwargs)
-
-    def test_constructor(self):
-        old_data = {"foo": "bar"}
-        new_data = {"foo": "baz"}
-        diff = self.make_diff(old_data, new_data, fields=["foo"])
-        self.assertEqual(diff.fields, ["foo"])
-
-    def test_make_fields(self):
-        old_data = {"foo": "bar"}
-        new_data = {"foo": "bar", "baz": "zer"}
-        # nb. this calls make_fields()
-        diff = self.make_diff(old_data, new_data)
-        # TODO: should the fields be cumulative? or just use new_data?
-        self.assertEqual(diff.fields, ["baz", "foo"])
-
-    def test_values(self):
-        old_data = {"foo": "bar"}
-        new_data = {"foo": "baz"}
-        diff = self.make_diff(old_data, new_data)
-        self.assertEqual(diff.old_value("foo"), "bar")
-        self.assertEqual(diff.new_value("foo"), "baz")
-
-    def test_values_differ(self):
-        old_data = {"foo": "bar"}
-        new_data = {"foo": "baz"}
-        diff = self.make_diff(old_data, new_data)
-        self.assertTrue(diff.values_differ("foo"))
-
-        old_data = {"foo": "bar"}
-        new_data = {"foo": "bar"}
-        diff = self.make_diff(old_data, new_data)
-        self.assertFalse(diff.values_differ("foo"))
-
-    def test_render_values(self):
-        old_data = {"foo": "bar"}
-        new_data = {"foo": "baz"}
-        diff = self.make_diff(old_data, new_data)
-        self.assertEqual(diff.render_old_value("foo"), "'bar'")
-        self.assertEqual(diff.render_new_value("foo"), "'baz'")
-
-    def test_get_old_value_attrs(self):
-
-        # no change
-        old_data = {"foo": "bar"}
-        new_data = {"foo": "bar"}
-        diff = self.make_diff(old_data, new_data, nature="update")
-        self.assertEqual(diff.get_old_value_attrs(False), {})
-
-        # update
-        old_data = {"foo": "bar"}
-        new_data = {"foo": "baz"}
-        diff = self.make_diff(old_data, new_data, nature="update")
-        self.assertEqual(
-            diff.get_old_value_attrs(True),
-            {"style": f"background-color: {diff.old_color};"},
-        )
-
-        # delete
-        old_data = {"foo": "bar"}
-        new_data = {}
-        diff = self.make_diff(old_data, new_data, nature="delete")
-        self.assertEqual(
-            diff.get_old_value_attrs(True),
-            {"style": f"background-color: {diff.old_color};"},
-        )
-
-    def test_get_new_value_attrs(self):
-
-        # no change
-        old_data = {"foo": "bar"}
-        new_data = {"foo": "bar"}
-        diff = self.make_diff(old_data, new_data, nature="update")
-        self.assertEqual(diff.get_new_value_attrs(False), {})
-
-        # update
-        old_data = {"foo": "bar"}
-        new_data = {"foo": "baz"}
-        diff = self.make_diff(old_data, new_data, nature="update")
-        self.assertEqual(
-            diff.get_new_value_attrs(True),
-            {"style": f"background-color: {diff.new_color};"},
-        )
-
-        # create
-        old_data = {}
-        new_data = {"foo": "bar"}
-        diff = self.make_diff(old_data, new_data, nature="create")
-        self.assertEqual(
-            diff.get_new_value_attrs(True),
-            {"style": f"background-color: {diff.new_color};"},
-        )
-
-    def test_render_field_row(self):
-        old_data = {"foo": "bar"}
-        new_data = {"foo": "baz"}
-        diff = self.make_diff(old_data, new_data)
-        row = diff.render_field_row("foo")
-        self.assertIn("<tr>", row)
-        self.assertIn("&#39;bar&#39;", row)
-        self.assertIn(f'style="background-color: {diff.old_color};"', row)
-        self.assertIn("&#39;baz&#39;", row)
-        self.assertIn(f'style="background-color: {diff.new_color};"', row)
-        self.assertIn("</tr>", row)
+        return mod.WebDiff(self.config, *args, **kwargs)
 
     def test_render_html(self):
         old_data = {"foo": "bar"}
@@ -121,9 +17,9 @@ class TestDiff(WebTestCase):
         self.assertIn("<table", html)
         self.assertIn("<tr>", html)
         self.assertIn("&#39;bar&#39;", html)
-        self.assertIn(f'style="background-color: {diff.old_color};"', html)
+        self.assertIn(f'style="background-color: {diff.old_color}"', html)
         self.assertIn("&#39;baz&#39;", html)
-        self.assertIn(f'style="background-color: {diff.new_color};"', html)
+        self.assertIn(f'style="background-color: {diff.new_color}"', html)
         self.assertIn("</tr>", html)
         self.assertIn("</table>", html)
 
@@ -131,7 +27,7 @@ class TestDiff(WebTestCase):
 class TestVersionDiff(VersionWebTestCase):
 
     def make_diff(self, *args, **kwargs):
-        return mod.VersionDiff(*args, **kwargs)
+        return mod.VersionDiff(self.config, *args, **kwargs)
 
     def test_constructor(self):
         import sqlalchemy_continuum as continuum