diff -r 6cbc7bc8ea6d -r 5fe84a5f7035 goa/test/unittest_editcontroller.py --- a/goa/test/unittest_editcontroller.py Fri Apr 17 13:21:05 2009 +0200 +++ b/goa/test/unittest_editcontroller.py Fri Apr 17 16:55:37 2009 +0200 @@ -8,7 +8,7 @@ from cubicweb.web import INTERNAL_FIELD_VALUE, Redirect from cubicweb.goa.goaconfig import GAEConfiguration -from cubicweb.entities.authobjs import EUser +from cubicweb.entities.authobjs import CWUser class EditControllerTC(GAEBasedTC): @@ -73,7 +73,7 @@ def test_validation_unique(self): """test creation of two linked entities""" user = self.user - self.req.form = {'eid': 'X', '__type:X': 'EUser', + self.req.form = {'eid': 'X', '__type:X': 'CWUser', 'login:X': self.user.login, 'edits-login:X': u'', 'upassword:X': u'toto', 'upassword-confirm:X': u'toto', 'edits-upassword:X': u'', } @@ -84,13 +84,13 @@ """checking that a manager user can edit itself""" self.skip('missing actual gae support, retry latter') user = self.user - basegroups = [str(eid) for eid, in self.req.execute('EGroup G WHERE X in_group G, X eid %(x)s', {'x': user.eid})] - groupeids = [eid for eid, in self.req.execute('EGroup G WHERE G name in ("managers", "users")')] + basegroups = [str(eid) for eid, in self.req.execute('CWGroup G WHERE X in_group G, X eid %(x)s', {'x': user.eid})] + groupeids = [eid for eid, in self.req.execute('CWGroup G WHERE G name in ("managers", "users")')] groups = [str(eid) for eid in groupeids] stateeid = [eid for eid, in self.req.execute('State S WHERE S name "activated"')][0] self.req.form = { 'eid': user.eid, - '__type:'+user.eid: 'EUser', + '__type:'+user.eid: 'CWUser', 'login:'+user.eid: unicode(user.login), 'firstname:'+user.eid: u'Th\xe9nault', 'surname:'+user.eid: u'Sylvain', @@ -115,10 +115,10 @@ user = self.create_user('user') cnx = self.login('user') req = self.request() - #self.assertEquals(self.ctrl.schema['EUser']._groups['read'], + #self.assertEquals(self.ctrl.schema['CWUser']._groups['read'], # ('managers', 'users')) req.form = { - 'eid': user.eid, '__type:'+user.eid: 'EUser', + 'eid': user.eid, '__type:'+user.eid: 'CWUser', '__maineid' : str(user.eid), 'upassword:'+user.eid: 'tournicoton', 'upassword-confirm:'+user.eid: 'tournicoton', @@ -134,10 +134,10 @@ relations (meaning no changes) """ user = self.user - groupeids = [eid for eid, in self.req.execute('EGroup G WHERE X in_group G, X eid %(x)s', {'x': user.eid})] + groupeids = [eid for eid, in self.req.execute('CWGroup G WHERE X in_group G, X eid %(x)s', {'x': user.eid})] self.req.form = { 'eid': user.eid, - '__type:'+user.eid: 'EUser', + '__type:'+user.eid: 'CWUser', 'login:'+user.eid: unicode(user.login), 'firstname:'+user.eid: u'Th\xe9nault', 'surname:'+user.eid: u'Sylvain', @@ -158,10 +158,10 @@ def test_create_multiple_linked(self): - gueid = self.req.execute('EGroup G WHERE G name "users"')[0][0] + gueid = self.req.execute('CWGroup G WHERE G name "users"')[0][0] self.req.form = {'eid': ['X', 'Y'], - '__type:X': 'EUser', + '__type:X': 'CWUser', '__maineid' : 'X', 'login:X': u'adim', 'edits-login:X': u'', 'upassword:X': u'toto', 'upassword-confirm:X': u'toto', 'edits-upassword:X': u'', @@ -184,7 +184,7 @@ def test_edit_multiple_linked(self): peid = self.create_user('adim').eid self.req.form = {'eid': [peid, 'Y'], - '__type:%s'%peid: 'EUser', + '__type:%s'%peid: 'CWUser', 'surname:%s'%peid: u'Di Masci', 'edits-surname:%s'%peid: '', '__type:Y': 'EmailAddress', @@ -203,7 +203,7 @@ emaileid = email.eid self.req.form = {'eid': [peid, emaileid], - '__type:%s'%peid: 'EUser', + '__type:%s'%peid: 'CWUser', 'surname:%s'%peid: u'Di Masci', 'edits-surname:%s'%peid: 'Di Masci', '__type:%s'%emaileid: 'EmailAddress', 'address:%s'%emaileid: u'adim@logilab.fr', 'edits-address:%s'%emaileid: 'dima@logilab.fr', @@ -226,13 +226,13 @@ """ user = self.user self.req.form = {'__cloned_eid:X': user.eid, - 'eid': 'X', '__type:X': 'EUser', + 'eid': 'X', '__type:X': 'CWUser', 'login:X': u'toto', 'edits-login:X': u'', 'upassword:X': u'toto', 'edits-upassword:X': u'', } self.assertRaises(ValidationError, self.publish, self.req) self.req.form = {'__cloned_eid:X': user.eid, - 'eid': 'X', '__type:X': 'EUser', + 'eid': 'X', '__type:X': 'CWUser', 'login:X': u'toto', 'edits-login:X': u'', 'upassword:X': u'toto', 'upassword-confirm:X': u'tutu', 'edits-upassword:X': u'', } @@ -241,7 +241,7 @@ def test_req_pending_insert(self): """make sure req's pending insertions are taken into account""" - tmpgroup = self.add_entity('EGroup', name=u"test") + tmpgroup = self.add_entity('CWGroup', name=u"test") user = self.user self.req.set_session_data('pending_insert', set([(user.eid, 'in_group', tmpgroup.eid)])) path, params = self.expect_redirect_publish() @@ -254,7 +254,7 @@ def test_req_pending_delete(self): """make sure req's pending deletions are taken into account""" user = self.user - groupeid = self.req.execute('INSERT EGroup G: G name "test", U in_group G WHERE U eid %(x)s', + groupeid = self.req.execute('INSERT CWGroup G: G name "test", U in_group G WHERE U eid %(x)s', {'x': user.eid})[0][0] usergroups = [gname for gname, in self.req.execute('Any N WHERE G name N, U in_group G, U eid %(u)s', {'u': user.eid})] @@ -273,13 +273,13 @@ def custom_login_edit(self, formparams, value, relations): formparams['login'] = value.upper() relations.append('X login %(login)s') - EUser.custom_login_edit = custom_login_edit + CWUser.custom_login_edit = custom_login_edit try: user = self.user eid = repr(user.eid) self.req.form = { 'eid': eid, - '__type:'+eid: 'EUser', + '__type:'+eid: 'CWUser', 'login:'+eid: u'foo', 'edits-login:'+eid: unicode(user.login), } @@ -287,7 +287,7 @@ rset = self.req.execute('Any L WHERE X eid %(x)s, X login L', {'x': user.eid}, 'x') self.assertEquals(rset[0][0], 'FOO') finally: - del EUser.custom_login_edit + del CWUser.custom_login_edit def test_redirect_apply_button(self): redirectrql = rql_for_eid(4012) # whatever @@ -358,10 +358,10 @@ def test_nonregr_multiple_empty_email_addr(self): - gueid = self.req.execute('EGroup G WHERE G name "users"')[0][0] + gueid = self.req.execute('CWGroup G WHERE G name "users"')[0][0] self.req.form = {'eid': ['X', 'Y'], - '__type:X': 'EUser', + '__type:X': 'CWUser', 'login:X': u'adim', 'edits-login:X': u'', 'upassword:X': u'toto', 'upassword-confirm:X': u'toto', 'edits-upassword:X': u'', 'in_group:X': gueid, 'edits-in_group:X': INTERNAL_FIELD_VALUE, @@ -385,7 +385,7 @@ self.req.execute('SET P use_email E, P primary_email E WHERE P eid %(p)s, E eid %(e)s', {'p' : p.eid, 'e' : e.eid}) self.req.form = {'__cloned_eid:X': p.eid, - 'eid': 'X', '__type:X': 'EUser', + 'eid': 'X', '__type:X': 'CWUser', 'login': u'dodo', 'edits-login': u'dodo', 'surname:X': u'Boom', 'edits-surname:X': u'', '__errorurl' : "whatever but required", @@ -400,7 +400,7 @@ self.req.form['rql'] = 'Any X WHERE X eid %s' % p.eid self.req.form['vid'] = 'copy' self.env.app.publish('view', self.req) - rset = self.req.execute('EUser P WHERE P surname "Boom"') + rset = self.req.execute('CWUser P WHERE P surname "Boom"') self.assertEquals(len(rset), 0) finally: p.__class__.skip_copy_for = old_skips