Fix testing.

g3w-suite · Feb 28, 2024 · 86390d7 · 86390d7
1 parent f31f614
commit 86390d7
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/g3w-admin/about/api/filters.py b/g3w-admin/about/api/filters.py
@@ -57,7 +57,7 @@ def filter_queryset(self, request, queryset, view):
         if 'group_id' in view.kwargs:
             queryset = queryset.filter(group_id=view.kwargs['group_id']).order_by('order')
 
-        if url_name == 'about-group-without-macrogroup-api-list':
+        if resolve(request.path_info).url_name == 'about-group-without-macrogroup-api-list':
             queryset = queryset.filter(macrogroups__pk=None)
 
         return queryset

diff --git a/g3w-admin/about/tests/test_api.py b/g3w-admin/about/tests/test_api.py
@@ -92,6 +92,11 @@ def setUpTestData(cls):
 
         cls.project_group2.save()
 
+        cls.project_group3 = CoreGroup(name='Group3', title='Group3', header_logo_img='',
+                                       srid=G3WSpatialRefSys.objects.get(auth_srid=3857))
+
+        cls.project_group3.save()
+
         # create macrogroups
         cls.macrogroup = MacroGroup(title='Macrogroup1', logo_img='macrogroup.png')
         cls.macrogroup.save()
@@ -173,7 +178,7 @@ def test_group(self):
         response = client.get(url)
         self.assertEqual(response.status_code, 200)
         jcontent = json.loads(response.content)
-        self.assertEqual(len(jcontent), 2)
+        self.assertEqual(len(jcontent), 3)
         feature = jcontent[0]
         self.assertIn('edit_url', feature)
         group = CoreGroup.objects.filter(pk=feature['id'])[0]
@@ -318,7 +323,7 @@ def test_macrogroup(self):
         response = client.get(url)
         self.assertEqual(response.status_code, 200)
         jcontent = json.loads(response.content)
-        self.assertEqual(len(jcontent), 2)
+        self.assertEqual(len(jcontent), 1)
 
         # ad new group without macrogroup
         new_group = CoreGroup(name='Group33', title='Group33', header_logo_img='',
@@ -328,8 +333,8 @@ def test_macrogroup(self):
         response = client.get(url)
         self.assertEqual(response.status_code, 200)
         jcontent = json.loads(response.content)
-        self.assertEqual(len(jcontent), 3)
-        self.assertEqual(jcontent[2]['name'], 'Group33')
+        self.assertEqual(len(jcontent), 2)
+        self.assertEqual(jcontent[1]['name'], 'Group33')
 
         client.logout()