Fix tests

Author: jochenklar

rdmo/projects/tests/e2e/test_frontend_projects.py

@@ -22,7 +22,14 @@ def test_projects_page(page: Page):
     expect(page.locator("thead")).to_contain_text("Name")
     expect(page.locator("tbody")).to_contain_text("Test")
 
-    # Assert bottom of page
+    # Assert "Load more" button
     page.locator("body").press("End")
-    expect(page.get_by_role("button", name="Scroll to top")).to_be_visible()
-    page.locator("body").press("Home")
+    load_more = page.get_by_role("button", name="Load more")
+    expect(load_more).to_be_visible()
+
+    with page.expect_response(re.compile(r"/projects/")):
+        load_more.click()
+
+    # Assert the "Scroll to top" button
+    page.locator("body").press("End")
+    expect(page.get_by_title("Scroll to top")).to_be_visible()

rdmo/projects/tests/helpers/ordering.py

@@ -9,4 +9,4 @@ def get_projects_ordered_by_last_changed():
         last_changed=Coalesce(Greatest(Subquery(
             Value.objects.filter(project=OuterRef('pk')).order_by('-updated').values('updated')[:1]
         ), 'updated'), 'updated')
-    ).order_by('last_changed')
+    ).order_by('-last_changed')

rdmo/projects/tests/test_viewset_project.py

@@ -159,11 +159,11 @@ def test_list_multisite(db, client, settings):
     visibility.sites.add(Site.objects.get(id=1))
 
     url = reverse(urlnames['list'])
-    response = client.get(url + '?page=3')
+    response = client.get(url)
     response_data = response.json()
 
     assert response.status_code == 200
-    assert project.id in [i['id'] for i in response_data['results']]
+    assert project.id == response_data['results'][0]['id']
     assert response_data['count'] == len(view_project_permission_map['site']) + 1
 
 
@@ -374,18 +374,24 @@ def test_copy(db, files, client, username, password, project_id):
         'title': 'New title',
         'description': project.description,
         'catalog': project.catalog.id,
-        'tasks': list(project.tasks.values_list('id', flat=True)),  # will be ignored but should not crash
-        'views': list(project.views.values_list('id', flat=True)),  # will be ignored but should not crash
+        'tasks': [2],  # will be ignored but should not crash
+        'views': [2],  # will be ignored but should not crash
     }
     response = client.post(url, data, content_type='application/json')
 
     if project_id in view_project_permission_map.get(username, []):
         assert response.status_code == 201
 
         for key, value in response.json().items():
-            if key in data:
+            if key in ['title', 'description', 'catalog']:
                 assert value == data[key]
 
+            # TODO: add checks once rdmo.project.handlers is rebased
+            # elif key == 'tasks':
+            #     assert value == list(project.tasks.values_list('id', flat=True))
+            # elif key == 'views':
+            #     assert value == list(project.views.values_list('id', flat=True))
+
         assert Project.objects.count() == project_count + 1
         assert Snapshot.objects.count() == snapshot_count + project_snapshots_count
         assert Value.objects.count() == value_count + project_values_count