From 1859ebe4a49639989f3efbab134ca2475263cfb1 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Sun, 2 Jul 2017 12:05:25 +0200 Subject: Tests: improve wizard test management --- archaeological_context_records/tests.py | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'archaeological_context_records/tests.py') diff --git a/archaeological_context_records/tests.py b/archaeological_context_records/tests.py index 07360f73a..6b15cf080 100644 --- a/archaeological_context_records/tests.py +++ b/archaeological_context_records/tests.py @@ -541,26 +541,26 @@ class ContextRecordWizardCreationTest(WizardTest, ContextRecordInit, TestCase): FormData( "Create a simple context record", form_datas={ - 'selec-record_creation': {}, - 'general-record_creation': { + 'selec': {}, + 'general': { 'label': "First" }, + 'relations': [] }, - ignored=('datings-record_creation', - 'interpretation-record_creation', - 'relations-record_creation',) + ignored=('datings', + 'interpretation', + ) ), FormData( "Create a context record with a relation", form_datas={ - 'selec-record_creation': {}, - 'general-record_creation': { + 'selec': {}, + 'general': { 'label': "Second" }, - 'relations-record_creation': [] + 'relations': [] }, - ignored=('datings-record_creation', - 'interpretation-record_creation',) + ignored=('datings', 'interpretation',) ), ] @@ -573,13 +573,13 @@ class ContextRecordWizardCreationTest(WizardTest, ContextRecordInit, TestCase): ope = self.get_default_operation() parcel = self.get_default_parcel() for form_data in self.form_datas: - form_data.form_datas['selec-record_creation']['operation_id'] = \ - ope.pk - form_data.form_datas['general-record_creation']['parcel'] = \ - parcel.pk + form_data.set('selec', 'operation_id', ope.pk) + form_data.set('general', 'parcel', parcel.pk) self.related_cr = self.create_context_record(data={'operation': ope})[0] - self.form_datas[1].form_datas['relations-record_creation'].append( + + self.form_datas[1].append( + 'relations', {'right_record': self.related_cr.pk, 'relation_type': models.RelationType.objects.create( label="Test").pk} -- cgit v1.2.3 From 2f05339db6fb373bf90c053907b811a05bee4769 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Sun, 2 Jul 2017 14:26:18 +0200 Subject: Tests: add show-* tests --- archaeological_context_records/tests.py | 13 +++++++++++++ archaeological_finds/tests.py | 27 +++++++++++++++++++-------- archaeological_operations/tests.py | 13 +++++++++++++ 3 files changed, 45 insertions(+), 8 deletions(-) (limited to 'archaeological_context_records/tests.py') diff --git a/archaeological_context_records/tests.py b/archaeological_context_records/tests.py index 6b15cf080..b613b837e 100644 --- a/archaeological_context_records/tests.py +++ b/archaeological_context_records/tests.py @@ -339,6 +339,19 @@ class ContextRecordTest(ContextRecordInit, TestCase): # reached self.assertEqual(len(test_obj.find_reached), 0) + def test_show(self): + obj = self.context_records[0] + c = Client() + response = c.get(reverse('show-contextrecord', kwargs={'pk': obj.pk})) + self.assertEqual(response.status_code, 200) + # empty content when not allowed + self.assertEqual(response.content, "") + + c.login(username=self.username, password=self.password) + response = c.get(reverse('show-contextrecord', kwargs={'pk': obj.pk})) + self.assertEqual(response.status_code, 200) + self.assertIn('class="sheet"', response.content) + class ContextRecordSearchTest(ContextRecordInit, TestCase): fixtures = ImportContextRecordTest.fixtures diff --git a/archaeological_finds/tests.py b/archaeological_finds/tests.py index 3d33cf693..b6382b720 100644 --- a/archaeological_finds/tests.py +++ b/archaeological_finds/tests.py @@ -292,11 +292,12 @@ class FindTest(FindInit, TestCase): def setUp(self): self.create_finds(force=True) - password = 'mypassword' - my_admin = User.objects.create_superuser( - 'myuser', 'myemail@test.com', password) + self.password = 'mypassword' + self.username = 'myuser' + User.objects.create_superuser(self.username, 'myemail@test.com', + self.password) self.client = Client() - self.client.login(username=my_admin.username, password=password) + self.client.login(username=self.username, password=self.password) def testExternalID(self): find = self.finds[0] @@ -374,12 +375,22 @@ class FindTest(FindInit, TestCase): self.assertEqual(find_3b.index, 2) self.assertEqual(bf_3b.index, 2) - def testShowFind(self): - find = self.finds[0] - response = self.client.get(reverse('display-find', args=[find.pk])) + def test_show(self): + obj = self.finds[0] + response = self.client.get(reverse('display-find', args=[obj.pk])) self.assertEqual(response.status_code, 200) - self.assertIn('load_window("/show-find/{}/");'.format(find.pk), + self.assertIn('load_window("/show-find/{}/");'.format(obj.pk), response.content) + c = Client() + response = c.get(reverse('show-find', kwargs={'pk': obj.pk})) + self.assertEqual(response.status_code, 200) + # empty content when not allowed + self.assertEqual(response.content, "") + + c.login(username=self.username, password=self.password) + response = self.client.get(reverse('show-find', kwargs={'pk': obj.pk})) + self.assertEqual(response.status_code, 200) + self.assertIn('class="sheet"', response.content) class FindSearchTest(FindInit, TestCase): diff --git a/archaeological_operations/tests.py b/archaeological_operations/tests.py index b2f38801a..2cb6dd035 100644 --- a/archaeological_operations/tests.py +++ b/archaeological_operations/tests.py @@ -875,6 +875,19 @@ class OperationTest(TestCase, OperationInitTest): op_code_idx, lbl = find.cached_label.split(' | ') self.assertEqual(op_code_idx, 'OA666-00001') + def test_show(self): + operation = self.operations[0] + c = Client() + response = c.get(reverse('show-operation', kwargs={'pk': operation.pk})) + self.assertEqual(response.status_code, 200) + # empty content when not allowed + self.assertEqual(response.content, "") + + c.login(username=self.username, password=self.password) + response = c.get(reverse('show-operation', kwargs={'pk': operation.pk})) + self.assertEqual(response.status_code, 200) + self.assertIn('class="sheet"', response.content) + class OperationSearchTest(TestCase, OperationInitTest): fixtures = [settings.ROOT_PATH + -- cgit v1.2.3