verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 57 Releases Wiki Activity

Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details

This commit is contained in:
Alex Moreno 2023-10-05 07:27:35 +02:00
parent 83d1e5cb74 3ec598f3f6
commit ca86b3cc2f
8 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
db/dump/fixtures.sql
View File

@ -1409,10 +1409,8 @@ INSERT INTO `cache`.`cache_calc`(`id`, `cache_id`, `cacheName`, `params`, `last_
INSERT INTO `vn`.`ticketWeekly`(`ticketFk`, `weekDay`)
VALUES
(1, 0),
(2, 1),
(3, 2),
(4, 4),
(5, 6),
(15, 6);

3
e2e/helpers/selectors.js
View File

@ -520,8 +520,7 @@ export default {
searchResultDate: 'vn-ticket-summary [label=Landed] span',
topbarSearch: 'vn-searchbar',
moreMenu: 'vn-ticket-index vn-icon-button[icon=more_vert]',
fourthWeeklyTicket: 'vn-ticket-weekly-index vn-card smart-table slot-table tr:nth-child(5)',
fiveWeeklyTicket: 'vn-ticket-weekly-index vn-card smart-table slot-table tr:nth-child(6)',
thirdWeeklyTicket: 'vn-ticket-weekly-index vn-card smart-table slot-table tr:nth-child(4)',
weeklyTicket: 'vn-ticket-weekly-index vn-card smart-table slot-table table tbody tr',
firstWeeklyTicketDeleteIcon: 'vn-ticket-weekly-index vn-card smart-table slot-table tr:nth-child(2) vn-icon-button[icon="delete"]',
firstWeeklyTicketAgency: 'vn-ticket-weekly-index vn-card smart-table slot-table tr:nth-child(2) [ng-model="weekly.agencyModeFk"]',

10
e2e/paths/05-ticket/09_weekly.spec.js
View File

@ -19,7 +19,7 @@ describe('Ticket descriptor path', () => {
it('should count the amount of tickets in the turns section', async() => {
const result = await page.countElement(selectors.ticketsIndex.weeklyTicket);
expect(result).toEqual(7);
expect(result).toEqual(5);
});
it('should go back to the ticket index then search and access a ticket summary', async() => {
@ -45,7 +45,7 @@ describe('Ticket descriptor path', () => {
it('should confirm the ticket 11 was added to thursday', async() => {
await page.accessToSection('ticket.weekly.index');
const result = await page.waitToGetProperty(selectors.ticketsIndex.fourthWeeklyTicket, 'value');
const result = await page.waitToGetProperty(selectors.ticketsIndex.thirdWeeklyTicket, 'value');
expect(result).toEqual('Thursday');
});
@ -80,7 +80,9 @@ describe('Ticket descriptor path', () => {
it('should confirm the ticket 11 was added on saturday', async() => {
await page.accessToSection('ticket.weekly.index');
const result = await page.waitToGetProperty(selectors.ticketsIndex.fiveWeeklyTicket, 'value');
await page.waitForTimeout(5000);
const result = await page.waitToGetProperty(selectors.ticketsIndex.thirdWeeklyTicket, 'value');
expect(result).toEqual('Saturday');
});
@ -104,7 +106,7 @@ describe('Ticket descriptor path', () => {
await page.doSearch();
const nResults = await page.countElement(selectors.ticketsIndex.searchWeeklyResult);
expect(nResults).toEqual(7);
expect(nResults).toEqual(5);
});
it('should update the agency then remove it afterwards', async() => {

4
modules/client/back/methods/client/creditRequestEmail.js
View File

@ -1,5 +1,5 @@
module.exports = Self => {
Self.remoteMethodCtx('clientCreditEmail', {
Self.remoteMethodCtx('creditRequestEmail', {
description: 'Sends the credit request email with an attached PDF',
accessType: 'WRITE',
accepts: [
@ -40,5 +40,5 @@ module.exports = Self => {
},
});
Self.clientCreditEmail = ctx => Self.sendTemplate(ctx, 'credit-request');
Self.creditRequestEmail = ctx => Self.sendTemplate(ctx, 'credit-request');
};

10
modules/ticket/back/methods/ticket-request/specs/filter.spec.js
View File

@ -14,7 +14,7 @@ describe('ticket-request filter()', () => {
const result = await models.TicketRequest.filter(ctx, options);
expect(result.length).toEqual(3);
expect(result.length).toEqual(5);
await tx.rollback();
} catch (e) {
@ -93,7 +93,7 @@ describe('ticket-request filter()', () => {
const result = await models.TicketRequest.filter(ctx, options);
const requestId = result[0].id;
expect(requestId).toEqual(3);
expect(requestId).toEqual(1);
await tx.rollback();
} catch (e) {
@ -113,7 +113,7 @@ describe('ticket-request filter()', () => {
const result = await models.TicketRequest.filter(ctx, options);
const requestId = result[0].id;
expect(requestId).toEqual(3);
expect(requestId).toEqual(1);
await tx.rollback();
} catch (e) {
@ -153,7 +153,7 @@ describe('ticket-request filter()', () => {
const result = await models.TicketRequest.filter(ctx, {order: 'id'}, options);
const requestId = result[0].id;
expect(requestId).toEqual(3);
expect(requestId).toEqual(1);
await tx.rollback();
} catch (e) {
@ -173,7 +173,7 @@ describe('ticket-request filter()', () => {
const result = await models.TicketRequest.filter(ctx, options);
const requestId = result[0].id;
expect(requestId).toEqual(3);
expect(requestId).toEqual(1);
await tx.rollback();
} catch (e) {

14
modules/ticket/back/methods/ticket-weekly/specs/filter.spec.js
View File

@ -16,8 +16,8 @@ describe('ticket-weekly filter()', () => {
const firstRow = result[0];
expect(firstRow.ticketFk).toEqual(1);
expect(result.length).toEqual(6);
expect(firstRow.ticketFk).toEqual(2);
expect(result.length).toEqual(4);
await tx.rollback();
} catch (e) {
@ -52,12 +52,12 @@ describe('ticket-weekly filter()', () => {
try {
const options = {transaction: tx};
const ctx = {req: {accessToken: {userId: authUserId}}, args: {search: 'bruce'}};
const ctx = {req: {accessToken: {userId: authUserId}}, args: {search: 'max'}};
const result = await models.TicketWeekly.filter(ctx, null, options);
const firstRow = result[0];
expect(firstRow.clientName).toEqual('Bruce Wayne');
expect(firstRow.clientName).toEqual('Max Eisenhardt');
await tx.rollback();
} catch (e) {
@ -72,13 +72,13 @@ describe('ticket-weekly filter()', () => {
try {
const options = {transaction: tx};
const ctx = {req: {accessToken: {userId: authUserId}}, args: {search: 1101}};
const ctx = {req: {accessToken: {userId: authUserId}}, args: {search: 1105}};
const result = await models.TicketWeekly.filter(ctx, null, options);
const firstRow = result[0];
expect(firstRow.clientFk).toEqual(1101);
expect(firstRow.clientName).toEqual('Bruce Wayne');
expect(firstRow.clientFk).toEqual(1105);
expect(firstRow.clientName).toEqual('Max Eisenhardt');
await tx.rollback();
} catch (e) {

2
modules/ticket/back/methods/ticket/isEditableOrThrow.js
View File

@ -40,7 +40,7 @@ module.exports = Self => {
if (!isEditable && !isRoleAdvanced)
throw new ForbiddenError(`This ticket is not editable.`);
if (isLocked)
if (isLocked && !isWeekly)
throw new ForbiddenError(`This ticket is locked.`);
if (isWeekly && !canEditWeeklyTicket)

2
modules/ticket/back/methods/ticket/specs/isEditable.spec.js
View File

@ -8,7 +8,7 @@ describe('isEditable()', () => {
try {
const options = {transaction: tx};
const ctx = {req: {accessToken: {userId: 35}}};
result = await models.Ticket.isEditable(ctx, 5, options);
result = await models.Ticket.isEditable(ctx, 19, options);
await tx.rollback();
} catch (error) {
await tx.rollback();