From 21dc47ed7479c50eaa847ff1bbdf79dd781a94b0 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 2 Dec 2024 01:25:42 +0100
Subject: [PATCH] perf: add dataCy

---
 src/components/CreateNewCityForm.vue          |  1 +
 src/components/common/VnSelectDialog.vue      |  1 +
 .../vnComponent/VnLocation.spec.js            | 32 ++++++-------------
 3 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/src/components/CreateNewCityForm.vue b/src/components/CreateNewCityForm.vue
index 9ab942dda..bf3830522 100644
--- a/src/components/CreateNewCityForm.vue
+++ b/src/components/CreateNewCityForm.vue
@@ -40,6 +40,7 @@ const onDataSaved = (...args) => {
         url-create="towns"
         model="city"
         @on-data-saved="onDataSaved"
+        data-cy="newCityForm"
     >
         <template #form-inputs="{ data, validate }">
             <VnRow>
diff --git a/src/components/common/VnSelectDialog.vue b/src/components/common/VnSelectDialog.vue
index 350aa9272..12322c3fa 100644
--- a/src/components/common/VnSelectDialog.vue
+++ b/src/components/common/VnSelectDialog.vue
@@ -43,6 +43,7 @@ const isAllowedToCreate = computed(() => {
     >
         <template v-if="isAllowedToCreate" #append>
             <QIcon
+                :data-cy="$attrs.dataCy ?? $attrs.label + '_icon'"
                 @click.stop.prevent="$refs.dialog.show()"
                 :name="actionIcon"
                 :size="actionIcon === 'add' ? 'xs' : 'sm'"
diff --git a/test/cypress/integration/vnComponent/VnLocation.spec.js b/test/cypress/integration/vnComponent/VnLocation.spec.js
index eab5d63b9..82d12a1e4 100644
--- a/test/cypress/integration/vnComponent/VnLocation.spec.js
+++ b/test/cypress/integration/vnComponent/VnLocation.spec.js
@@ -116,16 +116,14 @@ describe('VnLocation', () => {
             checkVnLocation(postCode, province);
         });
 
-        it.only('Create city without country', () => {
+        it('Create city without country', () => {
             const postCode = randomNumber();
             const province = randomString({ length: 4 });
             cy.get(createLocationButton).click();
             cy.get(dialogInputs).eq(0).type(postCode);
-            cy.get(
-                `${createForm.prefix} > :nth-child(4) > .q-select > ${createForm.sufix} > :nth-child(2) `
-            ).click();
+            cy.dataCy('City_icon').click();
             cy.selectOption('[data-cy="locationProvince"]:last', 'Province one');
-            cy.get('[data-cy="cityName"]').type(province);
+            cy.dataCy('cityName').type(province);
             cy.dataCy('FormModelPopup_save').eq(1).click();
             cy.dataCy('FormModelPopup_save').eq(0).click();
 
@@ -133,34 +131,28 @@ describe('VnLocation', () => {
             checkVnLocation(postCode, province);
         });
 
-        it.only('Create city with country', () => {
+        it('Create city with country', () => {
             const cityName = 'Saskatchew'.concat(Math.random(1 * 100));
             cy.get(createLocationButton).click();
             cy.selectOption(
                 `${createForm.prefix} > :nth-child(5) > :nth-child(3) `,
                 'Italia'
             );
-            cy.get(
-                `${createForm.prefix} > :nth-child(4) > .q-select > ${createForm.sufix} > :nth-child(2)  `
-            ).click();
+            cy.dataCy('City_icon').click();
             cy.selectOption('[data-cy="locationProvince"]:last', 'Province four');
             cy.countSelectOptions('[data-cy="locationProvince"]:last', 1);
 
-            cy.get('[data-cy="cityName"]').type(cityName);
+            cy.dataCy('cityName').type(cityName);
             cy.dataCy('FormModelPopup_save').eq(1).click();
         });
 
         it('Create province without country', () => {
             const provinceName = 'Saskatchew'.concat(Math.random(1 * 100));
             cy.get(createLocationButton).click();
-            cy.get(
-                `${createForm.prefix} > :nth-child(5) > .q-select > ${createForm.sufix} > :nth-child(2) `
-            )
-                .eq(0)
-                .click();
+            cy.dataCy('Province_icon').click();
             cy.selectOption('[data-cy="autonomyProvince"] ', 'Autonomy one');
             cy.countSelectOptions('[data-cy="autonomyProvince"]', 4);
-            cy.get('[data-cy="provinceName"]').type(provinceName);
+            cy.dataCy('provinceName').type(provinceName);
 
             cy.dataCy('FormModelPopup_save').eq(1).click();
         });
@@ -172,16 +164,12 @@ describe('VnLocation', () => {
                 `${createForm.prefix} > :nth-child(5) > :nth-child(3) `,
                 'España'
             );
-            cy.get(
-                `${createForm.prefix} > :nth-child(5) > .q-select > ${createForm.sufix} > :nth-child(2) `
-            )
-                .eq(0)
-                .click();
+            cy.dataCy('Province_icon').click();
 
             cy.selectOption('[data-cy="autonomyProvince"] ', 'Autonomy one');
             cy.countSelectOptions('[data-cy="autonomyProvince"]', 2);
 
-            cy.get('[data-cy="provinceName"]').type(provinceName);
+            cy.dataCy('provinceName').type(provinceName);
             cy.dataCy('FormModelPopup_save').eq(1).click();
         });