diff --git a/bt5/erp5_km/TestTemplateItem/portal_components/test.erp5.testKM.py b/bt5/erp5_km/TestTemplateItem/portal_components/test.erp5.testKM.py index f5ec12a58b1878fb443bd2da1d3904bf35a1e7ac..a67f659bea049ff9211127dcbb1e5b2f5e5add0a 100644 --- a/bt5/erp5_km/TestTemplateItem/portal_components/test.erp5.testKM.py +++ b/bt5/erp5_km/TestTemplateItem/portal_components/test.erp5.testKM.py @@ -431,7 +431,7 @@ class TestKM(TestKMMixIn): #self.changeSkin('KM') url = '%s/ERP5Site_viewHomeAreaRenderer?gadget_mode=web_front' %self.web_site_url response = self.publish(url, self.auth) - self.assertIn(self.web_front_knowledge_pad.getTitle(), response.getBody()) + self.assertIn(self.web_front_knowledge_pad.getTitle().encode(), response.getBody()) # Web Front gadgets web_front_gadgets = [km_my_tasks_gadget, km_my_documents_gadget, km_my_contacts_gadget] @@ -442,7 +442,7 @@ class TestKM(TestKMMixIn): # check that gadgets are added to web front page view response = self.publish(url, self.auth) for gadget in web_front_gadgets: - self.assertIn(gadget.getTitle(), response.getBody()) + self.assertIn(gadget.getTitle().encode(), response.getBody()) def test_05MyTaskGadget(self): """ Check My Task Gadgets """ @@ -480,8 +480,8 @@ class TestKM(TestKMMixIn): self.webpage.getRelativeUrl(), km_my_tasks_box_url) , self.auth)]: - self.assertIn(project.getTitle(), response.getBody()) - self.assertIn(visit.getTitle(), response.getBody()) + self.assertIn(project.getTitle().encode(), response.getBody()) + self.assertIn(visit.getTitle().encode(), response.getBody()) def test_06MyDocumentsGadget(self): """ Check My Document Gadgets """ @@ -523,8 +523,8 @@ class TestKM(TestKMMixIn): self.webpage.getRelativeUrl(), km_my_documents_gadget_box_url) , self.auth)]: - self.assertIn(web_page.getTitle(), response.getBody()) - self.assertIn(presentation.getTitle(), response.getBody()) + self.assertIn(web_page.getTitle().encode(), response.getBody()) + self.assertIn(presentation.getTitle().encode(), response.getBody()) def test_07MyContactsGadget(self): """ Check My Contacts Gadgets """ @@ -560,7 +560,7 @@ class TestKM(TestKMMixIn): self.webpage.getRelativeUrl(), km_my_contacts_gadget_box_url) , self.auth)]: - self.assertIn(person.getTitle(), response.getBody()) + self.assertIn(person.getTitle().encode(), response.getBody()) def test_08WebSectionGadget(self): """ Check Web Section Gadgets """ @@ -579,7 +579,7 @@ class TestKM(TestKMMixIn): self.web_section_url + '/WebSection_viewKnowledgePadColumn?gadget_mode=', self.auth) for gadget in web_section_gadgets: - self.assertIn(gadget.getTitle(), response.getBody()) + self.assertIn(gadget.getTitle().encode(), response.getBody()) def test_10LatestContentGadget(self): """ Check Latest Content Gadgets """ @@ -620,7 +620,7 @@ class TestKM(TestKMMixIn): presentation.publish() self.tic() self.changeSkin('KM') - self.assertIn(presentation.getTitle(), + self.assertIn(presentation.getTitle().encode(), self.publish(self.base_url_pattern %(self.web_section_url+'/%s' %latest_docs_subsection.getId(), gadget_view_form_id, @@ -648,7 +648,7 @@ class TestKM(TestKMMixIn): self.web_section_knowledge_pad, km_assigned_member_gadget) self.changeSkin('KM') - self.assertIn('No result', + self.assertIn(b'No result', self.publish(self.base_url_pattern %(self.web_section_url+'/%s' %assigned_members_subsection.getId(), gadget_view_form_id, @@ -662,7 +662,7 @@ class TestKM(TestKMMixIn): assignment = person.newContent(portal_type = 'Assignment', destination_project_value=project) self.tic() self.changeSkin('KM') - self.assertIn(person.getTitle(), + self.assertIn(person.getTitle().encode(), self.publish(self.base_url_pattern %(self.web_section_url+'/%s' %assigned_members_subsection.getId(), gadget_view_form_id, @@ -688,7 +688,7 @@ class TestKM(TestKMMixIn): self.web_section_url + '/WebSection_viewKnowledgePadColumn?gadget_mode=', self.auth) for gadget in web_section_content_gadgets: - self.assertIn(gadget.getTitle(), response.getBody()) + self.assertIn(gadget.getTitle().encode(), response.getBody()) def test_12RelationGadget(self): """ Check Relation Gadgets """ @@ -717,7 +717,7 @@ class TestKM(TestKMMixIn): gadget_view_form_id) # no related docs should exist - self.assertIn('No result.', relation_form_renderer()) + self.assertIn(b'No result.', relation_form_renderer()) # set related docs similar_doc = portal.web_page_module.newContent( @@ -767,19 +767,19 @@ class TestKM(TestKMMixIn): old_gadget_view_form_id = gadget.view_form_id gadget.view_form_id = 'NO_SUCH_FORM_EXISTS' response = self.publish(url, self.auth) - self.assertIn('Server side error', response.getBody()) + self.assertIn(b'Server side error', response.getBody()) gadget.view_form_id = old_gadget_view_form_id response = self.publish(url, self.auth) - self.assertNotIn('Server side error', response.getBody()) + self.assertNotIn(b'Server side error', response.getBody()) # set non existent edit_form old_gadget_edit_form_id = gadget.edit_form_id gadget.edit_form_id = 'NO_SUCH_FORM_EXISTS' response = self.publish(url, self.auth) - self.assertIn('Server side error', response.getBody()) + self.assertIn(b'Server side error', response.getBody()) gadget.edit_form_id = old_gadget_edit_form_id response = self.publish(url, self.auth) - self.assertNotIn('Server side error', response.getBody()) + self.assertNotIn(b'Server side error', response.getBody()) def test_16WebSiteBrowserGadget(self): """ @@ -813,7 +813,7 @@ class TestKM(TestKMMixIn): subsection.edit(visible=True) self.tic() self.changeSkin('KM') - self.assertIn(subsection.getTitle(), + self.assertIn(subsection.getTitle().encode(), self.publish(url, self.auth).getBody()) def test_17AddGadgets(self):