diff options
| -rw-r--r-- | archaeological_operations/tests.py | 14 | ||||
| -rw-r--r-- | ishtar_common/tests.py | 37 | 
2 files changed, 47 insertions, 4 deletions
| diff --git a/archaeological_operations/tests.py b/archaeological_operations/tests.py index 8b0b81571..f2bb390bd 100644 --- a/archaeological_operations/tests.py +++ b/archaeological_operations/tests.py @@ -920,16 +920,30 @@ class OperationTest(TestCase, OperationInitTest):      def test_show(self):          operation = self.operations[0] +        source = models.OperationSource.objects.create( +            operation=operation, title="Source title", +            source_type=models.SourceType.objects.all()[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, "") +        response = c.get(reverse('show-operationsource', +                                 kwargs={'pk': source.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) +        response = c.get(reverse('show-operationsource', +                                 kwargs={'pk': source.pk})) +        self.assertEqual(response.status_code, 200) +        self.assertIn('class="sheet"', response.content)  class OperationSearchTest(TestCase, OperationInitTest): diff --git a/ishtar_common/tests.py b/ishtar_common/tests.py index 6dee5927f..c736a8769 100644 --- a/ishtar_common/tests.py +++ b/ishtar_common/tests.py @@ -972,11 +972,12 @@ class IshtarSiteProfileTest(TestCase):  class IshtarBasicTest(TestCase):      def setUp(self): -        password = 'mypassword' -        my_admin = User.objects.create_superuser( -            'myuser', 'myemail@test.com', password) +        self.password = 'mypassword' +        self.my_admin = User.objects.create_superuser( +            'myuser', 'myemail@test.com', self.password)          self.client = Client() -        self.client.login(username=my_admin.username, password=password) +        self.client.login(username=self.my_admin.username, +                          password=self.password)      def test_status(self):          response = self.client.get(reverse('status')) @@ -989,6 +990,34 @@ class IshtarBasicTest(TestCase):          person.save()          self.assertEqual(person.raw_name, "WEASLEY George") +    def test_show(self): +        person = models.Person.objects.create(name="Weasley", surname="Bill") +        orga_type = models.OrganizationType.objects.create( +            txt_idx='test', label='testy') +        company = models.Organization.objects.create( +            history_modifier=self.my_admin, name='Franquin Comp.', +            organization_type=orga_type) +        c = Client() + +        response = c.get(reverse('show-person', kwargs={'pk': person.pk})) +        self.assertEqual(response.status_code, 200) +        # empty content when not allowed +        self.assertEqual(response.content, "") +        response = c.get(reverse('show-organization', +                                 kwargs={'pk': company.pk})) +        self.assertEqual(response.status_code, 200) +        # empty content when not allowed +        self.assertEqual(response.content, "") + +        c.login(username=self.my_admin.username, password=self.password) +        response = c.get(reverse('show-person', kwargs={'pk': person.pk})) +        self.assertEqual(response.status_code, 200) +        self.assertIn('class="sheet"', response.content) +        response = c.get(reverse('show-organization', +                                 kwargs={'pk': company.pk})) +        self.assertEqual(response.status_code, 200) +        self.assertIn('class="sheet"', response.content) +  class GeomaticTest(TestCase):      def test_post_save_point(self): | 
