cubicweb: comparison web/test/unittest_views

equal deleted inserted replaced

-:3fb9111d521f
+:48c6de7321d8
 #
 # You should have received a copy of the GNU Lesser General Public License along
 # with CubicWeb.  If not, see <http://www.gnu.org/licenses/>.
 """cubicweb.web.views.basecontrollers unit tests"""
+from six import text_type
 from six.moves.urllib.parse import urlsplit, urlunsplit, urljoin, parse_qs
 import lxml
 from logilab.common.testlib import unittest_main
 'upassword-subject:X': u'toto',
 'upassword-subject-confirm:X': u'toto',
 }
 with self.assertRaises(ValidationError) as cm:
 self.ctrl_publish(req)
-cm.exception.translate(unicode)
+cm.exception.translate(text_type)
 self.assertEqual({'login-subject': 'the value "admin" is already used, use another one'},
 cm.exception.errors)
 def test_simultaneous_edition_only_one_commit(self):
 """ Allow two simultaneous edit view of the same entity as long as only one commits
 """
 with self.admin_access.web_request() as req:
 user = req.user
 groupeids = [eid for eid, in req.execute('CWGroup G WHERE G name '
 'in ("managers", "users")')]
-groups = [unicode(eid) for eid in groupeids]
+groups = [text_type(eid) for eid in groupeids]
-eid = unicode(user.eid)
+eid = text_type(user.eid)
 req.form = {
 'eid': eid, '__type:'+eid: 'CWUser',
 '_cw_entity_fields:'+eid: 'login-subject,firstname-subject,surname-subject,in_group-subject',
-'login-subject:'+eid:     unicode(user.login),
+'login-subject:'+eid:     text_type(user.login),
 'surname-subject:'+eid: u'Th\xe9nault',
 'firstname-subject:'+eid:   u'Sylvain',
 'in_group-subject:'+eid:  groups,
 }
 self.expect_redirect_handle_request(req, 'edit')
 def test_user_can_change_its_password(self):
 with self.admin_access.repo_cnx() as cnx:
 self.create_user(cnx, u'user')
 cnx.commit()
 with self.new_access(u'user').web_request() as req:
-eid = unicode(req.user.eid)
+eid = text_type(req.user.eid)
 req.form = {
 'eid': eid, '__maineid' : eid,
 '__type:'+eid: 'CWUser',
 '_cw_entity_fields:'+eid: 'upassword-subject',
 'upassword-subject:'+eid: 'tournicoton',
 relations (meaning no changes)
 """
 with self.admin_access.web_request() as req:
 user = req.user
 groupeids = [g.eid for g in user.in_group]
-eid = unicode(user.eid)
+eid = text_type(user.eid)
 req.form = {
 'eid':       eid,
 '__type:'+eid:    'CWUser',
 '_cw_entity_fields:'+eid: 'login-subject,firstname-subject,surname-subject',
-'login-subject:'+eid:     unicode(user.login),
+'login-subject:'+eid:     text_type(user.login),
 'firstname-subject:'+eid: u'Th\xe9nault',
 'surname-subject:'+eid:   u'Sylvain',
 }
 self.expect_redirect_handle_request(req, 'edit')
 e = req.execute('Any X WHERE X eid %(x)s',
 '__type:X': 'CWUser',
 '_cw_entity_fields:X': 'login-subject,upassword-subject,surname-subject,in_group-subject',
 'login-subject:X': u'adim',
 'upassword-subject:X': u'toto', 'upassword-subject-confirm:X': u'toto',
 'surname-subject:X': u'Di Mascio',
-'in_group-subject:X': unicode(gueid),
+'in_group-subject:X': text_type(gueid),
 '__type:Y': 'EmailAddress',
 '_cw_entity_fields:Y': 'address-subject,use_email-object',
 'address-subject:Y': u'dima@logilab.fr',
 'use_email-object:Y': 'X',
 def test_edit_mandatory_inlined3_object(self):
 # non regression test for #3120495. Without the fix, leads to
 # "unhashable type: 'list'" error
 with self.admin_access.web_request() as req:
-cwrelation = unicode(req.execute('CWEType X WHERE X name "CWSource"')[0][0])
+cwrelation = text_type(req.execute('CWEType X WHERE X name "CWSource"')[0][0])
 req.form = {'eid': [cwrelation], '__maineid' : cwrelation,
 '__type:'+cwrelation: 'CWEType',
 '_cw_entity_fields:'+cwrelation: 'to_entity-object',
 'to_entity-object:'+cwrelation: [9999, 9998],
 path, _params = self.expect_redirect_handle_request(req, 'edit')
 self.assertTrue(path.startswith('cwetype/CWSource'), path)
 def test_edit_multiple_linked(self):
 with self.admin_access.web_request() as req:
-peid = unicode(self.create_user(req, u'adim').eid)
+peid = text_type(self.create_user(req, u'adim').eid)
 req.form = {'eid': [peid, 'Y'], '__maineid': peid,
 '__type:'+peid: u'CWUser',
 '_cw_entity_fields:'+peid: u'surname-subject',
 'surname-subject:'+peid: u'Di Masci',
 e = req.execute('Any P WHERE P surname "Di Masci"').get_entity(0, 0)
 email = e.use_email[0]
 self.assertEqual(email.address, 'dima@logilab.fr')
 # with self.admin_access.web_request() as req:
-emaileid = unicode(email.eid)
+emaileid = text_type(email.eid)
 req.form = {'eid': [peid, emaileid],
 '__type:'+peid: u'CWUser',
 '_cw_entity_fields:'+peid: u'surname-subject',
 'surname-subject:'+peid: u'Di Masci',
 """test creation of two linked entities
 """
 with self.admin_access.web_request() as req:
 user = req.user
 req.form = {'eid': 'X',
-'__cloned_eid:X': unicode(user.eid), '__type:X': 'CWUser',
+'__cloned_eid:X': text_type(user.eid), '__type:X': 'CWUser',
 '_cw_entity_fields:X': 'login-subject,upassword-subject',
 'login-subject:X': u'toto',
 'upassword-subject:X': u'toto',
 }
 with self.assertRaises(ValidationError) as cm:
 self.ctrl_publish(req)
 self.assertEqual({'upassword-subject': u'password and confirmation don\'t match'},
 cm.exception.errors)
-req.form = {'__cloned_eid:X': unicode(user.eid),
+req.form = {'__cloned_eid:X': text_type(user.eid),
 'eid': 'X', '__type:X': 'CWUser',
 '_cw_entity_fields:X': 'login-subject,upassword-subject',
 'login-subject:X': u'toto',
 'upassword-subject:X': u'toto',
 'upassword-subject-confirm:X': u'tutu',
 with self.admin_access.web_request(rollbackfirst=True) as req:
 req.form = {'eid': ['X'],
 '__type:X': 'Salesterm',
 '_cw_entity_fields:X': 'amount-subject,described_by_test-subject',
 'amount-subject:X': u'-10',
-'described_by_test-subject:X': unicode(feid),
+'described_by_test-subject:X': text_type(feid),
 }
 with self.assertRaises(ValidationError) as cm:
 self.ctrl_publish(req)
-cm.exception.translate(unicode)
+cm.exception.translate(text_type)
 self.assertEqual({'amount-subject': 'value -10 must be >= 0'},
 cm.exception.errors)
 with self.admin_access.web_request(rollbackfirst=True) as req:
 req.form = {'eid': ['X'],
 '__type:X': 'Salesterm',
 '_cw_entity_fields:X': 'amount-subject,described_by_test-subject',
 'amount-subject:X': u'110',
-'described_by_test-subject:X': unicode(feid),
+'described_by_test-subject:X': text_type(feid),
 }
 with self.assertRaises(ValidationError) as cm:
 self.ctrl_publish(req)
-cm.exception.translate(unicode)
+cm.exception.translate(text_type)
 self.assertEqual(cm.exception.errors, {'amount-subject': 'value 110 must be <= 100'})
 with self.admin_access.web_request(rollbackfirst=True) as req:
 req.form = {'eid': ['X'],
 '__type:X': 'Salesterm',
 '_cw_entity_fields:X': 'amount-subject,described_by_test-subject',
 'amount-subject:X': u'10',
-'described_by_test-subject:X': unicode(feid),
+'described_by_test-subject:X': text_type(feid),
 }
 self.expect_redirect_handle_request(req, 'edit')
 # should be redirected on the created
 #eid = params['rql'].split()[-1]
 e = req.execute('Salesterm X').get_entity(0, 0)
 seid = cnx.create_entity('Salesterm', amount=0, described_by_test=feid).eid
 cnx.commit()
 # ensure a value that violate a constraint is properly detected
 with self.admin_access.web_request(rollbackfirst=True) as req:
-req.form = {'eid': [unicode(seid)],
+req.form = {'eid': [text_type(seid)],
 '__type:%s'%seid: 'Salesterm',
 '_cw_entity_fields:%s'%seid: 'amount-subject',
 'amount-subject:%s'%seid: u'-10',
 }
 self.assertMultiLineEqual('''<script type="text/javascript">
 window.parent.handleFormValidationResponse('entityForm', null, null, [false, [%s, {"amount-subject": "value -10 must be >= 0"}], null], null);
 </script>'''%seid, self.ctrl_publish(req, 'validateform'))
 # ensure a value that comply a constraint is properly processed
 with self.admin_access.web_request(rollbackfirst=True) as req:
-req.form = {'eid': [unicode(seid)],
+req.form = {'eid': [text_type(seid)],
 '__type:%s'%seid: 'Salesterm',
 '_cw_entity_fields:%s'%seid: 'amount-subject',
 'amount-subject:%s'%seid: u'20',
 }
 self.assertMultiLineEqual('''<script type="text/javascript">
 with self.admin_access.web_request(rollbackfirst=True) as req:
 req.form = {'eid': ['X'],
 '__type:X': 'Salesterm',
 '_cw_entity_fields:X': 'amount-subject,described_by_test-subject',
 'amount-subject:X': u'0',
-'described_by_test-subject:X': unicode(feid),
+'described_by_test-subject:X': text_type(feid),
 }
 # ensure a value that is modified in an operation on a modify
 # hook works as it should (see
 # https://www.cubicweb.org/ticket/2509729 )
 self.assertEqual(params['toto'], 'tutu')
 def test_redirect_delete_button(self):
 with self.admin_access.web_request() as req:
 eid = req.create_entity('BlogEntry', title=u'hop', content=u'hop').eid
-req.form = {'eid': unicode(eid), '__type:%s'%eid: 'BlogEntry',
+req.form = {'eid': text_type(eid), '__type:%s'%eid: 'BlogEntry',
 '__action_delete': ''}
 path, params = self.expect_redirect_handle_request(req, 'edit')
 self.assertEqual(path, 'blogentry')
 self.assertIn('_cwmsgid', params)
 eid = req.create_entity('EmailAddress', address=u'hop@logilab.fr').eid
 req.execute('SET X use_email E WHERE E eid %(e)s, X eid %(x)s',
 {'x': req.user.eid, 'e': eid})
 req.cnx.commit()
-req.form = {'eid': unicode(eid), '__type:%s'%eid: 'EmailAddress',
+req.form = {'eid': text_type(eid), '__type:%s'%eid: 'EmailAddress',
 '__action_delete': ''}
 path, params = self.expect_redirect_handle_request(req, 'edit')
 self.assertEqual(path, 'cwuser/admin')
 self.assertIn('_cwmsgid', params)
 eid1 = req.create_entity('BlogEntry', title=u'hop', content=u'hop').eid
 eid2 = req.create_entity('EmailAddress', address=u'hop@logilab.fr').eid
-req.form = {'eid': [unicode(eid1), unicode(eid2)],
+req.form = {'eid': [text_type(eid1), text_type(eid2)],
 '__type:%s'%eid1: 'BlogEntry',
 '__type:%s'%eid2: 'EmailAddress',
 '__action_delete': ''}
 path, params = self.expect_redirect_handle_request(req, 'edit')
 self.assertEqual(path, 'view')
 """
 with self.admin_access.web_request() as req:
 groupeids = sorted(eid
 for eid, in req.execute('CWGroup G '
 'WHERE G name in ("managers", "users")'))
-groups = [unicode(eid) for eid in groupeids]
+groups = [text_type(eid) for eid in groupeids]
 cwetypeeid = req.execute('CWEType X WHERE X name "CWEType"')[0][0]
-basegroups = [unicode(eid)
+basegroups = [text_type(eid)
 for eid, in req.execute('CWGroup G '
 'WHERE X read_permission G, X eid %(x)s',
 {'x': cwetypeeid})]
-cwetypeeid = unicode(cwetypeeid)
+cwetypeeid = text_type(cwetypeeid)
 req.form = {
 'eid':      cwetypeeid,
 '__type:'+cwetypeeid:  'CWEType',
 '_cw_entity_fields:'+cwetypeeid: 'name-subject,final-subject,description-subject,read_permission-subject',
 'name-subject:'+cwetypeeid:     u'CWEType',
 # silly tests
 def test_external_resource(self):
 with self.remote_calling('external_resource', 'RSS_LOGO') as (res, _):
-self.assertEqual(json_dumps(self.config.uiprops['RSS_LOGO']),
+self.assertEqual(json_dumps(self.config.uiprops['RSS_LOGO']).encode('ascii'),
 res)
 def test_i18n(self):
 with self.remote_calling('i18n', ['bimboom']) as (res, _):
-self.assertEqual(json_dumps(['bimboom']), res)
+self.assertEqual(json_dumps(['bimboom']).encode('ascii'), res)
 def test_format_date(self):
 with self.remote_calling('format_date', '2007-01-01 12:00:00') as (res, _):
-self.assertEqual(json_dumps('2007/01/01'), res)
+self.assertEqual(json_dumps('2007/01/01').encode('ascii'), res)
 def test_ajaxfunc_noparameter(self):
 @ajaxfunc
 def foo(self, x, y):
 return 'hello'

changeset 10728	48c6de7321d8
parent 10704	73367a56ee41
child 10749	2703116e4b21