Merge branch 'develop' into feature/fix-deploy

devinit · Apr 10, 2024 · 371bf9c · 371bf9c
2 parents b81ae24 + f0fe072
commit 371bf9c
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/frontend/cypress/integration/datasets.cy.js b/frontend/cypress/integration/datasets.cy.js
@@ -209,7 +209,7 @@ describe('The Datasets Pages', () => {
       cy.intercept('/api/datasets/mine/?limit=10&offset=0&search=', datasets).as('datasets');
     });
     cy.fixture('datasetTableData').then((data) => {
-      cy.intercept('/api/dataset/data/346', data);
+      cy.intercept('/api/dataset/data/346/?limit=15&offset=0', data).as('datasetTableData');
     });
 
     // View dataset data in tabular form
@@ -222,7 +222,8 @@ describe('The Datasets Pages', () => {
           .contains('View Data')
           .click({ force: true })
           .then(() => {
-            cy.get('[data-testid="dataset-table-body"]').children().should('have.length', 15);
+            cy.wait('@datasetTableData');
+            cy.get('[data-testid="dataset-table-body"]').children().should('have.length', 10);
             cy.get('[data-testid="dataset-export-button"]').should('be.visible');
           });
       });

diff --git a/package-lock.json b/package-lock.json
diff --git a/requirements.txt b/requirements.txt
@@ -7,7 +7,7 @@ Django>=3.1.13,<6.0
 django-cors-headers>=3.11.0,<5.0
 djangorestframework>=3.11.0,<4.0
 django-rest-knox>=4.1.0,<5.0
-django-filter>=2.2.0,<24.0
+django-filter>=2.2.0,<25.0
 gunicorn>=19.9.0,<22.0
 importlib-metadata==4.13.0
 lxml>=4.6.3,<6.0