From 688160efdb103bce7cf03f3bedb86b05abd796b0 Mon Sep 17 00:00:00 2001 From: martinkrulltott Date: Mon, 15 Jan 2024 18:36:11 +0000 Subject: [PATCH] test: use the new fn for eval chip text --- cypress/integration/createTrackedEntity.cy.js | 13 ++++--------- cypress/integration/programStatus.cy.js | 5 +---- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/cypress/integration/createTrackedEntity.cy.js b/cypress/integration/createTrackedEntity.cy.js index d18658fc9..f3fd24573 100644 --- 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 index 0528927c3..6c372ad11 100644 --- 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'