Fix failing unit tests #431

Signed-off-by: Thomas Druez <[email protected]>

Author: tdruez

scanpipe/filters.py

@@ -147,7 +147,7 @@ def __init__(self, data=None, *args, **kwargs):
         super().__init__(data, *args, **kwargs)
 
         # Default filtering by "Active" projects.
-        if not data or not data.get("is_archived"):
+        if not data or data.get("is_archived", "") == "":
             self.queryset = self.queryset.filter(is_archived=False)
 
         active_count = Project.objects.filter(is_archived=False).count()

scanpipe/management/commands/__init__.py

@@ -71,8 +71,12 @@ def get_run_status_code(self, run):
         return status.upper()
 
     def display_status(self, project, verbosity):
+        project_label = f"Project: {project.name}"
+        if project.is_archived:
+            project_label += " [archived]"
+
         message = [
-            self.style.HTTP_INFO(f"Project: {project.name}"),
+            self.style.HTTP_INFO(project_label),
         ]
 
         if verbosity >= 2:

scanpipe/management/commands/list-project.py

@@ -39,6 +39,7 @@ def add_arguments(self, parser):
         parser.add_argument(
             "--include-archived",
             action="store_true",
+            dest="include_archived",
             help="Include archived projects.",
         )
 

scanpipe/tests/test_views.py

@@ -47,15 +47,15 @@ def setUp(self):
     def test_scanpipe_views_project_list_is_archived(self):
         project2 = Project.objects.create(name="project2", is_archived=True)
         url = reverse("project_list")
-        url_with_filter = url + "?is_archived=true"
+        is_archive_filter = "?is_archived=true"
 
         response = self.client.get(url)
         self.assertContains(response, self.project1.name)
         self.assertNotContains(response, project2.name)
         self.assertContains(response, url)
-        self.assertContains(response, url_with_filter)
+        self.assertContains(response, is_archive_filter)
 
-        response = self.client.get(url_with_filter)
+        response = self.client.get(url + is_archive_filter)
         self.assertNotContains(response, self.project1.name)
         self.assertContains(response, project2.name)