Merge pull request #1501 from danskernesdigitalebibliotek/DDFBRA-136-…

…upgrade-cypress

Upgrade Cypress

cypress.config.js

@@ -1,18 +1,23 @@
 // eslint-disable-next-line import/no-extraneous-dependencies
 const { defineConfig } = require("cypress");
+const plugins = require("./cypress/plugins");
 
 module.exports = defineConfig({
   projectId: "4trcdv",
   defaultCommandTimeout: 10000,
   pageLoadTimeout: 10000,
   requestTimeout: 30000,
-  testFiles: "@(apps|components)/**/*.test.@(ts|tsx)",
-  integrationFolder: "./src",
   retries: {
     runMode: 3,
     openMode: 0
   },
   e2e: {
-    baseUrl: "http://localhost:57021"
+    supportFile: "cypress/support/index.ts",
+    specPattern: "./src/@(apps|components)/**/*.test.@(ts|tsx)",
+    baseUrl: "http://localhost:57021",
+    testIsolation: false,
+    setupNodeEvents(on, config) {
+      return plugins(on, config);
+    }
   }
 });

cypress/plugins/index.js

@@ -1,3 +1,6 @@
+// Cypress no longer natively supports plugins file, but we keep it for better code abstraction
+// https://docs.cypress.io/app/references/migration-guide#Plugins-File-Removed
+
 const task = require("@cypress/code-coverage/task");
 const browserify = require("@cypress/browserify-preprocessor");
 

package.json

@@ -94,7 +94,7 @@
     "core-js": "^3.38.1",
     "css-loader": "^7.1.2",
     "cssnano": "^7.0.6",
-    "cypress": "^9.6.1",
+    "cypress": "^13.0.0",
     "dotenv": "^16.4.5",
     "eslint": "^8.57.0",
     "eslint-config-airbnb": "^19.0.4",

src/apps/material/material.test.ts

@@ -133,138 +133,142 @@ describe("Material", () => {
     cy.scrollTo("bottom");
     cy.getBySel("material-details-disclosure").click();
 
-    cy.get('[data-cy="list-description"]').within(() => {
-      // Verify "Language" field and its value
-      cy.get(".list-description__item")
-        .contains("Language")
-        .next()
-        .should("contain.text", "dansk");
-
-      // Verify "Edition" field and its value
-      cy.get(".list-description__item")
-        .contains("Edition")
-        .next()
-        .should("contain.text", "1. udgave, 2016");
-
-      // Verify "Genre" field and its value
-      cy.get(".list-description__item")
-        .contains("Genre")
-        .next()
-        .should("contain.text", "roman / slægtsromaner");
-
-      // Verify "Original title" field and its value
-      cy.get(".list-description__item")
-        .contains("Original title")
-        .next()
-        .should("contain.text", "The seven sisters");
-
-      // Verify "Publisher" field and its value
-      cy.get(".list-description__item")
-        .contains("Publisher")
-        .next()
-        .should("contain.text", "Cicero");
-
-      // Verify "Type" field and its value
-      cy.get(".list-description__item")
-        .contains("Type")
-        .next()
-        .should("contain.text", "bog");
-
-      // Verify "Contributors" field and its value
-      cy.get(".list-description__item")
-        .contains("Contributors")
-        .next()
-        .should("contain.text", "Ulla Lauridsen (oversætter)");
-
-      // Verify "Scope" field and its value
-      cy.get(".list-description__item")
-        .contains("Scope")
-        .next()
-        .should("contain.text", "523");
-
-      // Verify "Dimensions" field and its value
-      cy.get(".list-description__item")
-        .contains("Dimensions")
-        .next()
-        .should("contain.text", "523 sider");
-    });
+    cy.get('[data-cy="list-description"]')
+      .first()
+      .within(() => {
+        // Verify "Language" field and its value
+        cy.get(".list-description__item")
+          .contains("Language")
+          .next()
+          .should("contain.text", "dansk");
+
+        // Verify "Edition" field and its value
+        cy.get(".list-description__item")
+          .contains("Edition")
+          .next()
+          .should("contain.text", "1. udgave, 2016");
+
+        // Verify "Genre" field and its value
+        cy.get(".list-description__item")
+          .contains("Genre")
+          .next()
+          .should("contain.text", "roman / slægtsromaner");
+
+        // Verify "Original title" field and its value
+        cy.get(".list-description__item")
+          .contains("Original title")
+          .next()
+          .should("contain.text", "The seven sisters");
+
+        // Verify "Publisher" field and its value
+        cy.get(".list-description__item")
+          .contains("Publisher")
+          .next()
+          .should("contain.text", "Cicero");
+
+        // Verify "Type" field and its value
+        cy.get(".list-description__item")
+          .contains("Type")
+          .next()
+          .should("contain.text", "bog");
+
+        // Verify "Contributors" field and its value
+        cy.get(".list-description__item")
+          .contains("Contributors")
+          .next()
+          .should("contain.text", "Ulla Lauridsen (oversætter)");
+
+        // Verify "Scope" field and its value
+        cy.get(".list-description__item")
+          .contains("Scope")
+          .next()
+          .should("contain.text", "523");
+
+        // Verify "Dimensions" field and its value
+        cy.get(".list-description__item")
+          .contains("Dimensions")
+          .next()
+          .should("contain.text", "523 sider");
+      });
 
     cy.getBySel("material-editions-disclosure").click();
     cy.get(".material-manifestation-item__details").first().click();
 
-    cy.get('[data-cy="list-description"]').within(() => {
-      // Verify "Type" field and its value
-      cy.get(".list-description__item")
-        .contains("Type")
-        .next()
-        .should("contain.text", "bog");
-
-      // Verify "Language" field and its value
-      cy.get(".list-description__item")
-        .contains("Language")
-        .next()
-        .should("contain.text", "dansk");
-
-      // Verify "Genre" field and its value
-      cy.get(".list-description__item")
-        .contains("Genre")
-        .next()
-        .should("contain.text", "roman / slægtsromaner");
-
-      // Verify "Contributors" field and its value
-      cy.get(".list-description__item")
-        .contains("Contributors")
-        .next()
-        .should("contain.text", "Ulla Lauridsen (oversætter)");
-
-      // Verify "Original title" field and its value
-      cy.get(".list-description__item")
-        .contains("Original title")
-        .next()
-        .should("contain.text", "The seven sisters");
-
-      // Verify "ISBN" field and its value
-      cy.get(".list-description__item")
-        .contains("ISBN")
-        .next()
-        .should("contain.text", "9788763844116");
-
-      // Verify "Edition" field and its value
-      cy.get(".list-description__item")
-        .contains("Edition")
-        .next()
-        .should("contain.text", "1. udgave, 2016");
-
-      // Verify "Scope" field and its value
-      cy.get(".list-description__item")
-        .contains("Scope")
-        .next()
-        .should("contain.text", "523");
-
-      // Verify "Publisher" field and its value
-      cy.get(".list-description__item")
-        .contains("Publisher")
-        .next()
-        .should("contain.text", "Cicero");
-
-      // Verify "Authors" field and its value
-      cy.get(".list-description__item")
-        .contains("Authors")
-        .next()
-        .should("contain.text", "Lucinda Riley");
-
-      // Verify "Dimensions" field and its value
-      cy.get(".list-description__item")
-        .contains("Dimensions")
-        .next()
-        .should("contain.text", "523 sider");
-
-      // Verify "Source" field and its value
-      cy.get(".list-description__item")
-        .contains("Source")
-        .next()
-        .should("contain.text", "Bibliotekskatalog");
-    });
+    cy.get('[data-cy="list-description"]')
+      .first()
+      .within(() => {
+        // Verify "Type" field and its value
+        cy.get(".list-description__item")
+          .contains("Type")
+          .next()
+          .should("contain.text", "bog");
+
+        // Verify "Language" field and its value
+        cy.get(".list-description__item")
+          .contains("Language")
+          .next()
+          .should("contain.text", "dansk");
+
+        // Verify "Genre" field and its value
+        cy.get(".list-description__item")
+          .contains("Genre")
+          .next()
+          .should("contain.text", "roman / slægtsromaner");
+
+        // Verify "Contributors" field and its value
+        cy.get(".list-description__item")
+          .contains("Contributors")
+          .next()
+          .should("contain.text", "Ulla Lauridsen (oversætter)");
+
+        // Verify "Original title" field and its value
+        cy.get(".list-description__item")
+          .contains("Original title")
+          .next()
+          .should("contain.text", "The seven sisters");
+
+        // Verify "ISBN" field and its value
+        cy.get(".list-description__item")
+          .contains("ISBN")
+          .next()
+          .should("contain.text", "9788763844116");
+
+        // Verify "Edition" field and its value
+        cy.get(".list-description__item")
+          .contains("Edition")
+          .next()
+          .should("contain.text", "1. udgave, 2016");
+
+        // Verify "Scope" field and its value
+        cy.get(".list-description__item")
+          .contains("Scope")
+          .next()
+          .should("contain.text", "523");
+
+        // Verify "Publisher" field and its value
+        cy.get(".list-description__item")
+          .contains("Publisher")
+          .next()
+          .should("contain.text", "Cicero");
+
+        // Verify "Authors" field and its value
+        cy.get(".list-description__item")
+          .contains("Authors")
+          .next()
+          .should("contain.text", "Lucinda Riley");
+
+        // Verify "Dimensions" field and its value
+        cy.get(".list-description__item")
+          .contains("Dimensions")
+          .next()
+          .should("contain.text", "523 sider");
+
+        // Verify "Source" field and its value
+        cy.get(".list-description__item")
+          .contains("Source")
+          .next()
+          .should("contain.text", "Bibliotekskatalog");
+      });
   });
 
   it("Renders the correct details for infomedia", () => {
@@ -281,43 +285,45 @@ describe("Material", () => {
     cy.scrollTo("bottom");
     cy.getBySel("material-details-disclosure").click();
 
-    cy.get('[data-cy="list-description"]').within(() => {
-      // Verify "Language" field and its value
-      cy.get(".list-description__item")
-        .contains("Language")
-        .next()
-        .should("contain.text", "dansk");
-
-      // Verify "Edition" field and its value
-      cy.get(".list-description__item")
-        .contains("Edition")
-        .next()
-        .should("contain.text", "2013");
-
-      // Verify "Type" field and its value
-      cy.get(".list-description__item")
-        .contains("Type")
-        .next()
-        .should("contain.text", "artikel");
-
-      // Verify "Scope" field and its value
-      cy.get(".list-description__item")
-        .contains("Scope")
-        .next()
-        .should("contain.text", "2");
-
-      // Verify "Dimensions" field and its value
-      cy.get(".list-description__item")
-        .contains("Dimensions")
-        .next()
-        .should("contain.text", "Sektion 3, s. 6-7: ill.");
-
-      // Verify "Host Publication" field and its value
-      cy.get(".list-description__item")
-        .contains("Host Publication")
-        .next()
-        .should("contain.text", "Politiken, 2013-09-19");
-    });
+    cy.get('[data-cy="list-description"]')
+      .first()
+      .within(() => {
+        // Verify "Language" field and its value
+        cy.get(".list-description__item")
+          .contains("Language")
+          .next()
+          .should("contain.text", "dansk");
+
+        // Verify "Edition" field and its value
+        cy.get(".list-description__item")
+          .contains("Edition")
+          .next()
+          .should("contain.text", "2013");
+
+        // Verify "Type" field and its value
+        cy.get(".list-description__item")
+          .contains("Type")
+          .next()
+          .should("contain.text", "artikel");
+
+        // Verify "Scope" field and its value
+        cy.get(".list-description__item")
+          .contains("Scope")
+          .next()
+          .should("contain.text", "2");
+
+        // Verify "Dimensions" field and its value
+        cy.get(".list-description__item")
+          .contains("Dimensions")
+          .next()
+          .should("contain.text", "Sektion 3, s. 6-7: ill.");
+
+        // Verify "Host Publication" field and its value
+        cy.get(".list-description__item")
+          .contains("Host Publication")
+          .next()
+          .should("contain.text", "Politiken, 2013-09-19");
+      });
   });
 
   it("Renders the correct details for music", () => {