tests: add testing of users edit page after custom fields are set

tests/test_admin_pages.py

@@ -1371,6 +1371,33 @@ def test_settings_user():
     resp = resp.follow()
     assert pub.cfg['users']['field_email'] == None
 
+    # add a comment field
+    resp.forms[1]['label'] = 'barfoo'
+    resp.forms[1]['type'] = 'Comment'
+    resp = resp.forms[1].submit()
+    assert resp.location == 'http://example.net/admin/settings/users/fields/'
+    resp = resp.follow()
+    assert 'barfoo' in pub.cfg['users']['formdef']
+    assert 'barfoo' in resp.body
+
+    # check fields are present in edit form
+    resp = app.get('/admin/users/admin/edit')
+    assert 'barfoo' in resp.body
+    assert 'f1' in resp.forms[0].fields
+    assert 'email' in resp.forms[0].fields
+
+    # check the email field is not displayed if it's overridden by a custom
+    # field.
+    pub.cfg['users']['field_email'] = '1'
+    pub.write_cfg()
+    resp = app.get('/admin/users/admin/edit')
+    assert 'f1' in resp.forms[0].fields
+    assert 'email' not in resp.forms[0].fields
+
+    # restore config
+    pub.cfg['users']['field_email'] = None
+    pub.write_cfg()
+
 def test_settings_emails():
     create_superuser()
     app = login(get_app(pub))