Merge branch 'main' into wateringress-optional-condition

swisstopo · Feb 15, 2024 · 52ba392 · 52ba392
2 parents 55fb56b + 624b4c0
commit 52ba392
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -10,7 +10,7 @@ services:
     volumes:
       - ./data/minio:/data
     entrypoint: sh
-    command: -c 'mkdir -p /data/cannonflea && /usr/bin/minio server /data -console-address ":9002"'
+    command: -c 'mkdir -p /data/cannonflea && minio server /data -console-address ":9002"'
     ports:
       - 9000:9000
   db:

diff --git a/src/client/cypress/e2e/identifierFilter.cy.js b/src/client/cypress/e2e/identifierFilter.cy.js
@@ -108,7 +108,7 @@ describe("Tests for filtering data by identifier.", () => {
       .find('[role="option"]')
       .eq(1)
       .click({ force: true });
-    cy.get("tbody").children().should("have.length", 3);
+    cy.get("tbody").children().should("have.length", 2);
 
     cy.get('[data-cy="borehole-table"] thead .checkbox').click({ force: true });
     cy.contains("button", "Bulk editing").click({ force: true });