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

Merge pull request 'fixed problems in two spec files' (#954) from unit_test_fixes into dev
gitea/salix/pipeline/head This commit looks good Details 

Reviewed-on: #954
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
This commit is contained in:
Joan Sanchez 2022-04-29 10:02:22 +00:00
parent c58272fefc b2f930911f
commit 57b75dc10e
3 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/client/back/methods/client/specs/updateAddress.spec.js
View File

@ -33,7 +33,6 @@ describe('Address updateAddress', () => {
error = e;
}
expect(error).toBeDefined();
expect(error.message).toEqual('Incoterms is required for a non UEE member');
});
@ -57,7 +56,6 @@ describe('Address updateAddress', () => {
error = e;
}
expect(error).toBeDefined();
expect(error.message).toEqual('Customs agent is required for a non UEE member');
});
@ -91,6 +89,8 @@ describe('Address updateAddress', () => {
it('should return an error for a user without enough privileges', async() => {
const tx = await models.Client.beginTransaction({});
let error;
try {
const options = {transaction: tx};
ctx.args = {
@ -124,8 +124,10 @@ describe('Address updateAddress', () => {
expect(address.isLogifloraAllowed).toEqual(true);
await tx.rollback();
ctx.req.accessToken.userId = employeeId;
} catch (e) {
await tx.rollback();
ctx.req.accessToken.userId = employeeId;
throw e;
}
});

3
modules/client/back/methods/client/updateAddress.js
View File

@ -89,11 +89,12 @@ module.exports = function(Self) {
const args = ctx.args;
const userId = ctx.req.accessToken.userId;
const myOptions = {};
const isSalesAssistant = await models.Account.hasRole(userId, 'salesAssistant', myOptions);
if (typeof options == 'object')
Object.assign(myOptions, options);
const isSalesAssistant = await models.Account.hasRole(userId, 'salesAssistant', myOptions);
if (args.isLogifloraAllowed && !isSalesAssistant)
throw new UserError(`You don't have enough privileges`);

24
modules/item/back/methods/item/specs/lastEntriesFilter.spec.js
View File

@ -1,12 +1,11 @@
const models = require('vn-loopback/server/server').models;
const {models} = require('vn-loopback/server/server');
describe('item lastEntriesFilter()', () => {
const minDate = new Date(value);
minHour.setHours(0, 0, 0, 0);
const maxDate = new Date(value);
maxHour.setHours(23, 59, 59, 59);
it('should return one entry for the given item', async() => {
const minDate = new Date();
minDate.setHours(0, 0, 0, 0);
const maxDate = new Date();
maxDate.setHours(23, 59, 59, 59);
it('should return one entry for a given item', async() => {
const tx = await models.Item.beginTransaction({});
const options = {transaction: tx};
@ -23,13 +22,18 @@ describe('item lastEntriesFilter()', () => {
}
});
it('should return five entries for a given item', async() => {
it('should return five entries for the given item', async() => {
const minDate = new Date();
minDate.setHours(0, 0, 0, 0);
minDate.setMonth(minDate.getMonth() - 2, 1);
const maxDate = new Date();
maxDate.setHours(23, 59, 59, 59);
const tx = await models.Item.beginTransaction({});
const options = {transaction: tx};
try {
minDate.setMonth(minDate.getMonth() - 2, 1);
const filter = {where: {itemFk: 1, landed: {between: [minDate, maxDate]}}};
const result = await models.Item.lastEntriesFilter(filter, options);