Since we now expect a real .qgs file uploaded, upload something that resembles a .qgs file

Author: suricactus

docker-app/qfieldcloud/core/tests/test_qgis_file.py

@@ -287,7 +287,7 @@ def test_upload_and_list_file_with_space_in_name(self):
         )
         self.assertFalse(Project.objects.get(pk=self.project1.pk).has_the_qgis_file)
 
-        file_path = testdata_path("file.txt")
+        file_path = testdata_path("self_contained.qgs")
         # Push a file
         project_file = "aaa bbb/project qgis 1.2.qgs"
         response = self.client.post(
@@ -512,7 +512,7 @@ def test_one_qgis_project_per_project(self):
         )
         self.assertFalse(Project.objects.get(pk=self.project1.pk).has_the_qgis_file)
 
-        file_path = testdata_path("file.txt")
+        file_path = testdata_path("self_contained.qgs")
         qgis_project_file = "foo/bar/file.qgs"
         # Push a QGIS project file
         response = self.client.post(
@@ -720,7 +720,7 @@ def test_multiple_file_uploads_one_process_job(self):
         )
         self.assertFalse(Project.objects.get(pk=self.project1.pk).has_the_qgis_file)
 
-        file_path = testdata_path("file.txt")
+        file_path = testdata_path("self_contained.qgs")
         qgis_project_file = "foo/bar/file.qgs"
 
         for i in range(10):

docker-app/qfieldcloud/filestorage/tests/test_files_api.py

@@ -34,6 +34,15 @@
 logging.disable(logging.CRITICAL)
 
 
+def qgis_contents(seconds: int = 0) -> StringIO:
+    return StringIO(
+        f"""
+        <qgis projectname="" saveDateTime="2026-05-26T00:00:{seconds:02d}" saveUser="suricactus" saveUserFull="Ivan Ivanov" version="3.44.7-Solothurn">
+        </qgis>
+        """
+    )
+
+
 class QfcTestCase(QfcFilesTestCaseMixin, APITransactionTestCase):
     def setUp(self):
         setup_subscription_plans()
@@ -295,20 +304,18 @@ def test_upload_file_by_unauthorized_user_fails(self):
     def test_upload_project_files_sets_the_qgis_file_name(self):
         self.assertIsNone(self.p1.the_qgis_file_name)
 
-        self.assertFileUploaded(self.u1, self.p1, "project1.qgs", StringIO("Hello!"))
+        self.assertFileUploaded(self.u1, self.p1, "project1.qgs", qgis_contents())
         self.p1.refresh_from_db()
         self.assertEqual(self.p1.the_qgis_file_name, "project1.qgs")
 
     def test_upload_multiple_project_files_fails(self):
         self.assertIsNone(self.p1.the_qgis_file_name)
 
-        self.assertFileUploaded(self.u1, self.p1, "project1.qgs", StringIO("Hello!"))
+        self.assertFileUploaded(self.u1, self.p1, "project1.qgs", qgis_contents())
         self.p1.refresh_from_db()
         self.assertEqual(self.p1.the_qgis_file_name, "project1.qgs")
 
-        response = self._upload_file(
-            self.u1, self.p1, "project2.qgs", StringIO("Hello!")
-        )
+        response = self._upload_file(self.u1, self.p1, "project2.qgs", qgis_contents())
         self.p1.refresh_from_db()
         self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
         self.assertEqual(self.p1.project_files.count(), 1)
@@ -320,10 +327,10 @@ def test_upload_admin_restricted_files_by_owner_succeeds(self):
         self.p1.save(update_fields=["has_restricted_projectfiles"])
 
         self.assertIsNone(self.p1.the_qgis_file_name)
-        self.assertFileUploaded(self.u1, self.p1, "project1.qgs", StringIO("Hello1!"))
+        self.assertFileUploaded(self.u1, self.p1, "project1.qgs", qgis_contents(1))
         self.p1.refresh_from_db()
         self.assertEqual(self.p1.the_qgis_file_name, "project1.qgs")
-        self.assertFileUploaded(self.u1, self.p1, "project1.qgs", StringIO("Hello2!"))
+        self.assertFileUploaded(self.u1, self.p1, "project1.qgs", qgis_contents(2))
         self.p1.refresh_from_db()
         self.assertEqual(self.p1.the_qgis_file_name, "project1.qgs")
 
@@ -338,7 +345,7 @@ def test_upload_admin_restricted_files_by_admin_or_manager_succeeds(self):
             project=self.p1, collaborator=u2, role=ProjectCollaborator.Roles.ADMIN
         )
 
-        self.assertFileUploaded(u2, self.p1, "project1.qgs", StringIO("Hello1!"))
+        self.assertFileUploaded(u2, self.p1, "project1.qgs", qgis_contents(1))
         self.p1.refresh_from_db()
         self.assertEqual(self.p1.the_qgis_file_name, "project1.qgs")
 
@@ -348,7 +355,7 @@ def test_upload_admin_restricted_files_by_admin_or_manager_succeeds(self):
             project=self.p1, collaborator=u3, role=ProjectCollaborator.Roles.MANAGER
         )
 
-        self.assertFileUploaded(u3, self.p1, "project1.qgs", StringIO("Hello2!"))
+        self.assertFileUploaded(u3, self.p1, "project1.qgs", qgis_contents(2))
         self.p1.refresh_from_db()
         self.assertEqual(self.p1.the_qgis_file_name, "project1.qgs")
 
@@ -359,7 +366,7 @@ def test_upload_admin_restricted_files_set_to_false_by_editor_succeeds(self):
             project=self.p1, collaborator=u2, role=ProjectCollaborator.Roles.EDITOR
         )
 
-        self.assertFileUploaded(u2, self.p1, "project1.qgs", StringIO("Hello1!"))
+        self.assertFileUploaded(u2, self.p1, "project1.qgs", qgis_contents())
         self.p1.refresh_from_db()
         self.assertEqual(self.p1.the_qgis_file_name, "project1.qgs")
 
@@ -374,7 +381,7 @@ def test_upload_admin_restricted_files_by_non_admin_or_manager_fails(self):
             project=self.p1, collaborator=u2, role=ProjectCollaborator.Roles.EDITOR
         )
 
-        response = self._upload_file(u2, self.p1, "project1.qgs", StringIO("Hello1!"))
+        response = self._upload_file(u2, self.p1, "project1.qgs", qgis_contents())
 
         self.p1.refresh_from_db()
 
@@ -386,7 +393,7 @@ def test_upload_file_by_non_collaborator_fails(self):
         # create a new independent user that is not a collaborator
         u2 = Person.objects.create_user(username="u2", password="abc123")
 
-        response = self._upload_file(u2, self.p1, "file.name", StringIO("Hello1!"))
+        response = self._upload_file(u2, self.p1, "file.name", qgis_contents())
 
         self.p1.refresh_from_db()
 
@@ -649,7 +656,7 @@ def test_delete_non_existing_file_version_fails(self):
 
     def test_delete_qgs_project_file_sets_the_qgis_file_name_to_none(self):
         self.assertIsNone(self.p1.the_qgis_file_name)
-        self.assertFileUploaded(self.u1, self.p1, "project1.qgs", StringIO("Hello1!"))
+        self.assertFileUploaded(self.u1, self.p1, "project1.qgs", qgis_contents())
 
         self.p1.refresh_from_db()
 
@@ -664,15 +671,15 @@ def test_delete_all_file_versions_fails(self):
         self.assertIsNone(self.p1.the_qgis_file_name)
 
         # upload the a new `.qgs` file
-        self.assertFileUploaded(self.u1, self.p1, "project1.qgs", StringIO("Hello1!"))
+        self.assertFileUploaded(self.u1, self.p1, "project1.qgs", qgis_contents(1))
 
         self.p1.refresh_from_db()
 
         # project file set to the recently uploaded file
         self.assertEqual(self.p1.the_qgis_file_name, "project1.qgs")
 
         # upload the another version of the `.qgs` file
-        self.assertFileUploaded(self.u1, self.p1, "project1.qgs", StringIO("Hello2!"))
+        self.assertFileUploaded(self.u1, self.p1, "project1.qgs", qgis_contents(2))
 
         self.p1.refresh_from_db()