Dh/editor : e2e - fix tests

.github/workflows/artifacts.yml

@@ -7,7 +7,6 @@ on:
   push:
     branches:
       - main
-      - develop
   release:
     types: [published]
   issue_comment:

.github/workflows/checks.yml

@@ -11,7 +11,6 @@ on:
   push:
     branches:
       - main
-      - develop
   pull_request:
     types: [opened, synchronize, ready_for_review]
 
@@ -142,3 +141,25 @@ jobs:
             - [ ] 📦 Build and push affected docker images'
           comment_tag: build-options
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+  cypress-run:
+    name: End-to-end tests
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Use Node.js ${{ env.NODE_VERSION }}
+        uses: actions/setup-node@v3
+        with:
+          node-version: ${{ env.NODE_VERSION }}
+          cache: 'npm'
+
+      - name: Build the backend
+        run: sudo docker-compose -f support-services/docker-compose.yml up -d init
+
+      - name: Install dependencies
+        run: |
+          npm ci
+
+      - name: Run tests
+        run: npx nx run-many --target=e2e

apps/datahub-e2e/src/e2e/datasetDetailPage.cy.ts

@@ -385,7 +385,7 @@ describe('dataset pages', () => {
           })
         })
         it('displays the full list after clicking two times on one filter', () => {
-          cy.get('gn-ui-data-downloads')
+          cy.get('datahub-record-downloads')
             .find('gn-ui-button')
             .children('button')
             .eq(1)

apps/datahub-e2e/src/e2e/home.cy.ts

@@ -22,8 +22,7 @@ describe('header', () => {
       cy.get('[data-cy="addMoreBtn"]').should('be.visible')
     })
     it('should display the orga and dataset link buttons', () => {
-      cy.get('[ng-reflect-title="datasets"]').should('be.visible')
-      cy.get('[ng-reflect-title="organisations"]').should('be.visible')
+      cy.get('gn-ui-figure').should('have.length', 2)
     })
 
     describe('news feed display', () => {
@@ -35,12 +34,14 @@ describe('header', () => {
 
     describe('link buttons display', () => {
       it('datasets : should display the icon', () => {
-        cy.get('[ng-reflect-title="datasets"]')
+        cy.get('gn-ui-figure')
+          .eq(0)
           .find('mat-icon')
           .should('have.text', ' folder_open ')
       })
       it('organisations : should display the icon', () => {
-        cy.get('[ng-reflect-title="organisations"]')
+        cy.get('gn-ui-figure')
+          .eq(1)
           .find('mat-icon')
           .should('have.text', ' corporate_fare ')
       })

apps/datahub-e2e/src/support/commands.ts

@@ -7,114 +7,4 @@
 // commands please read more here:
 // https://on.cypress.io/custom-commands
 // ***********************************************
-
-// eslint-disable-next-line @typescript-eslint/no-namespace
-declare namespace Cypress {
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  interface Chainable<Subject> {
-    login(): void
-    clearFavorites(): void
-
-    // interaction with gn-ui-dropdown-selector
-    openDropdown(): Chainable<JQuery<HTMLElement>>
-    selectDropdownOption(value: string): void
-    getActiveDropdownOption(): Chainable<JQuery<HTMLButtonElement>>
-  }
-}
-
-Cypress.Commands.add('login', () => {
-  // ignore error coming from GN
-  Cypress.on('uncaught:exception', (err) => {
-    if (err.message.includes('Jsonix')) return false
-    if (err.message.includes('postMessage')) return false
-  })
-
-  cy.visit('/geonetwork/srv/eng/catalog.signin?debug&redirect=blargz') // this will point to a 404
-  cy.get('#inputUsername').type('admin', { force: true })
-  cy.get('#inputPassword').type('admin', { force: true })
-  cy.get('[name="gnSigninForm"]').submit()
-})
-
-/**
- * This will most likely fail if the user is not logged in!
- */
-Cypress.Commands.add('clearFavorites', () => {
-  cy.request({
-    url: '/geonetwork/srv/api/me',
-    headers: { accept: 'application/json' },
-  })
-    .its('body')
-    .its('id')
-    .as('myId')
-
-  cy.window().then(function () {
-    cy.request({
-      url: `/geonetwork/srv/api/userselections/0/${this.myId}`,
-      headers: { accept: 'application/json' },
-    })
-      .its('body')
-      .as('favoritesId')
-  })
-
-  cy.getCookie('XSRF-TOKEN')
-    .its('value')
-    .then(function (token) {
-      const favoritesId = this.favoritesId || []
-      cy.request({
-        url: `/geonetwork/srv/api/userselections/0/${
-          this.myId
-        }?uuid=${favoritesId.join('&uuid=')}`,
-        method: 'DELETE',
-        headers: { accept: 'application/json', 'X-XSRF-TOKEN': token },
-      })
-    })
-})
-
-// previous value should be a <gn-ui-dropdown-selector> component
-Cypress.Commands.add(
-  'openDropdown',
-  { prevSubject: true },
-  (dropdownElement) => {
-    cy.get('body').click() // first click on the document to close other dropdowns
-    const width = dropdownElement.width()
-    const height = dropdownElement.height()
-    cy.wrap(dropdownElement).click(width - 10, height / 2) // click on the right size to avoid the label
-    return cy.get('.cdk-overlay-container').find('[role=listbox]')
-  }
-)
-
-// previous value should be a <gn-ui-dropdown-selector> component
-Cypress.Commands.add(
-  'selectDropdownOption',
-  { prevSubject: true },
-  (dropdownElement, value: string) => {
-    cy.wrap(dropdownElement)
-      .openDropdown()
-      .find(`[data-cy-value="${value}"]`)
-      .click()
-  }
-)
-
-// previous value should be a <gn-ui-dropdown-selector> component
-Cypress.Commands.add(
-  'getActiveDropdownOption',
-  { prevSubject: true },
-  (dropdownElement) => {
-    return cy.wrap(dropdownElement).openDropdown().find(`[data-cy-active]`)
-  }
-)
-
-// -- This is a parent command --
-// Cypress.Commands.add('login', (email, password) => { ... })
-//
-//
-// -- This is a child command --
-// Cypress.Commands.add('drag', { prevSubject: 'element'}, (subject, options) => { ... })
-//
-//
-// -- This is a dual command --
-// Cypress.Commands.add('dismiss', { prevSubject: 'optional'}, (subject, options) => { ... })
-//
-//
-// -- This will overwrite an existing command --
-// Cypress.Commands.overwrite('visit', (originalFn, url, options) => { ... })
+import '../../../../tools/e2e/commands'

apps/metadata-editor-e2e/src/e2e/dashboard.cy.ts

@@ -42,17 +42,17 @@ describe('dashboard', () => {
       cy.visit('/records/all')
       cy.get('gn-ui-record-table')
         .find('.record-table-col')
-        .first()
+        .eq(1)
         .invoke('text')
         .then((list) => {
           originalFirstItem = list.trim()
           cy.get('.record-table-header').first().click()
           // Takes time to refresh results
           // eslint-disable-next-line cypress/no-unnecessary-waiting
-          // cy.wait(500)
+          cy.wait(500)
           cy.get('gn-ui-record-table')
             .find('.record-table-col')
-            .first()
+            .eq(1)
             .invoke('text')
             .then((list) => {
               newFirstItem = list.trim()
@@ -71,7 +71,7 @@ describe('dashboard', () => {
       cy.visit('/records/all')
       cy.get('gn-ui-record-table')
         .find('.record-table-col')
-        .get('[type="checkbox"]')
+        .get('gn-ui-checkbox')
         .eq(2)
         .click()
       cy.get('.selected-records').contains('1 selected')
@@ -81,7 +81,7 @@ describe('dashboard', () => {
       cy.visit('/records/all')
       cy.get('gn-ui-record-table')
         .find('.record-table-col')
-        .get('mat-checkbox.mat-primary')
+        .get('gn-ui-checkbox')
         .each(($checkbox) => cy.wrap($checkbox).click())
       cy.get('.records-information').should(
         'not.have.descendants',
@@ -93,7 +93,7 @@ describe('dashboard', () => {
       cy.visit('/records/all')
       cy.get('gn-ui-record-table')
         .find('.record-table-col')
-        .get('mat-checkbox.mat-primary')
+        .get('gn-ui-checkbox')
         .first()
         .click()
       cy.get('.selected-records').contains('12 selected')

apps/metadata-editor-e2e/src/e2e/home.cy.ts

@@ -11,7 +11,7 @@ const gnBaseUrl = 'http://localhost:8080/geonetwork/srv/eng/'
 describe('avatar', () => {
   describe('display avatar for user without gravatar hash', () => {
     it('should display placeholder url', () => {
-      cy.loginGN('admin', 'admin', false)
+      cy.login('admin', 'admin', false)
       cy.visit(`${gnBaseUrl}admin.console#/organization`)
       cy.get('#gn-btn-user-add').click()
       cy.get('#username').type(fakeUser.username)
@@ -33,7 +33,7 @@ describe('avatar', () => {
         .should('eq', 'https://www.gravatar.com/avatar/?d=mp')
     })
     it('should display monsterid', () => {
-      cy.loginGN('admin', 'admin', false)
+      cy.login('admin', 'admin', false)
       cy.visit(`${gnBaseUrl}admin.console#/settings`)
       cy.get('[id="system/users/identicon"]').type(
         '{selectAll}gravatar:monsterid'
@@ -49,7 +49,7 @@ describe('avatar', () => {
   })
   describe('display avatar for user with hash', () => {
     it('should display the correct profile picture', () => {
-      cy.loginGN(fakeUser.username, fakeUser.password)
+      cy.login(fakeUser.username, fakeUser.password)
       cy.get('gn-ui-avatar')
         .children('img')
         .should('have.attr', 'src')

apps/metadata-editor-e2e/src/e2e/my-org.cy.ts

@@ -1,9 +1,9 @@
 describe('my-org', () => {
   beforeEach(() => {
-    cy.loginGN('barbie', 'p4ssworD_', false)
+    cy.login('barbie', 'p4ssworD_', false)
     cy.intercept({
       method: 'GET',
-      url: 'http://localhost:4200/geonetwork/srv/api/userselections/0/101',
+      url: '/geonetwork/srv/api/userselections/0/101',
     }).as('dataGetFirst')
     cy.visit(`/records/my-org`)
     cy.get('md-editor-dashboard-menu').find('a').first().click()

apps/metadata-editor-e2e/src/support/commands.ts

@@ -7,52 +7,4 @@
 // commands please read more here:
 // https://on.cypress.io/custom-commands
 // ***********************************************
-
-/* eslint-disable cypress/no-unnecessary-waiting */
-// eslint-disable-next-line @typescript-eslint/no-namespace
-declare namespace Cypress {
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  interface Chainable<Subject> {
-    // login(email: string, password: string): void
-    loginGN(username: string, password: string, redirect?: boolean): void
-    signOutGN(): void
-  }
-}
-//
-// -- This is a parent command --
-/*Cypress.Commands.add('login', (email, password) => {
-  console.log('Custom command example: Login', email, password)
-})*/
-
-Cypress.Commands.add(
-  'loginGN',
-  (username: string, password: string, redirect = true) => {
-    Cypress.on('uncaught:exception', (err) => {
-      if (err.message.includes('Jsonix')) return false
-      if (err.message.includes('postMessage')) return false
-    })
-
-    cy.visit('/geonetwork/srv/eng/catalog.signin?debug') // this will point to a 404
-    cy.get('#inputUsername').type(username, { force: true })
-    cy.get('#inputPassword').type(password, { force: true })
-    cy.get('[name="gnSigninForm"]').submit()
-    if (redirect) cy.visit('/')
-  }
-)
-
-Cypress.Commands.add('signOutGN', () => {
-  cy.visit('http://localhost:8080/geonetwork/srv/eng/catalog.search#/home')
-  cy.get('a[title="User details"]').click()
-  cy.get('a[title="Sign out"]').click()
-})
-//
-// -- This is a child command --
-// Cypress.Commands.add("drag", { prevSubject: 'element'}, (subject, options) => { ... })
-//
-//
-// -- This is a dual command --
-// Cypress.Commands.add("dismiss", { prevSubject: 'optional'}, (subject, options) => { ... })
-//
-//
-// -- This will overwrite an existing command --
-// Cypress.Commands.overwrite("visit", (originalFn, url, options) => { ... })
+import '../../../../tools/e2e/commands'

libs/ui/search/src/lib/record-preview-row/record-preview-row.component.html

@@ -67,6 +67,7 @@
     </div>
     <div
       class="text-right col-start-3 row-start-4 sm:absolute sm:col-start-2 sm:row-start-1 sm:top-[-1.125em] sm:right-[0.4em]"
+      data-cy="recordFav"
     >
       <ng-container
         [ngTemplateOutlet]="favoriteTemplate"

tools/e2e/.eslintrc.json

@@ -0,0 +1,10 @@
+{
+  "extends": ["plugin:cypress/recommended", "../../.eslintrc.json"],
+  "ignorePatterns": ["!**/*"],
+  "overrides": [
+    {
+      "files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
+      "rules": {}
+    }
+  ]
+}

tools/e2e/README.md

@@ -0,0 +1,4 @@
+# End-to-end testing utils
+
+This folder contains useful Cypress commands to be used in the E2E tests of
+various applications.