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

Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2580-fetched_tags_refactor
gitea/salix/pipeline/head This commit looks good Details

This commit is contained in:
Carlos Jimenez Ruiz 2021-01-28 15:10:54 +01:00
parent 5c466e1163 7b85b968f2
commit 4ab42e5850
4 changed files with 1353 additions and 1195 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
db/changes/10280-valentineDay/delete.keep Normal file
View File

26
db/dump/dumpedFixtures.sql
View File

File diff suppressed because one or more lines are too long

2515
db/dump/structure.sql
View File

File diff suppressed because it is too large Load Diff

7
modules/route/back/methods/route/specs/updateVolume.spec.js
View File

@ -1,8 +1,7 @@
const app = require('vn-loopback/server/server'); const app = require('vn-loopback/server/server');
const LoopBackContext = require('loopback-context'); const LoopBackContext = require('loopback-context');
// #2735 route updateVolume() returns inconsistent values describe('route updateVolume()', () => {
xdescribe('route updateVolume()', () => {
const routeId = 1; const routeId = 1;
const userId = 50; const userId = 50;
const activeCtx = { const activeCtx = {
@ -19,7 +18,6 @@ xdescribe('route updateVolume()', () => {
expect(route.m3).toEqual(1.8); expect(route.m3).toEqual(1.8);
const ticket = await app.models.Ticket.findById(14); const ticket = await app.models.Ticket.findById(14);
await ticket.updateAttributes({routeFk: routeId}); await ticket.updateAttributes({routeFk: routeId});
await app.models.Route.updateVolume(ctx, routeId); await app.models.Route.updateVolume(ctx, routeId);
@ -30,7 +28,8 @@ xdescribe('route updateVolume()', () => {
const logs = await app.models.RouteLog.find({fields: ['id', 'newInstance']}); const logs = await app.models.RouteLog.find({fields: ['id', 'newInstance']});
const m3Log = logs.filter(log => { const m3Log = logs.filter(log => {
return log.newInstance.m3 === updatedRoute.m3; if (log.newInstance)
return log.newInstance.m3 === updatedRoute.m3;
}); });
const logIdToDestroy = m3Log[0].id; const logIdToDestroy = m3Log[0].id;