From 21d2438c5dacc4a24839f90a09430e46e11c45ac Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Wed, 19 Feb 2025 16:15:22 +0100
Subject: [PATCH 01/18] feat: refs #8600 added calendar e2e and modified basic
data
---
src/pages/Zone/Card/ZoneBasicData.vue | 5 +-
.../Zone/Card/ZoneEventInclusionForm.vue | 11 ++--
src/pages/Zone/ZoneCalendar.vue | 1 +
src/pages/Zone/ZoneDeliveryPanel.vue | 4 +-
.../integration/zone/zoneBasicData.spec.js | 17 +------
.../integration/zone/zoneCalendar.spec.js | 51 +++++++++++++++++++
6 files changed, 67 insertions(+), 22 deletions(-)
create mode 100644 test/cypress/integration/zone/zoneCalendar.spec.js
diff --git a/src/pages/Zone/Card/ZoneBasicData.vue b/src/pages/Zone/Card/ZoneBasicData.vue
index 03013f011..85733874b 100644
--- a/src/pages/Zone/Card/ZoneBasicData.vue
+++ b/src/pages/Zone/Card/ZoneBasicData.vue
@@ -29,10 +29,10 @@ const setFilteredAddresses = (data) => {
<template #form="{ data, validate }">
<VnRow>
<VnInput
- data-cy="zone-basic-data-name"
:label="t('Name')"
clearable
v-model="data.name"
+ data-cy="ZoneBasicDataName"
:required="true"
/>
</VnRow>
@@ -75,7 +75,6 @@ const setFilteredAddresses = (data) => {
min="0"
/>
</VnRow>
-
<VnRow>
<VnInput
v-model="data.travelingDays"
@@ -86,7 +85,6 @@ const setFilteredAddresses = (data) => {
/>
<VnInputTime v-model="data.hour" :label="t('Closing')" :required="true" />
</VnRow>
-
<VnRow>
<VnInput
v-model="data.price"
@@ -95,6 +93,7 @@ const setFilteredAddresses = (data) => {
min="0"
:required="true"
clearable
+ data-cy="ZoneBasicDataPrice"
/>
<VnInput
v-model="data.priceOptimum"
diff --git a/src/pages/Zone/Card/ZoneEventInclusionForm.vue b/src/pages/Zone/Card/ZoneEventInclusionForm.vue
index 805d03b27..88f8b30e4 100644
--- a/src/pages/Zone/Card/ZoneEventInclusionForm.vue
+++ b/src/pages/Zone/Card/ZoneEventInclusionForm.vue
@@ -58,7 +58,7 @@ const arrayData = useArrayData('ZoneEvents');
const createEvent = async () => {
eventInclusionFormData.value.weekDays = weekdayStore.toSet(
- eventInclusionFormData.value.wdays
+ eventInclusionFormData.value.wdays,
);
if (inclusionType.value == 'day') eventInclusionFormData.value.weekDays = '';
@@ -74,7 +74,7 @@ const createEvent = async () => {
else
await axios.put(
`Zones/${route.params.id}/events/${props.event?.id}`,
- eventInclusionFormData.value
+ eventInclusionFormData.value,
);
await refetchEvents();
@@ -123,12 +123,14 @@ onMounted(() => {
dense
val="day"
:label="t('eventsInclusionForm.oneDay')"
+ data-cy="ZoneEventInclusionDayRadio"
/>
<QRadio
v-model="inclusionType"
dense
val="indefinitely"
:label="t('eventsInclusionForm.indefinitely')"
+ data-cy="ZoneEventInclusionIndefinitelyRadio"
/>
<QRadio
v-model="inclusionType"
@@ -136,6 +138,7 @@ onMounted(() => {
val="range"
:label="t('eventsInclusionForm.rangeOfDates')"
class="q-mb-sm"
+ data-cy="ZoneEventInclusionRangeRadio"
/>
</div>
<VnRow>
@@ -156,10 +159,12 @@ onMounted(() => {
<VnInputDate
:label="t('eventsInclusionForm.from')"
v-model="eventInclusionFormData.started"
+ data-cy="ZoneEventsFromDate"
/>
<VnInputDate
:label="t('eventsInclusionForm.to')"
v-model="eventInclusionFormData.ended"
+ data-cy="ZoneEventsToDate"
/>
</VnRow>
<VnRow>
@@ -221,7 +226,7 @@ onMounted(() => {
openConfirmationModal(
t('zone.deleteTitle'),
t('zone.deleteSubtitle'),
- () => deleteEvent()
+ () => deleteEvent(),
)
"
/>
diff --git a/src/pages/Zone/ZoneCalendar.vue b/src/pages/Zone/ZoneCalendar.vue
index c2abd15ff..7cae59698 100644
--- a/src/pages/Zone/ZoneCalendar.vue
+++ b/src/pages/Zone/ZoneCalendar.vue
@@ -185,6 +185,7 @@ const handleDateClick = (timestamp) => {
:class="{
'--today': isToday(timestamp),
}"
+ data-cy="ZoneCalendarDay"
>
<QPopupProxy v-if="isZoneDeliveryView">
<ZoneClosingTable
diff --git a/src/pages/Zone/ZoneDeliveryPanel.vue b/src/pages/Zone/ZoneDeliveryPanel.vue
index 0a535afcb..993ec274f 100644
--- a/src/pages/Zone/ZoneDeliveryPanel.vue
+++ b/src/pages/Zone/ZoneDeliveryPanel.vue
@@ -46,7 +46,7 @@ watch(
inq.value = {
deliveryMethodFk: { inq: deliveryMethods.value[deliveryMethodFk.value] },
};
- }
+ },
);
</script>
@@ -98,6 +98,7 @@ watch(
outlined
rounded
map-key="geoFk"
+ data-cy="ZoneDeliveryDaysPostcodeSelect"
>
<template #option="{ itemProps, opt }">
<QItem v-bind="itemProps">
@@ -129,6 +130,7 @@ watch(
dense
outlined
rounded
+ data-cy="ZoneDeliveryDaysAgencySelect"
/>
<VnSelect
v-else
diff --git a/test/cypress/integration/zone/zoneBasicData.spec.js b/test/cypress/integration/zone/zoneBasicData.spec.js
index 70ded3f79..50e4068d2 100644
--- a/test/cypress/integration/zone/zoneBasicData.spec.js
+++ b/test/cypress/integration/zone/zoneBasicData.spec.js
@@ -1,5 +1,5 @@
describe('ZoneBasicData', () => {
- const priceBasicData = '[data-cy="Price_input"]';
+ const priceBasicData = '[data-cy="ZoneBasicDataPrice"]';
const saveBtn = '.q-btn-group > .q-btn--standard';
beforeEach(() => {
@@ -8,26 +8,13 @@ describe('ZoneBasicData', () => {
cy.visit('/#/zone/4/basic-data');
});
- it('should throw an error if the name is empty', () => {
- cy.intercept('GET', /\/api\/Zones\/4./).as('zone');
-
- cy.wait('@zone').then(() => {
- cy.get('[data-cy="zone-basic-data-name"] input').type(
- '{selectall}{backspace}',
- );
- });
-
- cy.get(saveBtn).click();
- cy.checkNotification("can't be blank");
- });
-
it('should throw an error if the price is empty', () => {
cy.get(priceBasicData).clear();
cy.get(saveBtn).click();
cy.checkNotification('cannot be blank');
});
- it("should edit the basicData's zone", () => {
+ it("should edit the basicData's zone name", () => {
cy.get('.q-card > :nth-child(1)').type(' modified');
cy.get(saveBtn).click();
cy.checkNotification('Data saved');
diff --git a/test/cypress/integration/zone/zoneCalendar.spec.js b/test/cypress/integration/zone/zoneCalendar.spec.js
new file mode 100644
index 000000000..57df3e869
--- /dev/null
+++ b/test/cypress/integration/zone/zoneCalendar.spec.js
@@ -0,0 +1,51 @@
+describe('ZoneCalendar', () => {
+ const addEventBtn = '.q-page-sticky > div > .q-btn';
+ const submitBtn = '.q-mt-lg > .q-btn--standard';
+ const deleteBtn = '.q-item__section--side > .q-btn';
+ const from = '.q-field__control-container > [data-cy="ZoneEventsFromDate"]';
+ const to = '.q-field__control-container > [data-cy="ZoneEventsToDate"]';
+
+ beforeEach(() => {
+ cy.login('developer');
+ cy.viewport(1920, 1080);
+ cy.visit(`/#/zone/11/events`);
+ });
+
+ it('should include a one day event, then delete it', () => {
+ cy.get(addEventBtn).click();
+ cy.dataCy('ZoneEventInclusionDayRadio').click();
+ cy.get('.q-card > :nth-child(5)').type('02/04/2001');
+ cy.get(submitBtn).click();
+ cy.get(deleteBtn).click();
+ cy.dataCy('VnConfirm_confirm').click();
+ });
+
+ it('should include an indefinitely event for monday and tuesday', () => {
+ cy.get(addEventBtn).click();
+ cy.get('.flex > .q-gutter-x-sm > :nth-child(1)').click();
+ cy.get('.flex > .q-gutter-x-sm > :nth-child(2)').click();
+ cy.get(submitBtn).click();
+ cy.get(deleteBtn).click();
+ cy.dataCy('VnConfirm_confirm').click();
+ });
+
+ it('should include a range of dates event', () => {
+ cy.get(addEventBtn).click();
+ cy.dataCy('ZoneEventInclusionRangeRadio').click();
+ cy.get('.flex > .q-gutter-x-sm > :nth-child(1)').click();
+ cy.get(from).type('01/01/2001');
+ cy.get(to).type('31/01/2001');
+ cy.get(submitBtn).click();
+ cy.get(deleteBtn).click();
+ cy.dataCy('VnConfirm_confirm').click();
+ });
+
+ it('should exclude an event', () => {
+ cy.visit(`/#/zone/2/events`);
+ cy.get('.q-mb-sm > .q-radio__inner').click();
+ cy.get(
+ '.q-current-day > .q-calendar-month__day--content > [data-cy="ZoneCalendarDay"]',
+ ).click();
+ cy.get('.q-mt-lg > .q-btn--standard').click();
+ });
+});
From 7f8f527035b6c1e702e7568e4aef141b88f26f56 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Wed, 19 Feb 2025 16:24:30 +0100
Subject: [PATCH 02/18] refactor: refs #8600 modified upcomingDeliveries e2e
and created deliveryDays
---
.../integration/zone/zoneDeliveryDays.spec.js | 45 ++++++++++++++++++-
.../zone/zoneUpcomingDeliveries.spec.js | 10 ++++-
2 files changed, 52 insertions(+), 3 deletions(-)
diff --git a/test/cypress/integration/zone/zoneDeliveryDays.spec.js b/test/cypress/integration/zone/zoneDeliveryDays.spec.js
index 1e1fc8ff5..f42274d8f 100644
--- a/test/cypress/integration/zone/zoneDeliveryDays.spec.js
+++ b/test/cypress/integration/zone/zoneDeliveryDays.spec.js
@@ -1,15 +1,56 @@
describe('ZoneDeliveryDays', () => {
+ const postcode = '46680';
+ const agency = 'Gotham247Expensive';
+ const submitForm = '.q-form > .q-btn > .q-btn__content';
beforeEach(() => {
cy.login('developer');
cy.viewport(1920, 1080);
cy.visit(`/#/zone/delivery-days`);
});
- it('should query for the day', () => {
+ it('should return no data when querying without params', () => {
cy.get('.q-form > .q-btn > .q-btn__content').click();
cy.get('.q-notification__message').should(
'have.text',
- 'No service for the specified zone'
+ 'No service for the specified zone',
);
});
+
+ it('should query for delivery', () => {
+ cy.intercept('GET', /\/api\/Zones\/getEvents/).as('events');
+
+ cy.selectOption('[data-cy="ZoneDeliveryDaysPostcodeSelect"]', postcode);
+
+ cy.dataCy('ZoneDeliveryDaysPostcodeSelect').type(postcode);
+ cy.get('.q-menu .q-item').contains(postcode).click();
+ cy.get('.q-menu').then(($menu) => {
+ if ($menu.is(':visible')) {
+ cy.get('[data-cy="ZoneDeliveryDaysPostcodeSelect"]')
+ .as('focusedElement')
+ .focus();
+ cy.get('@focusedElement').blur();
+ }
+ });
+ cy.get('.q-menu').should('not.exist');
+
+ cy.dataCy('ZoneDeliveryDaysAgencySelect').type(agency);
+ cy.get('.q-menu .q-item').contains(agency).click();
+ cy.get('.q-menu').then(($menu) => {
+ if ($menu.is(':visible')) {
+ cy.get('[data-cy="ZoneDeliveryDaysAgencySelect"]')
+ .as('focusedElement')
+ .focus();
+ cy.get('@focusedElement').blur();
+ }
+ });
+ cy.get('.q-menu').should('not.exist');
+
+ cy.get(submitForm).click();
+ cy.wait('@events').then((interception) => {
+ cy.log('interception: ', interception);
+ //TODO: interceptar llamada y comprobar que el objeto de los eventos no está vacío
+ // const data = interception.response.body;
+ // expect(data.hasComponentLack).to.equal(1);
+ });
+ });
});
diff --git a/test/cypress/integration/zone/zoneUpcomingDeliveries.spec.js b/test/cypress/integration/zone/zoneUpcomingDeliveries.spec.js
index 28e2222d4..576b2ea70 100644
--- a/test/cypress/integration/zone/zoneUpcomingDeliveries.spec.js
+++ b/test/cypress/integration/zone/zoneUpcomingDeliveries.spec.js
@@ -1,9 +1,17 @@
describe('ZoneUpcomingDeliveries', () => {
+ const tableFields = (opt) =>
+ `:nth-child(1) > .q-table__container > .q-table__middle > .q-table > thead > tr > :nth-child(${opt})`;
+
beforeEach(() => {
cy.login('developer');
cy.viewport(1920, 1080);
cy.visit(`/#/zone/upcoming-deliveries`);
});
- it('should show the page', () => {});
+ it('should show the page', () => {
+ cy.get('.q-card').should('be.visible');
+ cy.get(tableFields(1)).should('be.visible').should('have.text', 'Province');
+ cy.get(tableFields(2)).should('be.visible').should('have.text', 'Closing');
+ cy.get(tableFields(3)).should('be.visible').should('have.text', 'Id');
+ });
});
From 1fcdbd4a3af918829ddfa8e81bb9a6504d567ea0 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Thu, 20 Feb 2025 09:55:15 +0100
Subject: [PATCH 03/18] feat: refs #8600 added deliveryDays and modified
warehouse E2Es
---
.../integration/zone/zoneDeliveryDays.spec.js | 17 +++++++++++------
.../integration/zone/zoneWarehouse.spec.js | 7 ++-----
2 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/test/cypress/integration/zone/zoneDeliveryDays.spec.js b/test/cypress/integration/zone/zoneDeliveryDays.spec.js
index f42274d8f..291c20ce3 100644
--- a/test/cypress/integration/zone/zoneDeliveryDays.spec.js
+++ b/test/cypress/integration/zone/zoneDeliveryDays.spec.js
@@ -17,9 +17,15 @@ describe('ZoneDeliveryDays', () => {
});
it('should query for delivery', () => {
- cy.intercept('GET', /\/api\/Zones\/getEvents/).as('events');
-
- cy.selectOption('[data-cy="ZoneDeliveryDaysPostcodeSelect"]', postcode);
+ cy.intercept('GET', /\/api\/Zones\/getEvents/, (req) => {
+ req.headers['cache-control'] = 'no-cache';
+ req.headers['pragma'] = 'no-cache';
+ req.headers['expires'] = '0';
+ req.on('response', (res) => {
+ delete res.headers['if-none-match'];
+ delete res.headers['if-modified-since'];
+ });
+ }).as('events');
cy.dataCy('ZoneDeliveryDaysPostcodeSelect').type(postcode);
cy.get('.q-menu .q-item').contains(postcode).click();
@@ -48,9 +54,8 @@ describe('ZoneDeliveryDays', () => {
cy.get(submitForm).click();
cy.wait('@events').then((interception) => {
cy.log('interception: ', interception);
- //TODO: interceptar llamada y comprobar que el objeto de los eventos no está vacío
- // const data = interception.response.body;
- // expect(data.hasComponentLack).to.equal(1);
+ const data = interception.response.body.events;
+ expect(data.length).to.be.greaterThan(0);
});
});
});
diff --git a/test/cypress/integration/zone/zoneWarehouse.spec.js b/test/cypress/integration/zone/zoneWarehouse.spec.js
index 4a100a762..d50f20145 100644
--- a/test/cypress/integration/zone/zoneWarehouse.spec.js
+++ b/test/cypress/integration/zone/zoneWarehouse.spec.js
@@ -2,8 +2,7 @@ describe('ZoneWarehouse', () => {
const data = {
Warehouse: { val: 'Warehouse One', type: 'select' },
};
-
- const dataError = 'ER_DUP_ENTRY: Duplicate entry';
+ const dataError = 'The introduced warehouse already exists';
const saveBtn = '.q-btn--standard > .q-btn__content > .block';
beforeEach(() => {
@@ -18,7 +17,7 @@ describe('ZoneWarehouse', () => {
cy.get(saveBtn).click();
cy.checkNotification(dataError);
});
-
+
it('should create & remove a warehouse', () => {
cy.addBtnClick();
cy.fillInForm(data);
@@ -26,7 +25,5 @@ describe('ZoneWarehouse', () => {
cy.get('.q-mt-lg > .q-btn--standard').click();
cy.get('tbody > :nth-child(2) > :nth-child(2) > .q-icon').click();
cy.get('[title="Confirm"]').click();
-
- cy.reload();
});
});
From c7d5db0ce8b28fcbe873a1ac58dce349d079e9fe Mon Sep 17 00:00:00 2001
From: provira <provira@verdnatura.es>
Date: Thu, 20 Feb 2025 15:01:04 +0100
Subject: [PATCH 04/18] feat: refs #8600 added new tests for zoneSummary &
zoneLocations
---
.../Zone/Card/ZoneDescriptorMenuItems.vue | 4 +-
.../cypress/integration/zone/zoneList.spec.js | 12 ++++--
.../integration/zone/zoneLocations.spec.js | 23 +++++++++++
.../integration/zone/zoneSummary.spec.js | 38 +++++++++++++++++++
4 files changed, 71 insertions(+), 6 deletions(-)
create mode 100644 test/cypress/integration/zone/zoneLocations.spec.js
create mode 100644 test/cypress/integration/zone/zoneSummary.spec.js
diff --git a/src/pages/Zone/Card/ZoneDescriptorMenuItems.vue b/src/pages/Zone/Card/ZoneDescriptorMenuItems.vue
index 3c45700cb..f8683773d 100644
--- a/src/pages/Zone/Card/ZoneDescriptorMenuItems.vue
+++ b/src/pages/Zone/Card/ZoneDescriptorMenuItems.vue
@@ -36,13 +36,13 @@ function openConfirmDialog(callback) {
}
</script>
<template>
- <QItem @click="openConfirmDialog('remove')" v-ripple clickable>
+ <QItem @click="openConfirmDialog('remove')" v-ripple clickable data-cy="Delete_button">
<QItemSection avatar>
<QIcon name="delete" />
</QItemSection>
<QItemSection>{{ t('deleteZone') }}</QItemSection>
</QItem>
- <QItem @click="openConfirmDialog('clone')" v-ripple clickable>
+ <QItem @click="openConfirmDialog('clone')" v-ripple clickable data-cy="Clone_button">
<QItemSection avatar>
<QIcon name="content_copy" />
</QItemSection>
diff --git a/test/cypress/integration/zone/zoneList.spec.js b/test/cypress/integration/zone/zoneList.spec.js
index 68e924635..a59a62e37 100644
--- a/test/cypress/integration/zone/zoneList.spec.js
+++ b/test/cypress/integration/zone/zoneList.spec.js
@@ -7,10 +7,6 @@ describe('ZoneList', () => {
});
it('should filter by agency', () => {
- cy.dataCy('zoneFilterPanelNameInput').type('{downArrow}{enter}');
- });
-
- it('should open the zone summary', () => {
cy.dataCy('zoneFilterPanelAgencySelect').type(agency);
cy.get('.q-menu .q-item').contains(agency).click();
cy.get(':nth-child(1) > [data-col-field="agencyModeFk"]').should(
@@ -18,4 +14,12 @@ describe('ZoneList', () => {
agency,
);
});
+
+ it('should open the zone summary', () => {
+ cy.dataCy('zoneFilterPanelAgencySelect').type(agency);
+ cy.get('.q-menu .q-item').contains(agency).click();
+ cy.dataCy('tableAction-0').eq(1).click();
+ cy.get('.header > .q-icon').click();
+ cy.url().should('include', 'zone/2/summary');
+ });
});
diff --git a/test/cypress/integration/zone/zoneLocations.spec.js b/test/cypress/integration/zone/zoneLocations.spec.js
new file mode 100644
index 000000000..04b7f1991
--- /dev/null
+++ b/test/cypress/integration/zone/zoneLocations.spec.js
@@ -0,0 +1,23 @@
+describe('ZoneLocations', () => {
+ const data = {
+ Warehouse: { val: 'Warehouse One', type: 'select' },
+ };
+
+ const postalCode = '[style=""] > :nth-child(1) > :nth-child(1) > :nth-child(2) > :nth-child(1) > :nth-child(1) > :nth-child(2) > :nth-child(1) > .q-tree__node--parent > .q-tree__node-collapsible > .q-tree__children'
+
+ beforeEach(() => {
+ cy.viewport(1280, 720);
+ cy.login('developer');
+ cy.visit(`/#/zone/2/location`);
+ });
+
+ it('should show all locations on entry', () => {
+ cy.get('.q-tree > :nth-child(1) > :nth-child(2) > :nth-child(1)').children().should('have.length', 9);
+ });
+
+ it('should be able to search by postal code', () => {
+ cy.get('#searchbarForm').type('46680');
+ cy.get('.router-link-active > .q-icon').click();
+ cy.get(postalCode).should('include.text', '46680')
+ });
+});
diff --git a/test/cypress/integration/zone/zoneSummary.spec.js b/test/cypress/integration/zone/zoneSummary.spec.js
new file mode 100644
index 000000000..a5e7adcfd
--- /dev/null
+++ b/test/cypress/integration/zone/zoneSummary.spec.js
@@ -0,0 +1,38 @@
+describe('ZoneSummary', () => {
+ const agency = 'inhouse pickup';
+ beforeEach(() => {
+ cy.viewport(1280, 720);
+ cy.login('developer');
+ cy.visit('/#/zone/2/summary');
+ });
+
+ it('should redirect to basic data', () =>{
+ cy.get(':nth-child(1) > .q-pb-md > .header-link > .link').click();
+ cy.url().should('include', 'zone/2/basic-data');
+
+ });
+
+ it('should redirect to basic data', () =>{
+ cy.get('.full-width > .q-pb-md > .header-link > .link').click();
+ cy.url().should('include', 'zone/2/warehouses');
+ });
+
+ it('should clone the zone', () => {
+ cy.dataCy('descriptor-more-opts').click();
+ cy.dataCy('Clone_button').click();
+ cy.dataCy('VnConfirm_confirm').click();
+ cy.url().should('not.include', 'zone/2/');
+ cy.url().should('match', /zone\/\d+\/basic-data/);
+ cy.get('.list-box > :nth-child(1)').should('include.text', agency);
+ cy.get('.title > span').should('include.text', 'Zone pickup B');
+
+ });
+
+ it('should delete the zone', () => {
+ cy.dataCy('descriptor-more-opts').click();
+ cy.dataCy('Delete_button').click();
+ cy.dataCy('VnConfirm_confirm').click();
+ cy.url().should('include', '/zone/list');
+ cy.get('.q-notification__message').should('have.text', 'Zone deleted');
+ });
+});
From f0e6db951eb554a252386f67f587ff195238cfe1 Mon Sep 17 00:00:00 2001
From: provira <provira@verdnatura.es>
Date: Thu, 20 Feb 2025 15:21:44 +0100
Subject: [PATCH 05/18] fix: refs #8600 fixed zoneList & added test case to
zoneSummary
---
test/cypress/integration/zone/zoneList.spec.js | 10 ++++++++++
test/cypress/integration/zone/zoneSummary.spec.js | 2 +-
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/test/cypress/integration/zone/zoneList.spec.js b/test/cypress/integration/zone/zoneList.spec.js
index a59a62e37..4487e83c7 100644
--- a/test/cypress/integration/zone/zoneList.spec.js
+++ b/test/cypress/integration/zone/zoneList.spec.js
@@ -22,4 +22,14 @@ describe('ZoneList', () => {
cy.get('.header > .q-icon').click();
cy.url().should('include', 'zone/2/summary');
});
+
+ it('should copy the zone', () => {
+ cy.get('.router-link-active > .q-icon').click();
+ cy.dataCy('tableAction-1').eq(1).click();
+ cy.dataCy('VnConfirm_confirm').click();
+ cy.url().should('not.include', 'zone/2/');
+ cy.url().should('match', /zone\/\d+\/basic-data/);
+ cy.get('.list-box > :nth-child(1)').should('include.text', agency);
+ cy.get('.title > span').should('include.text', 'Zone pickup B');
+ });
});
diff --git a/test/cypress/integration/zone/zoneSummary.spec.js b/test/cypress/integration/zone/zoneSummary.spec.js
index a5e7adcfd..8373bb1d4 100644
--- a/test/cypress/integration/zone/zoneSummary.spec.js
+++ b/test/cypress/integration/zone/zoneSummary.spec.js
@@ -12,7 +12,7 @@ describe('ZoneSummary', () => {
});
- it('should redirect to basic data', () =>{
+ it('should redirect to warehouses', () =>{
cy.get('.full-width > .q-pb-md > .header-link > .link').click();
cy.url().should('include', 'zone/2/warehouses');
});
From d4989f8c432184c5af640712e2ff1e436e5c0751 Mon Sep 17 00:00:00 2001
From: provira <provira@verdnatura.es>
Date: Thu, 20 Feb 2025 15:23:23 +0100
Subject: [PATCH 06/18] refactor: refs #8600 changed test case description
---
test/cypress/integration/zone/zoneList.spec.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/test/cypress/integration/zone/zoneList.spec.js b/test/cypress/integration/zone/zoneList.spec.js
index 4487e83c7..b1b0db3fc 100644
--- a/test/cypress/integration/zone/zoneList.spec.js
+++ b/test/cypress/integration/zone/zoneList.spec.js
@@ -23,7 +23,7 @@ describe('ZoneList', () => {
cy.url().should('include', 'zone/2/summary');
});
- it('should copy the zone', () => {
+ it('should clone the zone', () => {
cy.get('.router-link-active > .q-icon').click();
cy.dataCy('tableAction-1').eq(1).click();
cy.dataCy('VnConfirm_confirm').click();
From dab2ccde97a2fde82ada61be07fc0a5b54686027 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Mon, 24 Feb 2025 14:28:34 +0100
Subject: [PATCH 07/18] fix: refs #8600 fixed e2e
---
.../integration/invoiceOut/invoiceOutSummary.spec.js | 2 +-
test/cypress/integration/zone/zoneCalendar.spec.js | 9 +++++++--
test/cypress/integration/zone/zoneWarehouse.spec.js | 6 +++---
3 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/test/cypress/integration/invoiceOut/invoiceOutSummary.spec.js b/test/cypress/integration/invoiceOut/invoiceOutSummary.spec.js
index 7ebaf3ef3..333f7e2c4 100644
--- a/test/cypress/integration/invoiceOut/invoiceOutSummary.spec.js
+++ b/test/cypress/integration/invoiceOut/invoiceOutSummary.spec.js
@@ -1,5 +1,5 @@
/// <reference types="cypress" />
-describe.skip('InvoiceOut summary', () => {
+describe('InvoiceOut summary', () => {
const transferInvoice = {
Client: { val: 'employee', type: 'select' },
Type: { val: 'Error in customer data', type: 'select' },
diff --git a/test/cypress/integration/zone/zoneCalendar.spec.js b/test/cypress/integration/zone/zoneCalendar.spec.js
index 57df3e869..7c69f1ce9 100644
--- a/test/cypress/integration/zone/zoneCalendar.spec.js
+++ b/test/cypress/integration/zone/zoneCalendar.spec.js
@@ -33,8 +33,8 @@ describe('ZoneCalendar', () => {
cy.get(addEventBtn).click();
cy.dataCy('ZoneEventInclusionRangeRadio').click();
cy.get('.flex > .q-gutter-x-sm > :nth-child(1)').click();
- cy.get(from).type('01/01/2001');
- cy.get(to).type('31/01/2001');
+ cy.dataCy('From_inputDate').type('01/01/2001');
+ cy.dataCy('To_inputDate').type('31/01/2001');
cy.get(submitBtn).click();
cy.get(deleteBtn).click();
cy.dataCy('VnConfirm_confirm').click();
@@ -47,5 +47,10 @@ describe('ZoneCalendar', () => {
'.q-current-day > .q-calendar-month__day--content > [data-cy="ZoneCalendarDay"]',
).click();
cy.get('.q-mt-lg > .q-btn--standard').click();
+ cy.get(
+ '.q-current-day > .q-calendar-month__day--content > [data-cy="ZoneCalendarDay"]',
+ ).click();
+ cy.get('.q-mt-lg > :nth-child(2)').click();
+ cy.dataCy('VnConfirm_confirm').click();
});
});
diff --git a/test/cypress/integration/zone/zoneWarehouse.spec.js b/test/cypress/integration/zone/zoneWarehouse.spec.js
index d50f20145..bca5ced22 100644
--- a/test/cypress/integration/zone/zoneWarehouse.spec.js
+++ b/test/cypress/integration/zone/zoneWarehouse.spec.js
@@ -1,6 +1,6 @@
describe('ZoneWarehouse', () => {
const data = {
- Warehouse: { val: 'Warehouse One', type: 'select' },
+ Warehouse: { val: 'Warehouse Two', type: 'select' },
};
const dataError = 'The introduced warehouse already exists';
const saveBtn = '.q-btn--standard > .q-btn__content > .block';
@@ -8,12 +8,12 @@ describe('ZoneWarehouse', () => {
beforeEach(() => {
cy.viewport(1280, 720);
cy.login('developer');
- cy.visit(`/#/zone/2/warehouses`);
+ cy.visit(`/#/zone/1/warehouses`);
});
it('should throw an error if the warehouse chosen is already put in the zone', () => {
cy.addBtnClick();
- cy.dataCy('Warehouse_select').type('Warehouse Two{enter}');
+ cy.dataCy('Warehouse_select').type('Warehouse One{enter}');
cy.get(saveBtn).click();
cy.checkNotification(dataError);
});
From 42aac97c355cf70ba61cea1962c9de7ce6c6b5ff Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Mon, 24 Feb 2025 14:56:07 +0100
Subject: [PATCH 08/18] fix: refs #8600 e2e
---
test/cypress/integration/zone/zoneSummary.spec.js | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/test/cypress/integration/zone/zoneSummary.spec.js b/test/cypress/integration/zone/zoneSummary.spec.js
index 8373bb1d4..5cd49840f 100644
--- a/test/cypress/integration/zone/zoneSummary.spec.js
+++ b/test/cypress/integration/zone/zoneSummary.spec.js
@@ -6,17 +6,16 @@ describe('ZoneSummary', () => {
cy.visit('/#/zone/2/summary');
});
- it('should redirect to basic data', () =>{
+ it('should redirect to basic data', () => {
cy.get(':nth-child(1) > .q-pb-md > .header-link > .link').click();
cy.url().should('include', 'zone/2/basic-data');
-
});
- it('should redirect to warehouses', () =>{
+ it('should redirect to warehouses', () => {
cy.get('.full-width > .q-pb-md > .header-link > .link').click();
cy.url().should('include', 'zone/2/warehouses');
});
-
+
it('should clone the zone', () => {
cy.dataCy('descriptor-more-opts').click();
cy.dataCy('Clone_button').click();
@@ -25,10 +24,10 @@ describe('ZoneSummary', () => {
cy.url().should('match', /zone\/\d+\/basic-data/);
cy.get('.list-box > :nth-child(1)').should('include.text', agency);
cy.get('.title > span').should('include.text', 'Zone pickup B');
-
});
it('should delete the zone', () => {
+ cy.visit('/#/zone/7/summary');
cy.dataCy('descriptor-more-opts').click();
cy.dataCy('Delete_button').click();
cy.dataCy('VnConfirm_confirm').click();
From 581e80418206efa189d66d517eaddaa8ebc5d0b3 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Tue, 25 Feb 2025 11:23:20 +0100
Subject: [PATCH 09/18] fix: refs #8600 zone basic data e2e and skip
intermitent invoice out summary it
---
test/cypress/integration/invoiceOut/invoiceOutSummary.spec.js | 4 ++--
test/cypress/integration/zone/zoneBasicData.spec.js | 4 +---
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/test/cypress/integration/invoiceOut/invoiceOutSummary.spec.js b/test/cypress/integration/invoiceOut/invoiceOutSummary.spec.js
index 333f7e2c4..981bece16 100644
--- a/test/cypress/integration/invoiceOut/invoiceOutSummary.spec.js
+++ b/test/cypress/integration/invoiceOut/invoiceOutSummary.spec.js
@@ -33,7 +33,7 @@ describe('InvoiceOut summary', () => {
cy.get('.q-item > .q-item__label').should('include.text', '1101');
});
- it('should open the ticket list', () => {
+ xit('should open the ticket list', () => {
cy.get(toTicketList).click();
cy.get('.descriptor').should('be.visible');
cy.dataCy('vnFilterPanelChip').should('include.text', 'T1111111');
@@ -56,7 +56,7 @@ describe('InvoiceOut summary', () => {
cy.checkNotification('Notification sent');
});
- it('should send the invoice as CSV', () => {
+ xit('should send the invoice as CSV', () => {
cy.dataCy('descriptor-more-opts').click();
cy.get(selectMenuOption(3)).click();
cy.dataCy('InvoiceOutDescriptorMenuSendCsvOption').click();
diff --git a/test/cypress/integration/zone/zoneBasicData.spec.js b/test/cypress/integration/zone/zoneBasicData.spec.js
index 27e9d6541..2d255d959 100644
--- a/test/cypress/integration/zone/zoneBasicData.spec.js
+++ b/test/cypress/integration/zone/zoneBasicData.spec.js
@@ -11,14 +11,12 @@ describe('ZoneBasicData', () => {
it('should throw an error if the price is empty', () => {
cy.get(priceBasicData).clear();
cy.get(saveBtn).click();
- cy.get(saveBtn).click();
- cy.checkNotification('cannot be blank');
+ cy.get('.q-field__messages > div').should('have.text', 'Field required');
});
it("should edit the basicData's zone name", () => {
cy.get('.q-card > :nth-child(1)').type(' modified');
cy.get(saveBtn).click();
- cy.get(saveBtn).click();
cy.checkNotification('Data saved');
});
});
From aabb7ed4d4d1f494ba59f292559eea9d2cadf2aa Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Tue, 25 Feb 2025 11:56:06 +0100
Subject: [PATCH 10/18] fix: refs #8600 fixed e2e and skip client ones
---
src/pages/InvoiceOut/Card/InvoiceOutDescriptor.vue | 2 ++
.../integration/client/clientFiscalData.spec.js | 2 +-
test/cypress/integration/client/clientList.spec.js | 2 +-
.../integration/invoiceOut/invoiceOutSummary.spec.js | 12 +++++-------
.../integration/vnComponent/VnSearchBar.spec.js | 2 +-
5 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/pages/InvoiceOut/Card/InvoiceOutDescriptor.vue b/src/pages/InvoiceOut/Card/InvoiceOutDescriptor.vue
index dfaf6c109..9b5215986 100644
--- a/src/pages/InvoiceOut/Card/InvoiceOutDescriptor.vue
+++ b/src/pages/InvoiceOut/Card/InvoiceOutDescriptor.vue
@@ -70,6 +70,7 @@ function ticketFilter(invoice) {
icon="vn:client"
color="primary"
:to="{ name: 'CustomerCard', params: { id: entity.client.id } }"
+ data-cy="invoiceOutDescriptorCustomerCard"
>
<QTooltip>{{ t('invoiceOut.card.customerCard') }}</QTooltip>
</QBtn>
@@ -81,6 +82,7 @@ function ticketFilter(invoice) {
name: 'TicketList',
query: { table: ticketFilter(entity) },
}"
+ data-cy="invoiceOutDescriptorTicketList"
>
<QTooltip>{{ t('invoiceOut.card.ticketList') }}</QTooltip>
</QBtn>
diff --git a/test/cypress/integration/client/clientFiscalData.spec.js b/test/cypress/integration/client/clientFiscalData.spec.js
index d189f896a..ad19dd5d3 100644
--- a/test/cypress/integration/client/clientFiscalData.spec.js
+++ b/test/cypress/integration/client/clientFiscalData.spec.js
@@ -6,7 +6,7 @@ describe('Client fiscal data', () => {
cy.visit('#/customer/1107/fiscal-data');
cy.domContentLoad();
});
- it('Should change required value when change customer', () => {
+ xit('Should change required value when change customer', () => {
cy.get('.q-card').should('be.visible');
cy.dataCy('sageTaxTypeFk').filter('input').should('not.have.attr', 'required');
cy.get('#searchbar input').clear();
diff --git a/test/cypress/integration/client/clientList.spec.js b/test/cypress/integration/client/clientList.spec.js
index f2e3671ba..ffdd5cfcf 100644
--- a/test/cypress/integration/client/clientList.spec.js
+++ b/test/cypress/integration/client/clientList.spec.js
@@ -37,7 +37,7 @@ describe('Client list', () => {
cy.checkNotification('Data created');
cy.url().should('include', '/summary');
});
- it('Client list search client', () => {
+ xit('Client list search client', () => {
const search = 'Jessica Jones';
cy.searchByLabel('Name', search);
diff --git a/test/cypress/integration/invoiceOut/invoiceOutSummary.spec.js b/test/cypress/integration/invoiceOut/invoiceOutSummary.spec.js
index 981bece16..000ae5d1b 100644
--- a/test/cypress/integration/invoiceOut/invoiceOutSummary.spec.js
+++ b/test/cypress/integration/invoiceOut/invoiceOutSummary.spec.js
@@ -7,8 +7,6 @@ describe('InvoiceOut summary', () => {
const firstRowDescriptors = (opt) =>
`tbody > :nth-child(1) > :nth-child(${opt}) > .q-btn`;
- const toCustomerSummary = '[href="#/customer/1101"]';
- const toTicketList = '[href="#/ticket/list?table={%22refFk%22:%22T1111111%22}"]';
const selectMenuOption = (opt) => `.q-menu > .q-list > :nth-child(${opt})`;
const confirmSend = '.q-btn--unelevated';
@@ -27,14 +25,14 @@ describe('InvoiceOut summary', () => {
cy.get('.q-item > .q-item__label').should('include.text', '1101');
});
- it('should open the client summary and the ticket list', () => {
- cy.get(toCustomerSummary).click();
+ it('should open the client summary', () => {
+ cy.dataCy('invoiceOutDescriptorCustomerCard').click();
cy.get('.descriptor').should('be.visible');
cy.get('.q-item > .q-item__label').should('include.text', '1101');
});
- xit('should open the ticket list', () => {
- cy.get(toTicketList).click();
+ it('should open the ticket list', () => {
+ cy.dataCy('invoiceOutDescriptorTicketList').click();
cy.get('.descriptor').should('be.visible');
cy.dataCy('vnFilterPanelChip').should('include.text', 'T1111111');
});
@@ -56,7 +54,7 @@ describe('InvoiceOut summary', () => {
cy.checkNotification('Notification sent');
});
- xit('should send the invoice as CSV', () => {
+ it('should send the invoice as CSV', () => {
cy.dataCy('descriptor-more-opts').click();
cy.get(selectMenuOption(3)).click();
cy.dataCy('InvoiceOutDescriptorMenuSendCsvOption').click();
diff --git a/test/cypress/integration/vnComponent/VnSearchBar.spec.js b/test/cypress/integration/vnComponent/VnSearchBar.spec.js
index 11d9bbe6a..8fed23643 100644
--- a/test/cypress/integration/vnComponent/VnSearchBar.spec.js
+++ b/test/cypress/integration/vnComponent/VnSearchBar.spec.js
@@ -27,7 +27,7 @@ describe('VnSearchBar', () => {
const searchAndCheck = (searchTerm, expectedText) => {
cy.clearSearchbar();
cy.typeSearchbar(`${searchTerm}{enter}`);
- cy.get(idGap).should('have.text', expectedText);
+ cy.get(idGap).should('include.text', expectedText);
};
const checkTableLength = (expectedLength) => {
From 5c569f87c41645dae75b46a2cdb0146568717193 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Wed, 26 Feb 2025 08:10:22 +0100
Subject: [PATCH 11/18] fix: refs #8600 fixed invoiceOut summary e2e
---
test/cypress/integration/invoiceOut/invoiceOutSummary.spec.js | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/test/cypress/integration/invoiceOut/invoiceOutSummary.spec.js b/test/cypress/integration/invoiceOut/invoiceOutSummary.spec.js
index 000ae5d1b..0213ef786 100644
--- a/test/cypress/integration/invoiceOut/invoiceOutSummary.spec.js
+++ b/test/cypress/integration/invoiceOut/invoiceOutSummary.spec.js
@@ -32,8 +32,7 @@ describe('InvoiceOut summary', () => {
});
it('should open the ticket list', () => {
- cy.dataCy('invoiceOutDescriptorTicketList').click();
- cy.get('.descriptor').should('be.visible');
+ cy.get(toTicketList).click();
cy.dataCy('vnFilterPanelChip').should('include.text', 'T1111111');
});
From ed9736321e9624bdf10b94f8987032eb564c072f Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Wed, 26 Feb 2025 08:44:51 +0100
Subject: [PATCH 12/18] fix: refs #8600 fixed e2e
---
.../invoiceOut/invoiceOutMakeInvoice.spec.js | 17 ++++++++++++++---
.../invoiceOut/invoiceOutSummary.spec.js | 10 +---------
2 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/test/cypress/integration/invoiceOut/invoiceOutMakeInvoice.spec.js b/test/cypress/integration/invoiceOut/invoiceOutMakeInvoice.spec.js
index 145f492a1..ecd26f4c5 100644
--- a/test/cypress/integration/invoiceOut/invoiceOutMakeInvoice.spec.js
+++ b/test/cypress/integration/invoiceOut/invoiceOutMakeInvoice.spec.js
@@ -1,5 +1,6 @@
/// <reference types="cypress" />
describe('InvoiceOut manual invoice', () => {
+ const descriptorOptions = '[data-cy="descriptor-more-opts-menu"] > .q-list';
beforeEach(() => {
cy.viewport(1920, 1080);
cy.login('developer');
@@ -7,15 +8,25 @@ describe('InvoiceOut manual invoice', () => {
cy.get('#searchbar input').type('{enter}');
});
- it('should create an invoice from a ticket and go to that invoice', () => {
+ it('should create an invoice from a ticket and go to that invoice, then delete that invoice', () => {
cy.searchByLabel('Customer ID', '1101');
cy.get(
- '[data-q-vs-anchor=""] > :nth-child(1) > .q-checkbox > .q-checkbox__inner'
+ '[data-q-vs-anchor=""] > :nth-child(1) > .q-checkbox > .q-checkbox__inner',
).click();
cy.dataCy('ticketListMakeInvoiceBtn').click();
cy.checkNotification('Data saved');
cy.get('.q-virtual-scroll__content > :nth-child(1) > :nth-child(3)').click();
cy.get(':nth-child(8) > .value > .link').click();
- cy.get('.header > :nth-child(3) > .q-btn__content').click();
+ cy.get('[href="#/invoice-out/6/summary"] > .q-btn > .q-btn__content').click();
+ cy.dataCy('descriptor-more-opts').click();
+ cy.get(descriptorOptions)
+ .find('.q-item')
+ .its('length')
+ .then((count) => {
+ cy.log('Número de opciones:', count);
+ expect(count).to.equal(7);
+ });
+ cy.get('[data-cy="descriptor-more-opts-menu"] > .q-list > :nth-child(4)').click();
+ cy.get('[data-cy="VnConfirm_confirm"]').click();
});
});
diff --git a/test/cypress/integration/invoiceOut/invoiceOutSummary.spec.js b/test/cypress/integration/invoiceOut/invoiceOutSummary.spec.js
index 0213ef786..5114e6e3b 100644
--- a/test/cypress/integration/invoiceOut/invoiceOutSummary.spec.js
+++ b/test/cypress/integration/invoiceOut/invoiceOutSummary.spec.js
@@ -32,7 +32,7 @@ describe('InvoiceOut summary', () => {
});
it('should open the ticket list', () => {
- cy.get(toTicketList).click();
+ cy.dataCy('invoiceOutDescriptorTicketList').click();
cy.dataCy('vnFilterPanelChip').should('include.text', 'T1111111');
});
@@ -61,14 +61,6 @@ describe('InvoiceOut summary', () => {
cy.checkNotification('Notification sent');
});
- it('should delete an invoice ', () => {
- cy.typeSearchbar('T2222222{enter}');
- cy.dataCy('descriptor-more-opts').click();
- cy.get(selectMenuOption(4)).click();
- cy.dataCy('VnConfirm_confirm').click();
- cy.checkNotification('InvoiceOut deleted');
- });
-
it('should book the invoice', () => {
cy.dataCy('descriptor-more-opts').click();
cy.get(selectMenuOption(5)).click();
From 4a3bf83a367dd6a88d4ed1954218b85d0bc34f9c Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Wed, 26 Feb 2025 09:18:05 +0100
Subject: [PATCH 13/18] refactor: refs #8600 modified zoneSummary e2e
---
.../invoiceOut/invoiceOutMakeInvoice.spec.js | 15 ++-------------
.../integration/zone/zoneSummary.spec.js | 19 ++-----------------
2 files changed, 4 insertions(+), 30 deletions(-)
diff --git a/test/cypress/integration/invoiceOut/invoiceOutMakeInvoice.spec.js b/test/cypress/integration/invoiceOut/invoiceOutMakeInvoice.spec.js
index ecd26f4c5..73d26d8fc 100644
--- a/test/cypress/integration/invoiceOut/invoiceOutMakeInvoice.spec.js
+++ b/test/cypress/integration/invoiceOut/invoiceOutMakeInvoice.spec.js
@@ -1,6 +1,5 @@
/// <reference types="cypress" />
describe('InvoiceOut manual invoice', () => {
- const descriptorOptions = '[data-cy="descriptor-more-opts-menu"] > .q-list';
beforeEach(() => {
cy.viewport(1920, 1080);
cy.login('developer');
@@ -8,7 +7,7 @@ describe('InvoiceOut manual invoice', () => {
cy.get('#searchbar input').type('{enter}');
});
- it('should create an invoice from a ticket and go to that invoice, then delete that invoice', () => {
+ it('should create an invoice from a ticket and go to that invoice', () => {
cy.searchByLabel('Customer ID', '1101');
cy.get(
'[data-q-vs-anchor=""] > :nth-child(1) > .q-checkbox > .q-checkbox__inner',
@@ -17,16 +16,6 @@ describe('InvoiceOut manual invoice', () => {
cy.checkNotification('Data saved');
cy.get('.q-virtual-scroll__content > :nth-child(1) > :nth-child(3)').click();
cy.get(':nth-child(8) > .value > .link').click();
- cy.get('[href="#/invoice-out/6/summary"] > .q-btn > .q-btn__content').click();
- cy.dataCy('descriptor-more-opts').click();
- cy.get(descriptorOptions)
- .find('.q-item')
- .its('length')
- .then((count) => {
- cy.log('Número de opciones:', count);
- expect(count).to.equal(7);
- });
- cy.get('[data-cy="descriptor-more-opts-menu"] > .q-list > :nth-child(4)').click();
- cy.get('[data-cy="VnConfirm_confirm"]').click();
+ cy.get('.header > :nth-child(3) > .q-btn__content').click();
});
});
diff --git a/test/cypress/integration/zone/zoneSummary.spec.js b/test/cypress/integration/zone/zoneSummary.spec.js
index 5cd49840f..fa9c5353c 100644
--- a/test/cypress/integration/zone/zoneSummary.spec.js
+++ b/test/cypress/integration/zone/zoneSummary.spec.js
@@ -6,17 +6,7 @@ describe('ZoneSummary', () => {
cy.visit('/#/zone/2/summary');
});
- it('should redirect to basic data', () => {
- cy.get(':nth-child(1) > .q-pb-md > .header-link > .link').click();
- cy.url().should('include', 'zone/2/basic-data');
- });
-
- it('should redirect to warehouses', () => {
- cy.get('.full-width > .q-pb-md > .header-link > .link').click();
- cy.url().should('include', 'zone/2/warehouses');
- });
-
- it('should clone the zone', () => {
+ it('should clone the zone, then delete it', () => {
cy.dataCy('descriptor-more-opts').click();
cy.dataCy('Clone_button').click();
cy.dataCy('VnConfirm_confirm').click();
@@ -24,14 +14,9 @@ describe('ZoneSummary', () => {
cy.url().should('match', /zone\/\d+\/basic-data/);
cy.get('.list-box > :nth-child(1)').should('include.text', agency);
cy.get('.title > span').should('include.text', 'Zone pickup B');
- });
-
- it('should delete the zone', () => {
- cy.visit('/#/zone/7/summary');
+ cy.get('.q-page').should('exist');
cy.dataCy('descriptor-more-opts').click();
cy.dataCy('Delete_button').click();
cy.dataCy('VnConfirm_confirm').click();
- cy.url().should('include', '/zone/list');
- cy.get('.q-notification__message').should('have.text', 'Zone deleted');
});
});
From 1b3592986f8fac4fd4166e0210e51b9ae9197dd3 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Wed, 26 Feb 2025 11:55:01 +0100
Subject: [PATCH 14/18] refactor: refs #8600 modified make invoice and send
dialog e2es
---
src/components/common/SendEmailDialog.vue | 7 ++++++-
.../integration/invoiceOut/invoiceOutMakeInvoice.spec.js | 7 ++++++-
.../integration/invoiceOut/invoiceOutSummary.spec.js | 3 +++
3 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/src/components/common/SendEmailDialog.vue b/src/components/common/SendEmailDialog.vue
index d73133921..254eb9cf9 100644
--- a/src/components/common/SendEmailDialog.vue
+++ b/src/components/common/SendEmailDialog.vue
@@ -56,7 +56,12 @@ async function confirm() {
{{ t('The notification will be sent to the following address') }}
</QCardSection>
<QCardSection class="q-pt-none">
- <VnInput v-model="address" is-outlined autofocus />
+ <VnInput
+ v-model="address"
+ is-outlined
+ autofocus
+ data-cy="SendEmailNotifiactionDialogInput"
+ />
</QCardSection>
<QCardActions align="right">
<QBtn :label="t('globals.cancel')" color="primary" flat v-close-popup />
diff --git a/test/cypress/integration/invoiceOut/invoiceOutMakeInvoice.spec.js b/test/cypress/integration/invoiceOut/invoiceOutMakeInvoice.spec.js
index 73d26d8fc..4c334bce3 100644
--- a/test/cypress/integration/invoiceOut/invoiceOutMakeInvoice.spec.js
+++ b/test/cypress/integration/invoiceOut/invoiceOutMakeInvoice.spec.js
@@ -16,6 +16,11 @@ describe('InvoiceOut manual invoice', () => {
cy.checkNotification('Data saved');
cy.get('.q-virtual-scroll__content > :nth-child(1) > :nth-child(3)').click();
cy.get(':nth-child(8) > .value > .link').click();
- cy.get('.header > :nth-child(3) > .q-btn__content').click();
+ cy.get('.q-menu > .descriptor > .header').should('be.visible');
+ cy.get(
+ '.q-menu > .descriptor > .header > [data-cy="descriptor-more-opts"] > .q-btn__content',
+ ).click();
+ cy.get('[data-cy="descriptor-more-opts-menu"] > .q-list > :nth-child(4)').click();
+ cy.dataCy('VnConfirm_confirm').click();
});
});
diff --git a/test/cypress/integration/invoiceOut/invoiceOutSummary.spec.js b/test/cypress/integration/invoiceOut/invoiceOutSummary.spec.js
index 5114e6e3b..a3d4ccac0 100644
--- a/test/cypress/integration/invoiceOut/invoiceOutSummary.spec.js
+++ b/test/cypress/integration/invoiceOut/invoiceOutSummary.spec.js
@@ -33,6 +33,7 @@ describe('InvoiceOut summary', () => {
it('should open the ticket list', () => {
cy.dataCy('invoiceOutDescriptorTicketList').click();
+ cy.get('#filterPanelForm').should('be.visible');
cy.dataCy('vnFilterPanelChip').should('include.text', 'T1111111');
});
@@ -49,6 +50,7 @@ describe('InvoiceOut summary', () => {
cy.dataCy('descriptor-more-opts').click();
cy.get(selectMenuOption(3)).click();
cy.dataCy('InvoiceOutDescriptorMenuSendPdfOption').click();
+ cy.dataCy('SendEmailNotifiactionDialogInput').should('be.visible');
cy.get(confirmSend).click();
cy.checkNotification('Notification sent');
});
@@ -57,6 +59,7 @@ describe('InvoiceOut summary', () => {
cy.dataCy('descriptor-more-opts').click();
cy.get(selectMenuOption(3)).click();
cy.dataCy('InvoiceOutDescriptorMenuSendCsvOption').click();
+ cy.dataCy('SendEmailNotifiactionDialogInput').should('be.visible');
cy.get(confirmSend).click();
cy.checkNotification('Notification sent');
});
From 16531210e939e67c89e5684e2c27cd046d4f748e Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Thu, 27 Feb 2025 12:10:35 +0100
Subject: [PATCH 15/18] fix: refs #8600 fixed calendar e2e
---
test/cypress/integration/client/clientFiscalData.spec.js | 2 +-
test/cypress/integration/zone/zoneCalendar.spec.js | 6 ++----
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/test/cypress/integration/client/clientFiscalData.spec.js b/test/cypress/integration/client/clientFiscalData.spec.js
index 6d19290b5..58d2d956f 100644
--- a/test/cypress/integration/client/clientFiscalData.spec.js
+++ b/test/cypress/integration/client/clientFiscalData.spec.js
@@ -5,7 +5,7 @@ describe('Client fiscal data', () => {
cy.login('developer');
cy.visit('#/customer/1107/fiscal-data');
});
- xit('Should change required value when change customer', () => {
+ it('Should change required value when change customer', () => {
cy.get('.q-card').should('be.visible');
cy.dataCy('sageTaxTypeFk').filter('input').should('not.have.attr', 'required');
cy.get('#searchbar input').clear();
diff --git a/test/cypress/integration/zone/zoneCalendar.spec.js b/test/cypress/integration/zone/zoneCalendar.spec.js
index 7c69f1ce9..7eb27fd2a 100644
--- a/test/cypress/integration/zone/zoneCalendar.spec.js
+++ b/test/cypress/integration/zone/zoneCalendar.spec.js
@@ -41,11 +41,9 @@ describe('ZoneCalendar', () => {
});
it('should exclude an event', () => {
- cy.visit(`/#/zone/2/events`);
+ cy.visit(`/#/zone/1/events`);
cy.get('.q-mb-sm > .q-radio__inner').click();
- cy.get(
- '.q-current-day > .q-calendar-month__day--content > [data-cy="ZoneCalendarDay"]',
- ).click();
+ cy.get('.q-current-day > .q-calendar-month__day--label__wrapper').click();
cy.get('.q-mt-lg > .q-btn--standard').click();
cy.get(
'.q-current-day > .q-calendar-month__day--content > [data-cy="ZoneCalendarDay"]',
From 6cfcc2f81b1e655475cf3895caba4bb00a59bddc Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Thu, 6 Mar 2025 11:50:11 +0100
Subject: [PATCH 16/18] fix: add --init flag to Docker container for Cypress
tests
---
Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index dc5acc84e..63577dad5 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -122,7 +122,7 @@ pipeline {
sh 'docker login --username $CREDS_USR --password $CREDS_PSW $REGISTRY'
sh "docker-compose ${env.COMPOSE_PARAMS} up -d"
- image.inside("--network ${env.COMPOSE_PROJECT}_default -e CI -e TZ") {
+ image.inside("--network ${env.COMPOSE_PROJECT}_default -e CI -e TZ --init") {
sh 'sh test/cypress/cypressParallel.sh 2'
}
}
From fa239740984c7e04055bab8453fe74dcea7c2fb9 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Thu, 6 Mar 2025 11:50:38 +0100
Subject: [PATCH 17/18] fix: add --init flag to Cypress Docker container for
improved stability
---
Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 6261db6ee..18b27528b 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -121,7 +121,7 @@ pipeline {
sh "docker-compose ${env.COMPOSE_PARAMS} up -d"
def image = docker.build('lilium-dev', '-f docs/Dockerfile.dev docs')
- image.inside("--network ${env.COMPOSE_PROJECT}_default -e CI -e TZ") {
+ image.inside("--network ${env.COMPOSE_PROJECT}_default -e CI -e TZ --init") {
sh 'cypress run --browser chromium || true'
}
}
From c38fedb408a0442e86fa08539f7b994e0ee33d79 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Thu, 6 Mar 2025 11:56:15 +0100
Subject: [PATCH 18/18] fix: refs #8600 e2e
---
test/cypress/integration/invoiceOut/invoiceOutSummary.spec.js | 1 +
test/cypress/integration/zone/zoneCalendar.spec.js | 1 -
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/test/cypress/integration/invoiceOut/invoiceOutSummary.spec.js b/test/cypress/integration/invoiceOut/invoiceOutSummary.spec.js
index 015624b16..63e828f55 100644
--- a/test/cypress/integration/invoiceOut/invoiceOutSummary.spec.js
+++ b/test/cypress/integration/invoiceOut/invoiceOutSummary.spec.js
@@ -7,6 +7,7 @@ describe('InvoiceOut summary', () => {
const firstRowDescriptors = (opt) =>
`tbody > :nth-child(1) > :nth-child(${opt}) > .q-btn`;
+ const toTicketList = '[href="#/ticket/list?table={%22refFk%22:%22T1111111%22}"]';
const selectMenuOption = (opt) => `.q-menu > .q-list > :nth-child(${opt})`;
const confirmSend = '.q-btn--unelevated';
diff --git a/test/cypress/integration/zone/zoneCalendar.spec.js b/test/cypress/integration/zone/zoneCalendar.spec.js
index 7eb27fd2a..d71c29142 100644
--- a/test/cypress/integration/zone/zoneCalendar.spec.js
+++ b/test/cypress/integration/zone/zoneCalendar.spec.js
@@ -41,7 +41,6 @@ describe('ZoneCalendar', () => {
});
it('should exclude an event', () => {
- cy.visit(`/#/zone/1/events`);
cy.get('.q-mb-sm > .q-radio__inner').click();
cy.get('.q-current-day > .q-calendar-month__day--label__wrapper').click();
cy.get('.q-mt-lg > .q-btn--standard').click();