cubicweb: comparison web/test/unittest

equal deleted inserted replaced

-:8b82227719f0
+:57b9fd2462b8
 from cubicweb.selectors import (match_user_groups, implements,
 specified_etype_implements, rql_condition,
 traced_selection)
 from cubicweb.web import NoSelectableObject
 from cubicweb.web.action import Action
-from cubicweb.web.views import (baseviews, tableview, baseforms, calendar,
+from cubicweb.web.views import (primary, baseviews, tableview, editforms,
-management, embedding, actions, startup,
+calendar, management, embedding, actions,
-euser, schemaentities, xbel, vcard, owl,
+startup, cwuser, schema, xbel, vcard, owl,
-treeview, idownloadable, wdoc, debug, eproperties)
+treeview, idownloadable, wdoc, debug,
+cwproperties, workflow, xmlrss, csvexport)
 USERACTIONS = [('myprefs', actions.UserPreferencesAction),
 ('myinfos', actions.UserInfoAction),
 ('logout', actions.LogoutAction)]
 SITEACTIONS = [('siteconfig', actions.SiteConfigurationAction),
 ('manage', actions.ManageAction),
-('schema', actions.ViewSchemaAction)]
+('schema', schema.ViewSchemaAction)]
 class ViewSelectorTC(EnvBasedTC):
 def setup_database(self):
 def test_possible_views_none_rset(self):
 req = self.request()
 self.assertListEqual(self.pviews(req, None),
 [('changelog', wdoc.ChangeLogView),
 ('debug', debug.DebugView),
-('epropertiesform', eproperties.EPropertiesForm),
+('epropertiesform', cwproperties.EPropertiesForm),
 ('index', startup.IndexView),
 ('info', management.ProcessInformationView),
 ('manage', startup.ManageView),
 ('owl', owl.OWLView),
 ('schema', startup.SchemaView),
-('systemepropertiesform', eproperties.SystemEPropertiesForm)])
+('systemepropertiesform', cwproperties.SystemEPropertiesForm)])
 def test_possible_views_noresult(self):
 rset, req = self.env.get_rset_and_req('Any X WHERE X eid 999999')
 self.assertListEqual(self.pviews(req, rset),
 [])
 def test_possible_views_one_egroup(self):
 rset, req = self.env.get_rset_and_req('CWGroup X WHERE X name "managers"')
 self.assertListEqual(self.pviews(req, rset),
-[('csvexport', baseviews.CSVRsetView),
+[('csvexport', csvexport.CSVRsetView),
-('ecsvexport', baseviews.CSVEntityView),
+('ecsvexport', csvexport.CSVEntityView),
 ('editable-table', tableview.EditableTableView),
 ('filetree', treeview.FileTreeView),
 ('list', baseviews.ListView),
 ('oneline', baseviews.OneLineView),
 ('owlabox', owl.OWLABOXView),
-('primary', baseviews.PrimaryView),
+('primary', primary.PrimaryView),
-('rsetxml', baseviews.XMLRsetView),
+('rsetxml', xmlrss.XMLRsetView),
-('rss', baseviews.RssView),
+('rss', xmlrss.RSSView),
 ('secondary', baseviews.SecondaryView),
 ('security', management.SecurityManagementView),
 ('table', tableview.TableView),
 ('text', baseviews.TextView),
 ('treeview', treeview.TreeView),
 ('xbel', xbel.XbelView),
-('xml', baseviews.XmlView),
+('xml', xmlrss.XMLView),
 ])
 def test_possible_views_multiple_egroups(self):
 rset, req = self.env.get_rset_and_req('CWGroup X')
 self.assertListEqual(self.pviews(req, rset),
-[('csvexport', baseviews.CSVRsetView),
+[('csvexport', csvexport.CSVRsetView),
-('ecsvexport', baseviews.CSVEntityView),
+('ecsvexport', csvexport.CSVEntityView),
 ('editable-table', tableview.EditableTableView),
 ('filetree', treeview.FileTreeView),
 ('list', baseviews.ListView),
 ('oneline', baseviews.OneLineView),
 ('owlabox', owl.OWLABOXView),
-('primary', baseviews.PrimaryView),
+('primary', primary.PrimaryView),
-('rsetxml', baseviews.XMLRsetView),
+('rsetxml', xmlrss.XMLRsetView),
-('rss', baseviews.RssView),
+('rss', xmlrss.RSSView),
 ('secondary', baseviews.SecondaryView),
 ('security', management.SecurityManagementView),
 ('table', tableview.TableView),
 ('text', baseviews.TextView),
 ('treeview', treeview.TreeView),
 ('xbel', xbel.XbelView),
-('xml', baseviews.XmlView),
+('xml', xmlrss.XMLView),
 ])
 def test_possible_views_multiple_different_types(self):
 rset, req = self.env.get_rset_and_req('Any X')
 self.assertListEqual(self.pviews(req, rset),
-[('csvexport', baseviews.CSVRsetView),
+[('csvexport', csvexport.CSVRsetView),
-('ecsvexport', baseviews.CSVEntityView),
+('ecsvexport', csvexport.CSVEntityView),
 ('editable-table', tableview.EditableTableView),
 ('filetree', treeview.FileTreeView),
 ('list', baseviews.ListView),
 ('oneline', baseviews.OneLineView),
 ('owlabox', owl.OWLABOXView),
-('primary', baseviews.PrimaryView),
+('primary', primary.PrimaryView),
-('rsetxml', baseviews.XMLRsetView),
+('rsetxml', xmlrss.XMLRsetView),
-('rss', baseviews.RssView),
+('rss', xmlrss.RSSView),
 ('secondary', baseviews.SecondaryView),
 ('security', management.SecurityManagementView),
 ('table', tableview.TableView),
 ('text', baseviews.TextView),
 ('treeview', treeview.TreeView),
 ('xbel', xbel.XbelView),
-('xml', baseviews.XmlView),
+('xml', xmlrss.XMLView),
 ])
 def test_possible_views_any_rset(self):
 rset, req = self.env.get_rset_and_req('Any N, X WHERE X in_group Y, Y name N')
 self.assertListEqual(self.pviews(req, rset),
-[('csvexport', baseviews.CSVRsetView),
+[('csvexport', csvexport.CSVRsetView),
 ('editable-table', tableview.EditableTableView),
-('rsetxml', baseviews.XMLRsetView),
+('rsetxml', xmlrss.XMLRsetView),
 ('table', tableview.TableView),
 ])
 def test_possible_views_multiple_eusers(self):
 rset, req = self.env.get_rset_and_req('CWUser X')
 self.assertListEqual(self.pviews(req, rset),
-[('csvexport', baseviews.CSVRsetView),
+[('csvexport', csvexport.CSVRsetView),
-('ecsvexport', baseviews.CSVEntityView),
+('ecsvexport', csvexport.CSVEntityView),
 ('editable-table', tableview.EditableTableView),
 ('filetree', treeview.FileTreeView),
-('foaf', euser.FoafView),
+('foaf', cwuser.FoafView),
 ('list', baseviews.ListView),
 ('oneline', baseviews.OneLineView),
 ('owlabox', owl.OWLABOXView),
-('primary', euser.CWUserPrimaryView),
+('primary', cwuser.CWUserPrimaryView),
-('rsetxml', baseviews.XMLRsetView),
+('rsetxml', xmlrss.XMLRsetView),
-('rss', baseviews.RssView),
+('rss', xmlrss.RSSView),
 ('secondary', baseviews.SecondaryView),
 ('security', management.SecurityManagementView),
 ('table', tableview.TableView),
 ('text', baseviews.TextView),
 ('treeview', treeview.TreeView),
 ('vcard', vcard.VCardCWUserView),
 ('xbel', xbel.XbelView),
-('xml', baseviews.XmlView),
+('xml', xmlrss.XMLView),
 ])
 def test_possible_actions_none_rset(self):
 req = self.request()
 self.assertDictEqual(self.pactions(req, None),
 rset, req = self.env.get_rset_and_req('Any N, X WHERE X in_group Y, Y name N')
 self.assertDictEqual(self.pactions(req, rset),
 {'useractions': USERACTIONS,
 'siteactions': SITEACTIONS})
-def test_possible_actions_eetype_euser_entity(self):
+def test_possible_actions_eetype_cwuser_entity(self):
 rset, req = self.env.get_rset_and_req('CWEType X WHERE X name "CWUser"')
 self.assertDictEqual(self.pactions(req, rset),
 {'useractions': USERACTIONS,
 'siteactions': SITEACTIONS,
 'mainactions': [('edit', actions.ModifyAction),
-('workflow', schemaentities.ViewWorkflowAction),],
+('workflow', workflow.ViewWorkflowAction),],
-'moreactions': [('delete', actions.DeleteAction),
+'moreactions': [('managepermission', actions.ManagePermissionsAction),
+('delete', actions.DeleteAction),
 ('copy', actions.CopyAction),
-('managepermission', actions.ManagePermissionsAction)],
+],
 })
 def test_select_creation_form(self):
 rset = None
 req = self.request()
 # creation form
 req.form['etype'] = 'CWGroup'
 self.assertIsInstance(self.vreg.select_view('creation', req, rset),
-baseforms.CreationForm)
+editforms.CreationFormView)
 del req.form['etype']
 # custom creation form
-class CWUserCreationForm(baseforms.CreationForm):
+class CWUserCreationForm(editforms.CreationFormView):
 __select__ = specified_etype_implements('CWUser')
+self.vreg._loadedmods[__name__] = {}
 self.vreg.register_vobject_class(CWUserCreationForm)
 req.form['etype'] = 'CWUser'
 self.assertIsInstance(self.vreg.select_view('creation', req, rset),
 CWUserCreationForm)
 self.failUnlessRaises(NoSelectableObject,
 self.vreg.select_view, 'table', req, rset)
 # one entity
 rset, req = self.env.get_rset_and_req('CWGroup X WHERE X name "managers"')
 self.assertIsInstance(self.vreg.select_view('primary', req, rset),
-baseviews.PrimaryView)
+primary.PrimaryView)
 self.assertIsInstance(self.vreg.select_view('list', req, rset),
 baseviews.ListView)
 self.assertIsInstance(self.vreg.select_view('edition', req, rset),
-baseforms.EditionForm)
+editforms.EditionFormView)
 self.assertIsInstance(self.vreg.select_view('table', req, rset),
 tableview.TableView)
 self.failUnlessRaises(NoSelectableObject,
 self.vreg.select_view, 'creation', req, rset)
 self.failUnlessRaises(NoSelectableObject,
 self.vreg.select_view, 'index', req, rset)
 # list of entities of the same type
 rset, req = self.env.get_rset_and_req('CWGroup X')
 self.assertIsInstance(self.vreg.select_view('primary', req, rset),
-baseviews.PrimaryView)
+primary.PrimaryView)
 self.assertIsInstance(self.vreg.select_view('list', req, rset),
 baseviews.ListView)
 self.assertIsInstance(self.vreg.select_view('table', req, rset),
 tableview.TableView)
 self.failUnlessRaises(NoSelectableObject,
 self.vreg.select_view, 'creation', req, rset)
 # list of entities of different types
 rset, req = self.env.get_rset_and_req('Any X')
 self.assertIsInstance(self.vreg.select_view('primary', req, rset),
-baseviews.PrimaryView)
+primary.PrimaryView)
 self.assertIsInstance(self.vreg.select_view('list', req, rset),
 baseviews.ListView)
 self.assertIsInstance(self.vreg.select_view('table', req, rset),
 tableview.TableView)
 self.failUnlessRaises(NoSelectableObject,
 self.vreg.select_view, 'edition', req, rset)
 self.failUnlessRaises(NoSelectableObject,
 self.vreg.select_view, 'creation', req, rset)
 self.assertIsInstance(self.vreg.select_view('table', req, rset),
 tableview.TableView)
-# euser primary view priority
+# cwuser primary view priority
 rset, req = self.env.get_rset_and_req('CWUser X WHERE X login "admin"')
 self.assertIsInstance(self.vreg.select_view('primary', req, rset),
-euser.CWUserPrimaryView)
+cwuser.CWUserPrimaryView)
 self.assertIsInstance(self.vreg.select_view('text', req, rset),
 baseviews.TextView)
 def test_interface_selector(self):
 image = self.add_entity('Image', name=u'bim.png', data=Binary('bim'))
 class RQLActionTC(ViewSelectorTC):
 def setUp(self):
 super(RQLActionTC, self).setUp()
+self.vreg._loadedmods[__name__] = {}
 self.vreg.register_vobject_class(CWETypeRQLAction)
 def tearDown(self):
 super(RQLActionTC, self).tearDown()
 del self.vreg._registries['actions']['testaction']
 rset, req = self.env.get_rset_and_req('CWEType X WHERE X name "CWEType"')
 self.assertDictEqual(self.pactions(req, rset),
 {'useractions': USERACTIONS,
 'siteactions': SITEACTIONS,
 'mainactions': [('edit', actions.ModifyAction)],
-'moreactions': [('delete', actions.DeleteAction),
+'moreactions': [('managepermission', actions.ManagePermissionsAction),
+('delete', actions.DeleteAction),
 ('copy', actions.CopyAction),
 ('testaction', CWETypeRQLAction),
-('managepermission', actions.ManagePermissionsAction)],
+],
 })
 rset, req = self.env.get_rset_and_req('CWEType X WHERE X name "CWRType"')
 self.assertDictEqual(self.pactions(req, rset),
 {'useractions': USERACTIONS,
 'siteactions': SITEACTIONS,
 'mainactions': [('edit', actions.ModifyAction)],
-'moreactions': [('delete', actions.DeleteAction),
+'moreactions': [('managepermission', actions.ManagePermissionsAction),
+('delete', actions.DeleteAction),
 ('copy', actions.CopyAction),
-('managepermission', actions.ManagePermissionsAction)],
+],
 })
 if __name__ == '__main__':

branch	tls-sprint
changeset 1654	57b9fd2462b8
parent 1570	5c40d9fb4e8d
child 1797	c2a80130b06d