From e977467eff0a2363fd90aa4c34d430689eab434a Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 18 Oct 2023 10:18:25 +0200
Subject: [PATCH] ref #6104 refactor e2e tests

---
 src/components/common/VnSelectFilter.vue |  2 --
 test/cypress/integration/vnLog.spec.js   | 18 ++++++++++--------
 test/cypress/support/commands.js         | 10 +++++++++-
 3 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/src/components/common/VnSelectFilter.vue b/src/components/common/VnSelectFilter.vue
index fc8d5809e..ba06e3dfe 100644
--- a/src/components/common/VnSelectFilter.vue
+++ b/src/components/common/VnSelectFilter.vue
@@ -83,8 +83,6 @@ const value = computed({
         @filter="filterHandler"
         hide-selected
         fill-input
-        clearable
-        clear-icon="close"
         ref="vnSelectRef"
     >
         <template v-for="(_, slotName) in $slots" #[slotName]="slotData">
diff --git a/test/cypress/integration/vnLog.spec.js b/test/cypress/integration/vnLog.spec.js
index 784780c68..80b9d07df 100644
--- a/test/cypress/integration/vnLog.spec.js
+++ b/test/cypress/integration/vnLog.spec.js
@@ -1,23 +1,25 @@
 /// <reference types="cypress" />
 describe('VnLog', () => {
+    const chips = [
+        ':nth-child(1) > :nth-child(1) > .q-item__label > .q-chip > .q-chip__content',
+        ':nth-child(2) > :nth-child(1) > .q-item__label > .q-chip > .q-chip__content',
+    ];
     beforeEach(() => {
         cy.login('developer');
         cy.visit(`/#/claim/${1}/log`);
-        cy.get('.q-gutter-x-sm > .q-btn > .q-btn__content > .q-icon').click();
+        cy.openRightMenu();
     });
 
     it('should filter by insert actions', () => {
-        cy.get('.q-checkbox__inner').eq(0).click();
+        cy.checkOption(':nth-child(7) > .q-checkbox');
         cy.get('.q-page').click();
-        cy.get('.model-info .q-chip__content').eq(0).should('have.text', 'Document');
-        cy.get('.model-info .q-chip__content').eq(1).should('have.text', 'Beginning');
+        cy.validateContent(chips[0], 'Document');
+        cy.validateContent(chips[1], 'Beginning');
     });
 
     it('should filter by entity', () => {
-        cy.get('.q-scrollarea .q-list .q-item .q-select').eq(0).click();
-        cy.get('.q-scrollarea .q-list .q-item .q-select').eq(0).type('cla');
-        cy.get('.q-virtual-scroll__content .q-item').eq(0).click();
+        cy.selectOption('.q-drawer--right .q-item > .q-select', 'Claim');
         cy.get('.q-page').click();
-        cy.get('.model-info .q-chip__content').eq(0).should('have.text', 'Claim');
+        cy.validateContent(chips[0], 'Claim');
     });
 });
diff --git a/test/cypress/support/commands.js b/test/cypress/support/commands.js
index 0f7fa0991..04282f5f8 100755
--- a/test/cypress/support/commands.js
+++ b/test/cypress/support/commands.js
@@ -70,7 +70,7 @@ Cypress.Commands.add('selectOption', (selector, option) => {
 });
 
 Cypress.Commands.add('checkOption', (selector) => {
-    cy.wrap(selector).find('.q-checkbox__inner').click();
+    cy.get(selector).find('.q-checkbox__inner').click();
 });
 
 // Global buttons
@@ -130,4 +130,12 @@ Cypress.Commands.add('validateRow', (rowSelector, expectedValues) => {
 Cypress.Commands.add('openListSummary', (row) => {
     cy.get('.card-list-body .actions .q-btn:nth-child(2)').eq(row).click();
 });
+
+Cypress.Commands.add('openRightMenu', () => {
+    cy.get('.q-gutter-x-sm > .q-btn > .q-btn__content > .q-icon').click();
+});
+
+Cypress.Commands.add('validateContent', (selector, expectedValue) => {
+    cy.get(selector).should('have.text', expectedValue);
+});
 // registerCommands();