#19 Tests

* adds tests for compensations (WIP)
* refactors some dummy data generating into base test class
* fixes bugs detected by testing
* adds important requirements.txt change for itsdangerous package (<1.0.0 for compatibility to django-simple-sso)

intervention/tests/test_views.py

@@ -18,11 +18,8 @@ from user.models import UserActionLogEntry, UserAction
 
 
 class ViewTestCase(BaseViewTestCase):
-    intervention = None
-
     def setUp(self) -> None:
         super().setUp()
-        self.create_dummy_data()
 
         # Prepare urls
         self.index_url = reverse("intervention:index", args=())
@@ -37,35 +34,6 @@ class ViewTestCase(BaseViewTestCase):
         self.run_check_url = reverse("intervention:run-check", args=(self.intervention.id,))
         self.record_url = reverse("intervention:record", args=(self.intervention.id,))
         self.report_url = reverse("intervention:report", args=(self.intervention.id,))
-        
-    def create_dummy_data(self):
-        """ Creates an intervention which can be used for tests
-        
-        Returns:
-
-        """
-        # Create dummy data
-        # Create log entry
-        action = UserActionLogEntry.objects.create(
-            user=self.superuser,
-            action=UserAction.CREATED,
-        )
-        # Create legal data object (without M2M laws first)
-        legal_data = LegalData.objects.create()
-        # Create responsible data object
-        responsibility_data = ResponsibilityData.objects.create()
-        geometry = Geometry.objects.create()
-        # Finally create main object, holding the other objects
-        self.intervention = Intervention.objects.create(
-            identifier="TEST",
-            title="Test_title",
-            responsible=responsibility_data,
-            legal=legal_data,
-            created=action,
-            geometry=geometry,
-            comment="Test",
-        )
-        self.intervention.generate_access_token(make_unique=True)
 
     def test_views_logged_in_no_groups(self):
         """ Check correct status code for all requests
@@ -78,7 +46,7 @@ class ViewTestCase(BaseViewTestCase):
         # Login client
         client = Client()
         client.login(username=self.superuser.username, password=self.superuser_pw)
-
+        self.superuser.groups.set([])
         success_urls = [
             self.index_url,
             self.report_url,
@@ -134,7 +102,7 @@ class ViewTestCase(BaseViewTestCase):
             response = client.get(url, follow=True)
             self.assertEqual(response.redirect_chain[0], (f"{self.login_url}?next={url}", 302), msg=f"Failed for {url}. Redirect chain is {response.redirect_chain}")
 
-    def test_views_logged_in_default_group(self):
+    def test_views_logged_in_default_group_shared(self):
         """ Check correct status code for all requests
 
         Assumption: User logged in and is default group member
@@ -149,6 +117,7 @@ class ViewTestCase(BaseViewTestCase):
         # Add user to default group
         default_group = Group.objects.get(name=DEFAULT_GROUP)
         self.superuser.groups.set([default_group])
+        self.intervention.users.set([self.superuser])
 
         success_urls = [
             self.index_url,
@@ -173,10 +142,50 @@ class ViewTestCase(BaseViewTestCase):
         self.assert_url_fail(client, fail_urls)
         self.assert_url_success_redirect(client, success_urls_redirect)
 
-    def test_views_logged_in_zb_group(self):
+    def test_views_logged_in_default_group_unshared(self):
         """ Check correct status code for all requests
 
-        Assumption: User logged in and is registration office member
+        Assumption: User logged in and is default group member but data is not shared with
+
+        Returns:
+
+        """
+        # Login client
+        client = Client()
+        client.login(username=self.superuser.username, password=self.superuser_pw)
+
+        # Add user to default group
+        default_group = Group.objects.get(name=DEFAULT_GROUP)
+        self.superuser.groups.set([default_group])
+        self.intervention.users.set([])
+
+        success_urls = [
+            self.index_url,
+            self.report_url,
+            self.detail_url,
+            self.new_id_url,
+            self.new_url,
+        ]
+        fail_urls = [
+            self.run_check_url,
+            self.record_url,
+            self.edit_url,
+            self.remove_url,
+            self.share_create_url,
+            self.log_url,
+        ]
+        success_urls_redirect = {
+            self.share_url: self.detail_url
+        }
+
+        self.assert_url_success(client, success_urls)
+        self.assert_url_fail(client, fail_urls)
+        self.assert_url_success_redirect(client, success_urls_redirect)
+
+    def test_views_logged_in_zb_group_shared(self):
+        """ Check correct status code for all requests
+
+        Assumption: User logged in and is registration office member and data is shared
 
         Returns:
 
@@ -188,6 +197,7 @@ class ViewTestCase(BaseViewTestCase):
         # Add user to default group
         zb_group = self.groups.get(name=ZB_GROUP)
         self.superuser.groups.set([zb_group])
+        self.intervention.users.set([self.superuser])
 
         success_urls = [
             self.index_url,
@@ -212,10 +222,50 @@ class ViewTestCase(BaseViewTestCase):
         self.assert_url_fail(client, fail_urls)
         self.assert_url_success_redirect(client, success_urls_redirect)
 
-    def test_views_logged_in_ets_group(self):
+    def test_views_logged_in_zb_group_unshared(self):
         """ Check correct status code for all requests
 
-        Assumption: User logged in and is registration office member
+        Assumption: User logged in and is registration office member but data is not shared
+
+        Returns:
+
+        """
+        # Login client
+        client = Client()
+        client.login(username=self.superuser.username, password=self.superuser_pw)
+
+        # Add user to default group
+        zb_group = self.groups.get(name=ZB_GROUP)
+        self.superuser.groups.set([zb_group])
+        self.intervention.users.set([])
+
+        success_urls = [
+            self.index_url,
+            self.report_url,
+            self.detail_url,
+        ]
+        fail_urls = [
+            self.log_url,
+            self.new_id_url,
+            self.new_url,
+            self.edit_url,
+            self.remove_url,
+            self.share_create_url,
+            self.record_url,
+            self.run_check_url,
+        ]
+        success_urls_redirect = {
+            self.share_url: self.detail_url
+        }
+
+        self.assert_url_success(client, success_urls)
+        self.assert_url_fail(client, fail_urls)
+        self.assert_url_success_redirect(client, success_urls_redirect)
+
+    def test_views_logged_in_ets_group_shared(self):
+        """ Check correct status code for all requests
+
+        Assumption: User logged in and is registration office member and data is shared with
 
         Returns:
 
@@ -227,6 +277,7 @@ class ViewTestCase(BaseViewTestCase):
         # Add user to default group
         ets_group = Group.objects.get(name=ETS_GROUP)
         self.superuser.groups.set([ets_group])
+        self.intervention.users.set([self.superuser])
 
         success_urls = [
             self.index_url,
@@ -250,3 +301,43 @@ class ViewTestCase(BaseViewTestCase):
         self.assert_url_success(client, success_urls)
         self.assert_url_fail(client, fail_urls)
         self.assert_url_success_redirect(client, success_urls_redirect)
+
+    def test_views_logged_in_ets_group_unshared(self):
+        """ Check correct status code for all requests
+
+        Assumption: User logged in and is registration office member and data is not shared with
+
+        Returns:
+
+        """
+        # Login client
+        client = Client()
+        client.login(username=self.superuser.username, password=self.superuser_pw)
+
+        # Add user to default group
+        ets_group = Group.objects.get(name=ETS_GROUP)
+        self.superuser.groups.set([ets_group])
+        self.intervention.users.set([])
+
+        success_urls = [
+            self.index_url,
+            self.report_url,
+            self.detail_url,
+        ]
+        fail_urls = [
+            self.record_url,
+            self.log_url,
+            self.new_id_url,
+            self.new_url,
+            self.edit_url,
+            self.remove_url,
+            self.share_create_url,
+            self.run_check_url,
+        ]
+        success_urls_redirect = {
+            self.share_url: self.detail_url
+        }
+
+        self.assert_url_success(client, success_urls)
+        self.assert_url_fail(client, fail_urls)
+        self.assert_url_success_redirect(client, success_urls_redirect)

intervention/views.py

@@ -113,6 +113,7 @@ def new_id_view(request: HttpRequest):
 
 @login_required
 @default_group_required
+@shared_access_required(Intervention, "id")
 def new_document_view(request: HttpRequest, id: str):
     """ Renders a form for uploading new documents
 
@@ -264,6 +265,7 @@ def detail_view(request: HttpRequest, id: str):
 
 @login_required
 @default_group_required
+@shared_access_required(Intervention, "id")
 def edit_view(request: HttpRequest, id: str):
     """
     Renders a view for editing interventions
@@ -306,6 +308,7 @@ def edit_view(request: HttpRequest, id: str):
 
 @login_required
 @default_group_required
+@shared_access_required(Intervention, "id")
 def remove_view(request: HttpRequest, id: str):
     """ Renders a remove view for this intervention
 
@@ -388,6 +391,7 @@ def share_view(request: HttpRequest, id: str, token: str):
 
 @login_required
 @default_group_required
+@shared_access_required(Intervention, "id")
 def create_share_view(request: HttpRequest, id: str):
     """ Renders sharing form for an intervention
 
@@ -408,6 +412,7 @@ def create_share_view(request: HttpRequest, id: str):
 
 @login_required
 @registration_office_group_required
+@shared_access_required(Intervention, "id")
 def run_check_view(request: HttpRequest, id: str):
     """ Renders check form for an intervention
 
@@ -429,6 +434,7 @@ def run_check_view(request: HttpRequest, id: str):
 
 @login_required
 @default_group_required
+@shared_access_required(Intervention, "id")
 def new_revocation_view(request: HttpRequest, id: str):
     """ Renders sharing form for an intervention
 
@@ -449,6 +455,7 @@ def new_revocation_view(request: HttpRequest, id: str):
 
 @login_required
 @default_group_required
+@shared_access_required(Intervention, "id")
 def log_view(request: HttpRequest, id: str):
     """ Renders a log view using modal
 
@@ -474,6 +481,7 @@ def log_view(request: HttpRequest, id: str):
 
 @login_required
 @default_group_required
+@shared_access_required(Intervention, "id")
 def new_deduction_view(request: HttpRequest, id: str):
     """ Renders a modal form view for creating deductions
 
@@ -494,6 +502,7 @@ def new_deduction_view(request: HttpRequest, id: str):
 
 @login_required
 @conservation_office_group_required
+@shared_access_required(Intervention, "id")
 def record_view(request: HttpRequest, id: str):
     """ Renders a modal form for recording an intervention