# HG changeset patch # User Sylvain Thénault # Date 1396626869 -7200 # Node ID 2bd234de9ff31b3a3826e0feea23e55c5ade51f6 # Parent e02ebdf654c289a82d6d51ed02e131167ae2acd6 [test] update sobjects/test/unittest_supervising to cw 3.19 api diff -r e02ebdf654c2 -r 2bd234de9ff3 sobjects/test/unittest_supervising.py --- a/sobjects/test/unittest_supervising.py Fri Apr 04 17:53:58 2014 +0200 +++ b/sobjects/test/unittest_supervising.py Fri Apr 04 17:54:29 2014 +0200 @@ -16,9 +16,6 @@ # # You should have received a copy of the GNU Lesser General Public License along # with CubicWeb. If not, see . -""" - -""" import re from logilab.common.testlib import unittest_main @@ -30,38 +27,39 @@ class SupervisingTC(CubicWebTC): def setup_database(self): - req = self.request() - req.create_entity('Card', title=u"une news !", content=u"cubicweb c'est beau") - req.create_entity('Card', title=u"une autre news !", content=u"cubicweb c'est beau") - req.create_entity('Bookmark', title=u"un signet !", path=u"view?vid=index") - req.create_entity('Comment', content=u"Yo !") - self.execute('SET C comments B WHERE B title "une autre news !", C content "Yo !"') + with self.admin_access.client_cnx() as cnx: + cnx.create_entity('Card', title=u"une news !", content=u"cubicweb c'est beau") + cnx.create_entity('Card', title=u"une autre news !", content=u"cubicweb c'est beau") + cnx.create_entity('Bookmark', title=u"un signet !", path=u"view?vid=index") + cnx.create_entity('Comment', content=u"Yo !") + cnx.execute('SET C comments B WHERE B title "une autre news !", C content "Yo !"') + cnx.commit() self.vreg.config.global_set_option('supervising-addrs', 'test@logilab.fr') def test_supervision(self): # do some modification - user = self.execute('INSERT CWUser X: X login "toto", X upassword "sosafe", X in_group G ' - 'WHERE G name "users"').get_entity(0, 0) - self.execute('SET X last_login_time NOW WHERE X eid %(x)s', {'x': user.eid}) - self.execute('DELETE Card B WHERE B title "une news !"') - self.execute('SET X bookmarked_by U WHERE X is Bookmark, U eid %(x)s', {'x': user.eid}) - self.execute('SET X content "duh?" WHERE X is Comment') - self.execute('DELETE Comment C WHERE C comments Y, Y is Card, Y title "une autre news !"') - # check only one supervision email operation - session = self.session - sentops = [op for op in session.pending_operations - if isinstance(op, SupervisionMailOp)] - self.assertEqual(len(sentops), 1) - # check view content - op = sentops[0] - view = sentops[0]._get_view() - self.assertEqual(view.recipients(), ['test@logilab.fr']) - self.assertEqual(view.subject(), '[data supervision] changes summary') - data = view.render(changes=session.transaction_data.get('pendingchanges')).strip() - data = re.sub('#\d+', '#EID', data) - data = re.sub('/\d+', '/EID', data) - self.assertMultiLineEqual('''user admin has made the following change(s): + with self.admin_access.repo_cnx() as cnx: + user = cnx.execute('INSERT CWUser X: X login "toto", X upassword "sosafe", X in_group G ' + 'WHERE G name "users"').get_entity(0, 0) + cnx.execute('SET X last_login_time NOW WHERE X eid %(x)s', {'x': user.eid}) + cnx.execute('DELETE Card B WHERE B title "une news !"') + cnx.execute('SET X bookmarked_by U WHERE X is Bookmark, U eid %(x)s', {'x': user.eid}) + cnx.execute('SET X content "duh?" WHERE X is Comment') + cnx.execute('DELETE Comment C WHERE C comments Y, Y is Card, Y title "une autre news !"') + # check only one supervision email operation + sentops = [op for op in cnx.pending_operations + if isinstance(op, SupervisionMailOp)] + self.assertEqual(len(sentops), 1) + # check view content + op = sentops[0] + view = sentops[0]._get_view() + self.assertEqual(view.recipients(), ['test@logilab.fr']) + self.assertEqual(view.subject(), '[data supervision] changes summary') + data = view.render(changes=cnx.transaction_data.get('pendingchanges')).strip() + data = re.sub('#\d+', '#EID', data) + data = re.sub('/\d+', '/EID', data) + self.assertMultiLineEqual('''user admin has made the following change(s): * added cwuser #EID (toto) http://testing.fr/cubicweb/cwuser/toto @@ -77,24 +75,24 @@ * deleted comment #EID (duh?)''', data) - # check prepared email - op._prepare_email() - self.assertEqual(len(op.to_send), 1) - self.assert_(op.to_send[0][0]) - self.assertEqual(op.to_send[0][1], ['test@logilab.fr']) - self.commit() - # some other changes ####### - user.cw_adapt_to('IWorkflowable').fire_transition('deactivate') - sentops = [op for op in session.pending_operations - if isinstance(op, SupervisionMailOp)] - self.assertEqual(len(sentops), 1) - # check view content - op = sentops[0] - view = sentops[0]._get_view() - data = view.render(changes=session.transaction_data.get('pendingchanges')).strip() - data = re.sub('#\d+', '#EID', data) - data = re.sub('/\d+', '/EID', data) - self.assertMultiLineEqual('''user admin has made the following change(s): + # check prepared email + op._prepare_email() + self.assertEqual(len(op.to_send), 1) + self.assert_(op.to_send[0][0]) + self.assertEqual(op.to_send[0][1], ['test@logilab.fr']) + cnx.commit() + # some other changes ####### + user.cw_adapt_to('IWorkflowable').fire_transition('deactivate') + sentops = [op for op in cnx.pending_operations + if isinstance(op, SupervisionMailOp)] + self.assertEqual(len(sentops), 1) + # check view content + op = sentops[0] + view = sentops[0]._get_view() + data = view.render(changes=cnx.transaction_data.get('pendingchanges')).strip() + data = re.sub('#\d+', '#EID', data) + data = re.sub('/\d+', '/EID', data) + self.assertMultiLineEqual('''user admin has made the following change(s): * changed state of cwuser #EID (toto) from state activated to state deactivated @@ -102,10 +100,10 @@ data) def test_nonregr1(self): - session = self.session - # do some unlogged modification - self.execute('SET X last_login_time NOW WHERE X eid %(x)s', {'x': session.user.eid}) - self.commit() # no crash + with self.admin_access.repo_cnx() as cnx: + # do some unlogged modification + cnx.execute('SET X last_login_time NOW WHERE X eid %(x)s', {'x': cnx.user.eid}) + cnx.commit() # no crash if __name__ == '__main__':