# HG changeset patch # User Alexandre Fayolle # Date 1303466321 -7200 # Node ID a918f76441cec86757e43e1e29e357d726831a01 # Parent 9ab01bf84eac77335883e5540275d0d23dda3155 fix tests broken by fcb8932082a5 (continued) diff -r 9ab01bf84eac -r a918f76441ce entities/test/unittest_base.py --- a/entities/test/unittest_base.py Fri Apr 22 10:29:23 2011 +0200 +++ b/entities/test/unittest_base.py Fri Apr 22 11:58:41 2011 +0200 @@ -34,7 +34,8 @@ class BaseEntityTC(CubicWebTC): def setup_database(self): - self.member = self.create_user('member') + req = self.request() + self.member = self.create_user(req, 'member') diff -r 9ab01bf84eac -r a918f76441ce entities/test/unittest_wfobjs.py --- a/entities/test/unittest_wfobjs.py Fri Apr 22 10:29:23 2011 +0200 +++ b/entities/test/unittest_wfobjs.py Fri Apr 22 11:58:41 2011 +0200 @@ -95,13 +95,15 @@ class WorkflowTC(CubicWebTC): def setup_database(self): + req = self.request() rschema = self.schema['in_state'] for rdef in rschema.rdefs.values(): self.assertEqual(rdef.cardinality, '1*') - self.member = self.create_user('member') + self.member = self.create_user(req, 'member') def test_workflow_base(self): - e = self.create_user('toto') + req = self.request() + e = self.create_user(req, 'toto') iworkflowable = e.cw_adapt_to('IWorkflowable') self.assertEqual(iworkflowable.state, 'activated') iworkflowable.change_state('deactivated', u'deactivate 1') @@ -170,13 +172,14 @@ self.assertEqual(trinfo.transition.name, 'deactivate') def test_goback_transition(self): + req = self.request() wf = self.session.user.cw_adapt_to('IWorkflowable').current_workflow asleep = wf.add_state('asleep') wf.add_transition('rest', (wf.state_by_name('activated'), wf.state_by_name('deactivated')), asleep) wf.add_transition('wake up', asleep) - user = self.create_user('stduser') + user = self.create_user(req, 'stduser') iworkflowable = user.cw_adapt_to('IWorkflowable') iworkflowable.fire_transition('rest') self.commit() @@ -196,7 +199,8 @@ def _test_stduser_deactivate(self): ueid = self.member.eid - self.create_user('tutu') + req = self.request() + self.create_user(req, 'tutu') cnx = self.login('tutu') req = self.request() iworkflowable = req.entity_from_eid(self.member.eid).cw_adapt_to('IWorkflowable') @@ -393,7 +397,8 @@ class CustomWorkflowTC(CubicWebTC): def setup_database(self): - self.member = self.create_user('member') + req = self.request() + self.member = self.create_user(req, 'member') def test_custom_wf_replace_state_no_history(self): """member in inital state with no previous history, state is simply @@ -493,7 +498,8 @@ def test_auto_transition_fired(self): wf = self.setup_custom_wf() - user = self.create_user('member') + req = self.request() + user = self.create_user(req, 'member') iworkflowable = user.cw_adapt_to('IWorkflowable') self.execute('SET X custom_workflow WF WHERE X eid %(x)s, WF eid %(wf)s', {'wf': wf.eid, 'x': user.eid}) @@ -523,7 +529,8 @@ def test_auto_transition_custom_initial_state_fired(self): wf = self.setup_custom_wf() - user = self.create_user('member', surname=u'toto') + req = self.request() + user = self.create_user(req, 'member', surname=u'toto') self.execute('SET X custom_workflow WF WHERE X eid %(x)s, WF eid %(wf)s', {'wf': wf.eid, 'x': user.eid}) self.commit() @@ -538,7 +545,8 @@ type=u'auto', conditions=({'expr': u'X surname "toto"', 'mainvars': u'X'},)) self.commit() - user = self.create_user('member', surname=u'toto') + req = self.request() + user = self.create_user(req, 'member', surname=u'toto') self.commit() iworkflowable = user.cw_adapt_to('IWorkflowable') self.assertEqual(iworkflowable.state, 'dead') @@ -554,7 +562,8 @@ self.s_deactivated = self.wf.state_by_name('deactivated').eid self.s_dummy = self.wf.add_state(u'dummy').eid self.wf.add_transition(u'dummy', (self.s_deactivated,), self.s_dummy) - ueid = self.create_user('stduser', commit=False).eid + req = self.request() + ueid = self.create_user(req, 'stduser', commit=False).eid # test initial state is set rset = self.execute('Any N WHERE S name N, X in_state S, X eid %(x)s', {'x' : ueid}) diff -r 9ab01bf84eac -r a918f76441ce hooks/test/unittest_hooks.py --- a/hooks/test/unittest_hooks.py Fri Apr 22 10:29:23 2011 +0200 +++ b/hooks/test/unittest_hooks.py Fri Apr 22 11:58:41 2011 +0200 @@ -90,7 +90,8 @@ self.assertEqual(entity.owned_by[0].eid, self.session.user.eid) def test_user_login_stripped(self): - u = self.create_user(' joe ') + req = self.request() + u = self.create_user(req, ' joe ') tname = self.execute('Any L WHERE E login L, E eid %(e)s', {'e': u.eid})[0][0] self.assertEqual(tname, 'joe') @@ -104,7 +105,8 @@ class UserGroupHooksTC(CubicWebTC): def test_user_synchronization(self): - self.create_user('toto', password='hop', commit=False) + req = self.request() + self.create_user(req, 'toto', password='hop', commit=False) self.assertRaises(AuthenticationError, self.repo.connect, u'toto', password='hop') self.commit() @@ -129,7 +131,8 @@ self.assertEqual(user.groups, set(('managers',))) def test_user_composite_owner(self): - ueid = self.create_user('toto').eid + req = self.request() + ueid = self.create_user(req, 'toto').eid # composite of euser should be owned by the euser regardless of who created it self.execute('INSERT EmailAddress X: X address "toto@logilab.fr", U use_email X ' 'WHERE U login "toto"') diff -r 9ab01bf84eac -r a918f76441ce hooks/test/unittest_syncschema.py --- a/hooks/test/unittest_syncschema.py Fri Apr 22 10:29:23 2011 +0200 +++ b/hooks/test/unittest_syncschema.py Fri Apr 22 11:58:41 2011 +0200 @@ -251,7 +251,8 @@ 'RT name "surname", E name "CWUser"') self.commit() # should not be able anymore to add cwuser without surname - self.assertRaises(ValidationError, self.create_user, "toto") + req = self.request() + self.assertRaises(ValidationError, self.create_user, req, "toto") self.rollback() self.execute('SET DEF cardinality "?1" ' 'WHERE DEF relation_type RT, DEF from_entity E,' diff -r 9ab01bf84eac -r a918f76441ce server/test/unittest_security.py --- a/server/test/unittest_security.py Fri Apr 22 10:29:23 2011 +0200 +++ b/server/test/unittest_security.py Fri Apr 22 11:58:41 2011 +0200 @@ -29,7 +29,8 @@ def setup_database(self): super(BaseSecurityTC, self).setup_database() - self.create_user('iaminusersgrouponly') + req = self.request() + self.create_user(req, 'iaminusersgrouponly') readoriggroups = self.schema['Personne'].permissions['read'] addoriggroups = self.schema['Personne'].permissions['add'] def fix_perm(): @@ -260,7 +261,8 @@ def test_user_can_change_its_upassword(self): - ueid = self.create_user('user').eid + req = self.request() + ueid = self.create_user(req, 'user').eid cnx = self.login('user') cu = cnx.cursor() cu.execute('SET X upassword %(passwd)s WHERE X eid %(x)s', @@ -271,7 +273,8 @@ cnx.close() def test_user_cant_change_other_upassword(self): - ueid = self.create_user('otheruser').eid + req = self.request() + ueid = self.create_user(req, 'otheruser').eid cnx = self.login('iaminusersgrouponly') cu = cnx.cursor() cu.execute('SET X upassword %(passwd)s WHERE X eid %(x)s', diff -r 9ab01bf84eac -r a918f76441ce sobjects/test/unittest_email.py --- a/sobjects/test/unittest_email.py Fri Apr 22 10:29:23 2011 +0200 +++ b/sobjects/test/unittest_email.py Fri Apr 22 11:58:41 2011 +0200 @@ -54,7 +54,8 @@ self.failIf(rset.rowcount != 1, rset) def test_security_check(self): - self.create_user('toto') + req = self.request() + self.create_user(req, 'toto') email1 = self.execute('INSERT EmailAddress E: E address "client@client.com", U use_email E WHERE U login "admin"')[0][0] self.commit() cnx = self.login('toto') diff -r 9ab01bf84eac -r a918f76441ce sobjects/test/unittest_notification.py --- a/sobjects/test/unittest_notification.py Fri Apr 22 10:29:23 2011 +0200 +++ b/sobjects/test/unittest_notification.py Fri Apr 22 11:58:41 2011 +0200 @@ -84,7 +84,7 @@ def test_status_change_view(self): req = self.request() - u = self.create_user('toto', req=req) + u = self.create_user(req, 'toto') u.cw_adapt_to('IWorkflowable').fire_transition('deactivate', comment=u'yeah') self.failIf(MAILBOX) self.commit() diff -r 9ab01bf84eac -r a918f76441ce test/unittest_entity.py --- a/test/unittest_entity.py Fri Apr 22 10:29:23 2011 +0200 +++ b/test/unittest_entity.py Fri Apr 22 11:58:41 2011 +0200 @@ -245,9 +245,10 @@ 'O is EmailAddress, O address AA, O alias AB, O modification_date AC') def test_unrelated_rql_security_1_user(self): - self.create_user('toto') + req = self.request() + self.create_user(req, 'toto') self.login('toto') - user = self.request().user + user = req.user rql = user.cw_unrelated_rql('use_email', 'EmailAddress', 'subject')[0] self.assertEqual(rql, 'Any O,AA,AB,AC ORDERBY AC DESC ' 'WHERE NOT EXISTS(ZZ use_email O), S eid %(x)s, ' @@ -353,7 +354,8 @@ user = self.request().user rset = user.unrelated('use_email', 'EmailAddress', 'subject') self.assertEqual([x.address for x in rset.entities()], [u'hop']) - self.create_user('toto') + req = self.request() + self.create_user(req, 'toto') self.login('toto') email = self.execute('Any X WHERE X eid %(x)s', {'x': email.eid}).get_entity(0, 0) rset = email.unrelated('use_email', 'CWUser', 'object') diff -r 9ab01bf84eac -r a918f76441ce test/unittest_selectors.py --- a/test/unittest_selectors.py Fri Apr 22 10:29:23 2011 +0200 +++ b/test/unittest_selectors.py Fri Apr 22 11:58:41 2011 +0200 @@ -328,7 +328,8 @@ self.failUnless(SomeAction in self.vreg['actions']['yo'], self.vreg['actions']) try: # login as a simple user - self.create_user('john') + req = self.request() + self.create_user(req, 'john') self.login('john') # it should not be possible to use SomeAction not owned objects req = self.request() diff -r 9ab01bf84eac -r a918f76441ce web/test/unittest_urlpublisher.py --- a/web/test/unittest_urlpublisher.py Fri Apr 22 10:29:23 2011 +0200 +++ b/web/test/unittest_urlpublisher.py Fri Apr 22 11:58:41 2011 +0200 @@ -33,8 +33,8 @@ """test suite for QSPreProcessor""" def setup_database(self): - self.create_user(u'ÿsaÿe') req = self.request() + self.create_user(req, u'ÿsaÿe') b = req.create_entity('BlogEntry', title=u'hell\'o', content=u'blabla') c = req.create_entity('Tag', name=u'yo') # take care: Tag's name normalized to lower case self.execute('SET C tags B WHERE C eid %(c)s, B eid %(b)s', {'c':c.eid, 'b':b.eid}) diff -r 9ab01bf84eac -r a918f76441ce web/test/unittest_urlrewrite.py --- a/web/test/unittest_urlrewrite.py Fri Apr 22 10:29:23 2011 +0200 +++ b/web/test/unittest_urlrewrite.py Fri Apr 22 11:58:41 2011 +0200 @@ -103,9 +103,10 @@ class RgxActionRewriteTC(CubicWebTC): def setup_database(self): - self.p1 = self.create_user(u'user1') + req = self.request() + self.p1 = self.create_user(req, u'user1') self.p1.set_attributes(firstname=u'joe', surname=u'Dalton') - self.p2 = self.create_user(u'user2') + self.p2 = self.create_user(req, u'user2') self.p2.set_attributes(firstname=u'jack', surname=u'Dalton') def test_rgx_action_with_transforms(self): diff -r 9ab01bf84eac -r a918f76441ce web/test/unittest_views_basecontrollers.py --- a/web/test/unittest_views_basecontrollers.py Fri Apr 22 10:29:23 2011 +0200 +++ b/web/test/unittest_views_basecontrollers.py Fri Apr 22 11:58:41 2011 +0200 @@ -93,9 +93,9 @@ self.assertEqual([g.eid for g in e.in_group], groupeids) def test_user_can_change_its_password(self): - user = self.create_user('user') + req = self.request() + user = self.create_user(req, 'user') cnx = self.login('user') - req = self.request() eid = u(user.eid) req.form = { 'eid': eid, '__maineid' : eid, @@ -160,8 +160,8 @@ self.assertEqual(email.address, 'dima@logilab.fr') def test_edit_multiple_linked(self): - peid = u(self.create_user('adim').eid) req = self.request() + peid = u(self.create_user(req, 'adim').eid) req.form = {'eid': [peid, 'Y'], '__maineid': peid, '__type:'+peid: u'CWUser', @@ -450,7 +450,8 @@ def test_nonregr_rollback_on_validation_error(self): - p = self.create_user("doe") + req = self.request() + p = self.create_user(req, "doe") # do not try to skip 'primary_email' for this test old_skips = p.__class__.skip_copy_for p.__class__.skip_copy_for = () @@ -497,7 +498,7 @@ class ReportBugControllerTC(CubicWebTC): - def test_usable_by_guets(self): + def test_usable_by_guest(self): self.login('anon') self.assertRaises(NoSelectableObject, self.vreg['controllers'].select, 'reportbug', self.request()) @@ -506,7 +507,7 @@ class SendMailControllerTC(CubicWebTC): - def test_not_usable_by_guets(self): + def test_not_usable_by_guest(self): self.assertRaises(NoSelectableObject, self.vreg['controllers'].select, 'sendmail', self.request()) self.vreg['controllers'].select('sendmail', @@ -529,7 +530,7 @@ req = self.request() self.pytag = req.create_entity('Tag', name=u'python') self.cubicwebtag = req.create_entity('Tag', name=u'cubicweb') - self.john = self.create_user(u'John') + self.john = self.create_user(req, u'John') ## tests ################################################################## diff -r 9ab01bf84eac -r a918f76441ce web/test/unittest_viewselector.py --- a/web/test/unittest_viewselector.py Fri Apr 22 10:29:23 2011 +0200 +++ b/web/test/unittest_viewselector.py Fri Apr 22 11:58:41 2011 +0200 @@ -180,7 +180,7 @@ self.assertRaises(NoSelectableObject, self.vreg['views'].select, 'propertiesform', req1, rset=rset2) def test_propertiesform_jdoe(self): - self.create_user('jdoe') + self.create_user(self.request(), 'jdoe') self.login('jdoe') req1 = self.request() req2 = self.request()