diff --git a/test/unittest_comment.py b/test/unittest_comment.py index c86328d3fc66eb94c5060fa0e7dfa9909daa2f50..6939651c1c2e44d820b7667a313cfd9180041a5d 100644 --- a/test/unittest_comment.py +++ b/test/unittest_comment.py @@ -1,6 +1,7 @@ import re from lxml import etree +from cubicweb.devtools import BASE_URL from cubicweb.devtools.testlib import CubicWebTC from cubicweb_comment import views @@ -125,7 +126,7 @@ Yeah !""", content_format=u"text/html", comments=c) # remove date content = re.sub('..../../.. ..:..', '', content) self.assertMultiLineEqual(content, - """\ + f"""\ > On - admin wrote : > bouh! @@ -134,7 +135,7 @@ some extra xxxxxxx. Yeah ! i18n_by_author_field: admin -url: http://testing.fr/cubicweb/blogentry/%s""" % self.b) +url: {BASE_URL}blogentry/%s""" % self.b) # fullthreadtext_descending view self.assertMultiLineEqual('''On - admin wrote : bouh! @@ -195,8 +196,8 @@ bouh! doc = etree.fromstring(xmldata, etree.XMLParser(recover=True)) self.assertEqual( [node.text for node in doc.xpath('//guid')], [ - 'http://testing.fr/cubicweb/comment/{}'.format(c1.eid), - 'http://testing.fr/cubicweb/comment/{}'.format(c2.eid), + '{}comment/{}'.format(BASE_URL, c1.eid), + '{}comment/{}'.format(BASE_URL, c2.eid), ]) diff --git a/test/unittest_hooks.py b/test/unittest_hooks.py index 0325d638913021f922aff10e32c65dc03bb9cf97..55b0efd8690dfacd3c35a3d6f4928fcf36b9553d 100644 --- a/test/unittest_hooks.py +++ b/test/unittest_hooks.py @@ -1,3 +1,4 @@ +from cubicweb.devtools import BASE_URL from cubicweb.devtools.testlib import CubicWebTC @@ -17,11 +18,11 @@ class CommentViewsTC(CubicWebTC): rset=c.cw_rset, row=0) content = v.render(row=0) self.assertMultiLineEqual(content, - '''Yo ! + f'''Yo ! i18n_by_author_field: admin -url: http://testing.fr/cubicweb/blogentry/%s''' % c.comments[0].eid) +url: {BASE_URL}blogentry/%s''' % c.comments[0].eid) self.assertEqual(v.subject(), 'new comment for BlogEntry une news !')