From e43d48b790b829eff03d93799c80452b013d44e3 Mon Sep 17 00:00:00 2001
From: "Cleopatra Enjeck M." <patrathewhiz@gmail.com>
Date: Sat, 4 Jan 2025 14:05:41 +0000
Subject: [PATCH] fix(Cypress): update selectors for confirmation dialog

Signed-off-by: Cleopatra Enjeck M. <patrathewhiz@gmail.com>
---
 cypress/support/commands.js                                   | 4 ++--
 .../components/ncTable/partials/TableHeaderColumnOptions.vue  | 1 +
 src/shared/modals/DialogConfirmation.vue                      | 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/cypress/support/commands.js b/cypress/support/commands.js
index 2e2121b4e..6a1ec0a3e 100644
--- a/cypress/support/commands.js
+++ b/cypress/support/commands.js
@@ -470,8 +470,8 @@ Cypress.Commands.add('addUserToGroup', (userId, groupId) => {
 
 Cypress.Commands.add('removeColumn', (title) => {
 	cy.get('.custom-table table tr th .cell').contains(title).click()
-	cy.get('.v-popper__popper ul.nc-button-group-content').last().get('button').last().click()
-	cy.get('.modal__content button').contains('Confirm').click()
+	cy.get('[data-cy="deleteColumnActionBtn"] button').click()
+	cy.get('[data-cy="confirmDialog"] button').contains('Confirm').click()
 })
 
 // fill in a value in the 'create row' or 'edit row' model
diff --git a/src/shared/components/ncTable/partials/TableHeaderColumnOptions.vue b/src/shared/components/ncTable/partials/TableHeaderColumnOptions.vue
index eac1793b9..4cc76d1ce 100644
--- a/src/shared/components/ncTable/partials/TableHeaderColumnOptions.vue
+++ b/src/shared/components/ncTable/partials/TableHeaderColumnOptions.vue
@@ -110,6 +110,7 @@
 					</NcActionButton>
 					<NcActionButton v-if="showDeleteColumn"
 						:aria-label="t('tables', 'Delete column')"
+						data-cy="deleteColumnActionBtn"
 						@click="deleteColumn()">
 						<template #icon>
 							<Delete :size="25" />
diff --git a/src/shared/modals/DialogConfirmation.vue b/src/shared/modals/DialogConfirmation.vue
index 325b2005b..dede5337e 100644
--- a/src/shared/modals/DialogConfirmation.vue
+++ b/src/shared/modals/DialogConfirmation.vue
@@ -4,7 +4,8 @@
 -->
 <template>
 	<NcDialog v-if="showModal" :out-transition="true"
-		size="normal" close-on-click-outside :name="title" @closing="$emit('cancel')">
+		size="normal" close-on-click-outside :name="title" @closing="$emit('cancel')"
+		data-cy="confirmDialog">
 		<div class="row">
 			<div v-if="description" class="col-4">
 				<p>{{ description }}</p>