test: use the new fn for eval chip text

dhis2 · Jan 15, 2024 · 688160e · 688160e
1 parent 2cb847f
commit 688160e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 13 deletions.
diff --git a/cypress/integration/createTrackedEntity.cy.js b/cypress/integration/createTrackedEntity.cy.js
@@ -10,6 +10,7 @@ import {
     selectProgramForTE,
     selectTrackedEntityWithType,
 } from '../helpers/dimensions.js'
+import { assertChipContainsText } from '../helpers/layout.js'
 import { clickMenubarUpdateButton } from '../helpers/menubar.js'
 import { goToStartPage } from '../helpers/startScreen.js'
 import { expectTableToBeVisible } from '../helpers/table.js'
@@ -103,7 +104,7 @@ const setUpTable = () => {
 
     expectTableToBeVisible()
 
-    cy.getBySelLike('layout-chip').contains(`${entityDimensionName}: all`)
+    assertChipContainsText(entityDimensionName, 'all')
 }
 
 // const runTests = () => {
@@ -125,10 +126,7 @@ const setUpTable = () => {
 //             .contains('Organisation unit: 1 selected')
 //             .should('be.visible')
 
-//         cy.getBySel('columns-axis')
-//             .findBySelLike('layout-chip')
-//             .contains(`${entityDimensionName}: all`)
-//             .should('be.visible')
+//         assertChipContainsText(entityDimensionName, 'all')
 
 //         cy.getBySel('columns-axis')
 //             .findBySelLike('layout-chip')
@@ -185,10 +183,7 @@ const setUpTable = () => {
 //             .contains('Organisation unit: 1 selected')
 //             .should('be.visible')
 
-//         cy.getBySel('columns-axis')
-//             .findBySelLike('layout-chip')
-//             .contains(`${entityDimensionName}: all`)
-//             .should('be.visible')
+//         assertChipContainsText(entityDimensionName, 'all')
 
 //         cy.getBySel('filters-axis')
 //             .findBySelLike('layout-chip')

diff --git a/cypress/integration/programStatus.cy.js b/cypress/integration/programStatus.cy.js
@@ -53,10 +53,7 @@ describe(['>=41'], 'program status (tracked entity)', () => {
             .contains('Enrollment PROGRAM_STATUS')
             .should('be.visible')
 
-        cy.getBySel('columns-axis')
-            .findBySelLike('layout-chip')
-            .contains(`${dimensionName}: all`)
-            .should('be.visible')
+        assertChipContainsText(dimensionName, 'all')
 
         // Add filter 'Completed'