Merge pull request #808 from geonetwork/fix-flaky-e2e-tests

Metadata Editor: rework E2E test to avoid random failures
geonetwork · Mar 1, 2024 · eaf94da · eaf94da
2 parents 2795595 + 79446c4
commit eaf94da
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 26 deletions.
diff --git a/apps/datahub-e2e/src/e2e/datasets.cy.ts b/apps/datahub-e2e/src/e2e/datasets.cy.ts
@@ -404,12 +404,6 @@ describe('datasets', () => {
             'eql',
             'Cartographie des sols agricoles de la plaine du Rhône'
           )
-        cy.get('gn-ui-results-list-item')
-          .eq(1)
-          .find('[data-cy=recordTitle]')
-          .invoke('text')
-          .invoke('trim')
-          .should('eql', 'Alpine Convention')
       })
     })
   })

diff --git a/apps/metadata-editor-e2e/src/e2e/dashboard.cy.ts b/apps/metadata-editor-e2e/src/e2e/dashboard.cy.ts
@@ -36,32 +36,27 @@ describe('dashboard', () => {
   })
 
   describe('sorting', () => {
-    let originalFirstItem
-    let newFirstItem
     it('should order the result list on click', () => {
       cy.visit('/records/search')
       cy.get('gn-ui-results-table')
         .find('.table-row-cell')
         .eq(1)
         .invoke('text')
-        .then((list) => {
-          originalFirstItem = list.trim()
-          // order by title descending
-          cy.get('.table-header-cell').eq(1).click()
-          cy.url().should('include', 'sort=resourceTitleObject.default.keyword')
-          cy.get('.table-header-cell').eq(1).click()
-          cy.url().should(
-            'include',
-            'sort=-resourceTitleObject.default.keyword'
-          )
-          cy.get('gn-ui-results-table')
-            .find('.table-row-cell')
-            .eq(1)
-            .invoke('text')
-            .then((list) => {
-              newFirstItem = list.trim()
-              expect(newFirstItem).not.to.equal(originalFirstItem)
-            })
+        .invoke('trim')
+        .as('originalFirstItem')
+
+      // order by title descending
+      cy.get('.table-header-cell').eq(1).click()
+      cy.url().should('include', 'sort=resourceTitleObject.default.keyword')
+      cy.get('.table-header-cell').eq(1).click()
+      cy.url().should('include', 'sort=-resourceTitleObject.default.keyword')
+      cy.get('gn-ui-results-table')
+        .find('.table-row-cell')
+        .eq(1)
+        .invoke('text')
+        .invoke('trim')
+        .then((newFirstItem) => {
+          expect(newFirstItem).not.to.equal(this.originalFirstItem)
         })
     })
   })