feat: add basic Edit support for CRUD master view

tests/views/test_master.py

@@ -18,11 +18,11 @@ from tests.views.utils import WebTestCase
 class TestMasterView(WebTestCase):
 
     def test_defaults(self):
-        master.MasterView.model_name = 'Widget'
-        with patch.object(master.MasterView, 'viewable', new=False):
-            # TODO: should inspect pyramid routes after this, to be certain
+        with patch.multiple(master.MasterView, create=True,
+                            model_name='Widget',
+                            viewable=False,
+                            editable=False):
             master.MasterView.defaults(self.pyramid_config)
-        del master.MasterView.model_name
 
     ##############################
     # class methods
@@ -374,17 +374,75 @@ class TestMasterView(WebTestCase):
     def test_view(self):
 
         # sanity/coverage check using /settings/XXX
-        master.MasterView.model_name = 'Setting'
-        master.MasterView.grid_columns = ['name', 'value']
-        master.MasterView.form_fields = ['name', 'value']
-        view = master.MasterView(self.request)
         setting = {'name': 'foo.bar', 'value': 'baz'}
         self.request.matchdict = {'name': 'foo.bar'}
-        with patch.object(view, 'get_instance', return_value=setting):
-            response = view.view()
-        del master.MasterView.model_name
-        del master.MasterView.grid_columns
-        del master.MasterView.form_fields
+        with patch.multiple(master.MasterView, create=True,
+                            model_name='Setting',
+                            model_key='name',
+                            grid_columns=['name', 'value'],
+                            form_fields=['name', 'value']):
+            view = master.MasterView(self.request)
+            with patch.object(view, 'get_instance', return_value=setting):
+                response = view.view()
+
+    def test_edit(self):
+        model = self.app.model
+        self.app.save_setting(self.session, 'foo.bar', 'frazzle')
+        self.session.commit()
+
+        def get_instance():
+            setting = self.session.query(model.Setting).get('foo.bar')
+            return {
+                'name': setting.name,
+                'value': setting.value,
+            }
+
+        # sanity/coverage check using /settings/XXX/edit
+        self.request.matchdict = {'name': 'foo.bar'}
+        with patch.multiple(master.MasterView, create=True,
+                            model_name='Setting',
+                            model_key='name',
+                            form_fields=['name', 'value']):
+            view = master.MasterView(self.request)
+            with patch.object(view, 'get_instance', new=get_instance):
+
+                # get the form page
+                response = view.edit()
+                self.assertIsInstance(response, Response)
+                self.assertEqual(response.status_code, 200)
+                self.assertIn('frazzle', response.text)
+                # nb. no error
+                self.assertNotIn('Required', response.text)
+
+                def persist(setting):
+                    self.app.save_setting(self.session, setting['name'], setting['value'])
+                    self.session.commit()
+
+                # post request to save settings
+                self.request.method = 'POST'
+                self.request.POST = {
+                    'name': 'foo.bar',
+                    'value': 'froogle',
+                }
+                with patch.object(view, 'persist', new=persist):
+                    response = view.edit()
+                # nb. should get redirect back to view page
+                self.assertIsInstance(response, HTTPFound)
+                # setting should be updated in DB
+                self.assertEqual(self.app.get_setting(self.session, 'foo.bar'), 'froogle')
+
+                # try another post with invalid data (name is required)
+                self.request.method = 'POST'
+                self.request.POST = {
+                    'value': 'gargoyle',
+                }
+                with patch.object(view, 'persist', new=persist):
+                    response = view.edit()
+                # nb. should get a form with errors
+                self.assertEqual(response.status_code, 200)
+                self.assertIn('Required', response.text)
+                # setting did not change in DB
+                self.assertEqual(self.app.get_setting(self.session, 'foo.bar'), 'froogle')
 
     def test_configure(self):
         model = self.app.model

tests/views/test_settings.py

@@ -65,3 +65,30 @@ class TestSettingView(WebTestCase):
         view = self.make_view()
         title = view.get_instance_title(setting)
         self.assertEqual(title, 'foo')
+
+    def test_make_model_form(self):
+        view = self.make_view()
+        view.editing = True
+        form = view.make_model_form()
+        self.assertEqual(form.fields, ['name', 'value'])
+        self.assertIn('name', form)
+        self.assertIn('value', form)
+        dform = form.get_deform()
+        self.assertNotIn('name', dform)
+        self.assertIn('value', dform)
+
+    def test_persist(self):
+        model = self.app.model
+        view = self.make_view()
+
+        # setup
+        self.app.save_setting(self.session, 'foo', 'bar')
+        self.session.commit()
+        self.assertEqual(self.session.query(model.Setting).count(), 1)
+
+        # setting is updated
+        self.request.matchdict = {'name': 'foo'}
+        view.persist({'name': 'foo', 'value': 'frazzle'}, session=self.session)
+        self.session.commit()
+        self.assertEqual(self.session.query(model.Setting).count(), 1)
+        self.assertEqual(self.app.get_setting(self.session, 'foo'), 'frazzle')