diff --git a/smash/web/tests/api_views/test_appointment.py b/smash/web/tests/api_views/test_appointment.py
index 6e9bed327b4708bf3ab160b5bcfa097becc0c287..629947685125cbf2b6977f4c74162bb4a009f9d0 100644
--- a/smash/web/tests/api_views/test_appointment.py
+++ b/smash/web/tests/api_views/test_appointment.py
@@ -39,8 +39,8 @@ class TestAppointmentApi(LoggedInWithWorkerTestCase):
response = self.client.get(url)
self.assertEqual(response.status_code, 200)
- self.assertTrue(name in response.content)
- self.assertTrue(place in response.content)
+ self.assertTrue(name.encode('utf8') in response.content)
+ self.assertTrue(place.encode('utf8') in response.content)
def test_flying_team_location_in_appointments(self):
place = "Some new flying team location"
@@ -53,7 +53,7 @@ class TestAppointmentApi(LoggedInWithWorkerTestCase):
response = self.client.get(url)
self.assertEqual(response.status_code, 200)
- self.assertTrue(place in response.content)
+ self.assertTrue(place.encode('utf8') in response.content)
def test_appointments_approaching(self):
name = "Piotrek"
@@ -66,7 +66,7 @@ class TestAppointmentApi(LoggedInWithWorkerTestCase):
response = self.client.get(url)
self.assertEqual(response.status_code, 200)
- self.assertTrue(name in response.content)
+ self.assertTrue(name.encode('utf8') in response.content)
def test_appointments_unfinished(self):
name = "Piotrek"
@@ -79,7 +79,7 @@ class TestAppointmentApi(LoggedInWithWorkerTestCase):
response = self.client.get(url)
self.assertEqual(response.status_code, 200)
- self.assertTrue(name in response.content)
+ self.assertTrue(name.encode('utf8') in response.content)
def test_get_calendar_appointments(self):
name = "Peter"
@@ -100,7 +100,7 @@ class TestAppointmentApi(LoggedInWithWorkerTestCase):
response = self.client.get(url)
self.assertEqual(response.status_code, 200)
- self.assertFalse(name in response.content)
+ self.assertFalse(name.encode('utf8') in response.content)
params["start_date"] = (get_today_midnight_date() + datetime.timedelta(days=-2)).strftime("%Y-%m-%d")
url = ("%s" + create_get_suffix(params)) % reverse('web.api.appointments',
@@ -108,7 +108,7 @@ class TestAppointmentApi(LoggedInWithWorkerTestCase):
response = self.client.get(url)
self.assertEqual(response.status_code, 200)
- self.assertTrue(name in response.content)
+ self.assertTrue(name.encode('utf8') in response.content)
def test_get_columns(self):
response = self.client.get(
diff --git a/smash/web/tests/api_views/test_configuration_item.py b/smash/web/tests/api_views/test_configuration_item.py
index d4becf7cf6bf7b12b93de0a747e21e903c0e4eed..0628c1715d1d65cba82b1676ff4f7e33b1584484 100644
--- a/smash/web/tests/api_views/test_configuration_item.py
+++ b/smash/web/tests/api_views/test_configuration_item.py
@@ -18,12 +18,12 @@ class TestConfigurationItemApi(LoggedInTestCase):
def test_configuration_modify_invalid(self):
response = self.client.get(reverse('web.api.update_configuration_item'))
self.assertEqual(response.status_code, 200)
- self.assertTrue("error" in response.content)
+ self.assertTrue("error".encode('utf8') in response.content)
def test_configuration_modify_invalid_2(self):
response = self.client.get(reverse('web.api.update_configuration_item'), {'id': "-15", 'value': "XXX"})
self.assertEqual(response.status_code, 200)
- self.assertTrue("error" in response.content)
+ self.assertTrue("error".encode('utf8') in response.content)
def test_configuration_modify(self):
item = create_configuration_item()
diff --git a/smash/web/tests/api_views/test_subject.py b/smash/web/tests/api_views/test_subject.py
index 10b9193b706a547f873c1bb1ee61de008ef141b8..1fc9fee61063dcf8c3f69703f2f4e1289f75368d 100644
--- a/smash/web/tests/api_views/test_subject.py
+++ b/smash/web/tests/api_views/test_subject.py
@@ -151,13 +151,13 @@ class TestSubjectApi(LoggedInWithWorkerTestCase):
url = ("%s" + create_get_suffix(params)) % reverse('web.api.subjects', kwargs={'type': SUBJECT_LIST_GENERIC})
response = self.client.get(url)
self.assertEqual(response.status_code, 200)
- self.assertFalse(name in response.content)
+ self.assertFalse(name.encode('utf8') in response.content)
params["columns[0][search][value]"] = name
url = ("%s" + create_get_suffix(params)) % reverse('web.api.subjects', kwargs={'type': SUBJECT_LIST_GENERIC})
response = self.client.get(url)
self.assertEqual(response.status_code, 200)
- self.assertTrue(name in response.content)
+ self.assertTrue(name.encode('utf8') in response.content)
def check_subject_filtered(self, filters, result):
subjects = get_subjects_filtered(StudySubject.objects.all(), filters)
diff --git a/smash/web/tests/api_views/test_visit.py b/smash/web/tests/api_views/test_visit.py
index 2020af6324887766b1922b4aee8a1721f4dcef94..65f60d5531c22c90330e43794f90924210e51dee 100644
--- a/smash/web/tests/api_views/test_visit.py
+++ b/smash/web/tests/api_views/test_visit.py
@@ -86,14 +86,14 @@ class TestVisitApi(LoggedInWithWorkerTestCase):
kwargs={'visit_list_type': VISIT_LIST_GENERIC})
response = self.client.get(url)
self.assertEqual(response.status_code, 200)
- self.assertFalse(name in response.content)
+ self.assertFalse(name.encode('utf8') in response.content)
params["columns[0][search][value]"] = name
url = ("%s" + create_get_suffix(params)) % reverse('web.api.visits',
kwargs={'visit_list_type': VISIT_LIST_GENERIC})
response = self.client.get(url)
self.assertEqual(response.status_code, 200)
- self.assertTrue(name in response.content)
+ self.assertTrue(name.encode('utf8') in response.content)
def check_visit_filtered(self, filters, result):
subjects = get_visits_filtered(Visit.objects.all(), filters)
diff --git a/smash/web/tests/api_views/test_voucher.py b/smash/web/tests/api_views/test_voucher.py
index adbb1fd521058559ef751e5d77b7b521037e2901..7985d78802883124071f58e5700e2bd24339e180 100644
--- a/smash/web/tests/api_views/test_voucher.py
+++ b/smash/web/tests/api_views/test_voucher.py
@@ -36,13 +36,13 @@ class TestVoucherApi(LoggedInWithWorkerTestCase):
url = ("%s" + create_get_suffix(params)) % reverse('web.api.vouchers')
response = self.client.get(url)
self.assertEqual(response.status_code, 200)
- self.assertFalse(name in response.content)
+ self.assertFalse(name.encode('utf8') in response.content)
params["columns[0][search][value]"] = name
url = ("%s" + create_get_suffix(params)) % reverse('web.api.vouchers')
response = self.client.get(url)
self.assertEqual(response.status_code, 200)
- self.assertTrue(name in response.content)
+ self.assertTrue(name.encode('utf8') in response.content)
def check_voucher_filtered(self, filters, result):
vouchers = get_vouchers_filtered(Voucher.objects.all(), filters)
diff --git a/smash/web/tests/api_views/test_worker.py b/smash/web/tests/api_views/test_worker.py
index 9b759f0cfcee629968a1dc2732ffe34406a20d11..92d9a344de679d0deefaa4de2942af90c8d763f2 100644
--- a/smash/web/tests/api_views/test_worker.py
+++ b/smash/web/tests/api_views/test_worker.py
@@ -52,7 +52,7 @@ class TestWorkerApi(LoggedInWithWorkerTestCase):
def test_workers_for_daily_planning(self):
response = self.client.get(reverse('web.api.workers.daily_planning'))
self.assertEqual(response.status_code, 200)
- self.assertTrue(self.worker.first_name in response.content)
+ self.assertTrue(self.worker.first_name.encode('utf8') in response.content)
def test_workers_for_daily_planning_with_start_date(self):
today = datetime.datetime.today()
@@ -65,7 +65,7 @@ class TestWorkerApi(LoggedInWithWorkerTestCase):
voucher_partner = create_voucher_partner()
response = self.client.get(reverse('web.api.workers', kwargs={'worker_role': WORKER_STAFF}))
self.assertEqual(response.status_code, 200)
- self.assertTrue(voucher_partner.first_name in response.content)
+ self.assertTrue(voucher_partner.first_name.encode('utf8') in response.content)
def test_empty_availabilities(self):
factory = RequestFactory()
diff --git a/smash/web/tests/view/test_appointments.py b/smash/web/tests/view/test_appointments.py
index 96fb5ed08a0e1d008d6a68c6f7d5897730a5e14f..f999875d16309c07f4f0be638408fe84ba8e572a 100644
--- a/smash/web/tests/view/test_appointments.py
+++ b/smash/web/tests/view/test_appointments.py
@@ -102,10 +102,10 @@ class AppointmentsViewTests(LoggedInTestCase):
response = self.client.get(
reverse('web.views.appointment_edit', kwargs={'id': appointment.id}))
self.assertEqual(response.status_code, 200)
- self.assertTrue(appointment.comment in response.content, msg="Appointment data not visible in rendered page")
- self.assertTrue(appointment.visit.subject.comments in response.content,
+ self.assertTrue(appointment.comment.encode('utf8') in response.content, msg="Appointment data not visible in rendered page")
+ self.assertTrue(appointment.visit.subject.comments.encode('utf8') in response.content,
msg="Subject study data not visible in rendered page")
- self.assertTrue(appointment.visit.subject.subject.first_name in response.content,
+ self.assertTrue(appointment.visit.subject.subject.first_name.encode('utf8') in response.content,
msg="Subject data not visible in rendered page")
def test_save_appointments_edit_without_visit(self):
diff --git a/smash/web/tests/view/test_kit_request.py b/smash/web/tests/view/test_kit_request.py
index 72222f5df0f4de62743ed4d3edbf388f8232b008..424ff15ab101fe327c91d6fb9f525a8c11330e4e 100644
--- a/smash/web/tests/view/test_kit_request.py
+++ b/smash/web/tests/view/test_kit_request.py
@@ -39,7 +39,7 @@ class ViewFunctionsTests(LoggedInTestCase):
response = self.client.get(reverse('web.views.kit_requests'))
self.assertEqual(response.status_code, 200)
- self.assertTrue(item_name in response.content)
+ self.assertTrue(item_name.encode('utf8') in response.content)
def test_kit_requests_4(self):
self.login_as_admin()
@@ -59,7 +59,7 @@ class ViewFunctionsTests(LoggedInTestCase):
response = self.client.get(reverse('web.views.kit_requests'))
self.assertEqual(response.status_code, 200)
- self.assertFalse(item_name in response.content)
+ self.assertFalse(item_name.encode('utf8') in response.content)
def test_kit_requests_3(self):
self.login_as_admin()
@@ -78,7 +78,7 @@ class ViewFunctionsTests(LoggedInTestCase):
response = self.client.get(reverse('web.views.kit_requests'))
self.assertEqual(response.status_code, 200)
- self.assertTrue(item_name in response.content)
+ self.assertTrue(item_name.encode('utf8') in response.content)
def test_kit_requests_order(self):
self.login_as_admin()
@@ -157,7 +157,7 @@ class ViewFunctionsTests(LoggedInTestCase):
kwargs={'start_date': str(get_today_midnight_date().strftime("%Y-%m-%d"))}))
self.assertEqual(response.status_code, 200)
- self.assertTrue(item_name in response.content)
+ self.assertTrue(item_name.encode('utf8') in response.content)
self.assertEqual(1, len(mail.outbox))
@@ -176,5 +176,5 @@ class ViewFunctionsTests(LoggedInTestCase):
response = self.client.get(reverse('web.views.kit_requests_send_mail',
kwargs={'start_date': str(get_today_midnight_date().strftime("%Y-%m-%d"))}))
self.assertEqual(response.status_code, 200)
- self.assertTrue(item_name in response.content)
+ self.assertTrue(item_name.encode('utf8') in response.content)
self.assertEqual(1, len(mail.outbox))
diff --git a/smash/web/tests/view/test_subjects.py b/smash/web/tests/view/test_subjects.py
index bfa50eaa035c54f7e606e6e393c96d7d2f235ab7..a6332603515f633cafd66bedd86bf6a7b6a9b905 100644
--- a/smash/web/tests/view/test_subjects.py
+++ b/smash/web/tests/view/test_subjects.py
@@ -46,7 +46,7 @@ class SubjectsViewTests(LoggedInWithWorkerTestCase):
response = self.client.get(reverse('web.views.subject_edit', kwargs={'id': self.study_subject.id}))
self.assertEqual(response.status_code, 200)
- self.assertTrue(template_name in response.content)
+ self.assertTrue(template_name.encode('utf8') in response.content)
def test_render_subject_visit_details(self):
visit = create_visit(self.study_subject)
@@ -54,12 +54,12 @@ class SubjectsViewTests(LoggedInWithWorkerTestCase):
response = self.client.get(reverse('web.views.subject_visit_details', kwargs={'id': self.study_subject.id}))
self.assertEqual(response.status_code, 200)
- self.assertFalse("Add visit" in response.content)
+ self.assertFalse("Add visit".encode('utf8') in response.content)
def test_render_subject_visit_details_without_visit(self):
response = self.client.get(reverse('web.views.subject_visit_details', kwargs={'id': self.study_subject.id}))
self.assertEqual(response.status_code, 200)
- self.assertTrue("Add visit" in response.content)
+ self.assertTrue("Add visit".encode('utf8') in response.content)
def test_save_subject_edit_when_resigned_without_reason(self):
form_data = self.create_edit_form_data_for_study_subject()
@@ -70,7 +70,7 @@ class SubjectsViewTests(LoggedInWithWorkerTestCase):
reverse('web.views.subject_edit', kwargs={'id': self.study_subject.id}), data=form_data)
self.assertEqual(response.status_code, 200)
- self.assertTrue("Resign reason cannot be empty" in response.content)
+ self.assertTrue("Resign reason cannot be empty".encode('utf8') in response.content)
def test_save_subject_edit_when_endpoint_reached(self):
study_subject = create_study_subject()
@@ -244,7 +244,7 @@ class SubjectsViewTests(LoggedInWithWorkerTestCase):
form_data["subject-country"] = COUNTRY_OTHER_ID
response = self.client.post(reverse('web.views.subject_add'), data=form_data)
- self.assertTrue("Invalid data" in response.content)
+ self.assertTrue("Invalid data".encode('utf8') in response.content)
def test_subjects_add_with_prefixed_location(self):
self.worker.roles.all()[0].permissions.add(Permission.objects.get(codename="add_subject"))
diff --git a/smash/web/tests/view/test_visit.py b/smash/web/tests/view/test_visit.py
index 321d0a8440b8c653cd2a7fa9146a217e280815f1..33e3df73ff0e523b3766f4f6ad61312be498261a 100644
--- a/smash/web/tests/view/test_visit.py
+++ b/smash/web/tests/view/test_visit.py
@@ -25,8 +25,8 @@ class VisitViewTests(LoggedInTestCase):
response = self.client.get(reverse('web.views.visit_details', kwargs={'id': visit.id}))
self.assertEqual(response.status_code, 200)
- self.assertTrue(visit.subject.comments in response.content, msg="No study subject data in rendered response")
- self.assertTrue(visit.subject.subject.address in response.content, msg="No subject data in rendered response")
+ self.assertTrue(visit.subject.comments.encode('utf8') in response.content, msg="No study subject data in rendered response")
+ self.assertTrue(visit.subject.subject.address.encode('utf8') in response.content, msg="No subject data in rendered response")
def test_save_visit_details(self):
visit = create_visit()
@@ -62,7 +62,7 @@ class VisitViewTests(LoggedInTestCase):
response = self.client.post(reverse('web.views.visit_details', kwargs={'id': visit.id}), data=form_data)
self.assertEqual(response.status_code, 200)
self.assertNotContains(response, "error")
- self.assertTrue(template_name in response.content)
+ self.assertTrue(template_name.encode('utf8') in response.content)
def test_render_add_visit(self):
study_subject = create_study_subject()
@@ -82,7 +82,7 @@ class VisitViewTests(LoggedInTestCase):
response = self.client.post(reverse('web.views.visit_add', kwargs={'subject_id': subject.id}), data=form_data)
self.assertEqual(response.status_code, 302)
- self.assertFalse("error" in response.content)
+ self.assertFalse("error".encode('utf8') in response.content)
visit_count_new = Visit.objects.all().count()