feat: add Users view; improve CRUD master for SQLAlchemy models

tests/test_util.py

@@ -1,8 +1,10 @@
 # -*- coding: utf-8; -*-
 
+import json
 from unittest import TestCase
 from unittest.mock import patch, MagicMock
 
+import colander
 from fanstatic import Library, Resource
 from pyramid import testing
 
@@ -10,6 +12,37 @@ from wuttjamaican.conf import WuttaConfig
 from wuttaweb import util
 
 
+class TestFieldList(TestCase):
+
+    def test_insert_before(self):
+        fields = util.FieldList(['f1', 'f2'])
+        self.assertEqual(fields, ['f1', 'f2'])
+
+        # typical
+        fields.insert_before('f1', 'XXX')
+        self.assertEqual(fields, ['XXX', 'f1', 'f2'])
+        fields.insert_before('f2', 'YYY')
+        self.assertEqual(fields, ['XXX', 'f1', 'YYY', 'f2'])
+
+        # appends new field if reference field is invalid
+        fields.insert_before('f3', 'ZZZ')
+        self.assertEqual(fields, ['XXX', 'f1', 'YYY', 'f2', 'ZZZ'])
+
+    def test_insert_after(self):
+        fields = util.FieldList(['f1', 'f2'])
+        self.assertEqual(fields, ['f1', 'f2'])
+
+        # typical
+        fields.insert_after('f1', 'XXX')
+        self.assertEqual(fields, ['f1', 'XXX', 'f2'])
+        fields.insert_after('XXX', 'YYY')
+        self.assertEqual(fields, ['f1', 'XXX', 'YYY', 'f2'])
+
+        # appends new field if reference field is invalid
+        fields.insert_after('f3', 'ZZZ')
+        self.assertEqual(fields, ['f1', 'XXX', 'YYY', 'f2', 'ZZZ'])
+
+
 class TestGetLibVer(TestCase):
 
     def setUp(self):
@@ -455,3 +488,40 @@ class TestRenderCsrfToken(TestCase):
         self.assertIn('name="_csrf"', html)
         token = util.get_csrf_token(self.request)
         self.assertIn(f'value="{token}"', html)
+
+
+class TestMakeJsonSafe(TestCase):
+
+    def setUp(self):
+        self.config = WuttaConfig()
+        self.app = self.config.get_app()
+
+    def test_null(self):
+        value = util.make_json_safe(colander.null)
+        self.assertIsNone(value)
+
+        value = util.make_json_safe(None)
+        self.assertIsNone(value)
+
+    def test_invalid(self):
+        model = self.app.model
+        person = model.Person(full_name="Betty Boop")
+        self.assertRaises(TypeError, json.dumps, person)
+        value = util.make_json_safe(person, key='person')
+        self.assertEqual(value, "Betty Boop")
+
+    def test_dict(self):
+        model = self.app.model
+        person = model.Person(full_name="Betty Boop")
+
+        data = {
+            'foo': 'bar',
+            'person': person,
+        }
+
+        self.assertRaises(TypeError, json.dumps, data)
+        value = util.make_json_safe(data)
+        self.assertEqual(value, {
+            'foo': 'bar',
+            'person': "Betty Boop",
+        })