Update tests to use xlsforms as markdown

Signed-off-by: Kipchirchir Sigei <[email protected]>
onaio · Sep 24, 2023 · ae05995 · ae05995
1 parent 1e4f165
commit ae05995
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 49 deletions.
diff --git a/onadata/apps/api/tests/viewsets/test_data_viewset.py b/onadata/apps/api/tests/viewsets/test_data_viewset.py
@@ -2330,7 +2330,18 @@ def test_geojson_format(self):
 
     def test_geotraces_in_repeats(self):
         # publish sample geotrace submissions
-        self._publish_submit_geotraces_in_repeats()
+        md = """
+        | survey | 
+        |        | type         | name           | label           | required | calculation |
+        |        | begin repeat | segment        | Waterway trace  |          |             |
+        |        | calculate    | point_position |                 |          | position(..)|
+        |        | geotrace     | blueline       | GPS Coordinates | yes      |             |
+        |        | end repeat   |
+        """
+        self.xform = self._publish_markdown(
+            md, self.user, self.project, id_string="geotraces")
+        # publish submissions
+        self._publish_submit_geoms_in_repeats("Geotraces")
         view = DataViewSet.as_view({"get": "list"})
         request = self.factory.get("/", **self.extra)
         response = view(request, pk=self.xform.pk, format="geojson")
@@ -2380,7 +2391,18 @@ def test_geotraces_in_repeats(self):
 
     def test_geoshapes_in_repeats(self):
         # publish sample geoshape submissions
-        self._publish_submit_geoshapes_in_repeats()
+        md = """
+        | survey | 
+        |        | type         | name           | label           | required | calculation |
+        |        | begin repeat | segment        | Waterway trace  |          |             |
+        |        | calculate    | point_position |                 |          | position(..)|
+        |        | geoshape     | blueline       | GPS Coordinates | yes      |             |
+        |        | end repeat   |
+        """
+        self.xform = self._publish_markdown(
+            md, self.user, self.project, id_string="geoshapes")
+        # publish submissions
+        self._publish_submit_geoms_in_repeats("Geoshapes")
         view = DataViewSet.as_view({"get": "list"})
         request = self.factory.get("/", **self.extra)
         response = view(request, pk=self.xform.pk, format="geojson")

diff --git a/onadata/apps/main/tests/fixtures/geolocation/Geoshapes.xlsx b/onadata/apps/main/tests/fixtures/geolocation/Geoshapes.xlsx
diff --git a/onadata/apps/main/tests/fixtures/geolocation/Geotraces.xlsx b/onadata/apps/main/tests/fixtures/geolocation/Geotraces.xlsx
diff --git a/onadata/apps/main/tests/test_base.py b/onadata/apps/main/tests/test_base.py
@@ -427,52 +427,7 @@ def _publish_submit_geojson(self, has_empty_geoms=False, only_geopoints=False):
             response = view(request, pk=self.xform.id)
             self.assertEqual(response.status_code, 200)
 
-    def _publish_submit_geotraces_in_repeats(self):
-        path = os.path.join(
-            settings.PROJECT_ROOT,
-            "apps",
-            "main",
-            "tests",
-            "fixtures",
-            "geolocation",
-            "Geotraces.xlsx",
-        )
-
-        self._publish_xls_file_and_set_xform(path)
-
-
-        view = XFormViewSet.as_view({"post": "csv_import"})
-        with open(
-            os.path.join(
-                settings.PROJECT_ROOT,
-                "apps",
-                "main",
-                "tests",
-                "fixtures",
-                "geolocation",
-                "Geotraces.csv",
-            ),
-            encoding="utf-8",
-        ) as csv_import:
-            post_data = {"csv_file": csv_import}
-            request = self.factory.post("/", data=post_data, **self.extra)
-            response = view(request, pk=self.xform.id)
-            self.assertEqual(response.status_code, 200)
-
-    def _publish_submit_geoshapes_in_repeats(self):
-        path = os.path.join(
-            settings.PROJECT_ROOT,
-            "apps",
-            "main",
-            "tests",
-            "fixtures",
-            "geolocation",
-            "Geoshapes.xlsx",
-        )
-
-        self._publish_xls_file_and_set_xform(path)
-
-
+    def _publish_submit_geoms_in_repeats(self, geom_type):
         view = XFormViewSet.as_view({"post": "csv_import"})
         with open(
             os.path.join(
@@ -482,7 +437,7 @@ def _publish_submit_geoshapes_in_repeats(self):
                 "tests",
                 "fixtures",
                 "geolocation",
-                "Geoshapes.csv",
+                f"{geom_type}.csv",
             ),
             encoding="utf-8",
         ) as csv_import: