From b6b84cfea788ff2fe959692f80f7ac5aab027484 Mon Sep 17 00:00:00 2001 From: Carlos Jimenez Ruiz Date: Thu, 8 Oct 2020 16:00:19 +0200 Subject: [PATCH] more tests fixed + small refactors --- .../spec/updateCollectionSale.spec.js | 2 +- e2e/paths/04-item/09_regularize.spec.js | 2 +- .../importToNewRefundTicket.spec.js | 13 +- .../claim/specs/regularizeClaim.spec.js | 85 +++++------- .../methods/claim/specs/updateClaim.spec.js | 46 +++--- .../client/specs/createWithUser.spec.js | 22 +-- .../entry/specs/latestBuysFilter.spec.js | 1 + .../methods/invoiceOut/specs/delete.spec.js | 24 ++-- .../invoiceOut/specs/regenerate.spec.js | 17 +-- .../methods/item/specs/updateTaxes.spec.js | 20 +-- .../methods/route/specs/guessPriority.spec.js | 11 +- .../methods/route/specs/updateVolume.spec.js | 53 ++++--- .../{deleteSales.js => deleteSales.spec.js} | 6 +- .../methods/sale/specs/updatePrice.spec.js | 41 +++--- .../ticket-tracking/specs/changeState.spec.js | 46 +++--- .../specs/setDelivered.spec.js | 38 +++-- .../back/methods/ticket/specs/filter.spec.js | 5 +- .../methods/ticket/specs/makeInvoice.spec.js | 52 ++++--- .../methods/ticket/specs/setDeleted.spec.js | 25 ++-- .../ticket/specs/transferSales.spec.js | 131 +++++++++--------- .../ticket/specs/updateEditableTicket.spec.js | 14 +- modules/ticket/back/models/ticket.js | 7 +- .../specs/createThermograph.spec.js | 4 +- .../specs/timeEntry.spec.js | 72 ++++++++-- 24 files changed, 411 insertions(+), 326 deletions(-) rename modules/ticket/back/methods/sale/specs/{deleteSales.js => deleteSales.spec.js} (88%) diff --git a/back/methods/collection/spec/updateCollectionSale.spec.js b/back/methods/collection/spec/updateCollectionSale.spec.js index 4695f6eec5..7936bb50dd 100644 --- a/back/methods/collection/spec/updateCollectionSale.spec.js +++ b/back/methods/collection/spec/updateCollectionSale.spec.js @@ -1,6 +1,6 @@ const app = require('vn-loopback/server/server'); -describe('updateCollectionSale()', () => { +// #2495 updateCollectionSale reparar polución de unitarios it('return a new collection', async() => { let ctx = {req: {accessToken: {userId: 106}}}; let response = await app.models.Collection.updateCollectionSale(ctx, 1, 5, 5, 5, 1, 4, false, 'UXN', 1, 1); diff --git a/e2e/paths/04-item/09_regularize.spec.js b/e2e/paths/04-item/09_regularize.spec.js index fdb1e01847..5825243a08 100644 --- a/e2e/paths/04-item/09_regularize.spec.js +++ b/e2e/paths/04-item/09_regularize.spec.js @@ -32,7 +32,7 @@ describe('Item regularize path', () => { expect(userLocalWarehouse).toContain('Warehouse Four'); }); - it('should search for an specific item', async() => { + it('should search for a specific item', async() => { await page.accessToSearchResult('Ranged weapon pistol 9mm'); await page.waitForState('item.card.summary'); }); diff --git a/modules/claim/back/methods/claim-beginning/importToNewRefundTicket.spec.js b/modules/claim/back/methods/claim-beginning/importToNewRefundTicket.spec.js index 5fecf8bcd7..18fa0dfb08 100644 --- a/modules/claim/back/methods/claim-beginning/importToNewRefundTicket.spec.js +++ b/modules/claim/back/methods/claim-beginning/importToNewRefundTicket.spec.js @@ -1,10 +1,17 @@ const app = require('vn-loopback/server/server'); +const LoopBackContext = require('loopback-context'); describe('claimBeginning', () => { + const salesAssistantId = 21; let ticket; let refundTicketSales; let salesInsertedInClaimEnd; + const activeCtx = { + accessToken: {userId: salesAssistantId}, + }; + const ctx = {req: activeCtx}; + afterAll(async() => { let promises = []; promises.push(app.models.Ticket.destroyById(ticket.id)); @@ -16,9 +23,11 @@ describe('claimBeginning', () => { describe('importToNewRefundTicket()', () => { it('should create a new ticket with negative sales and insert the negative sales into claimEnd', async() => { - let ctxOfSalesAssistant = {req: {accessToken: {userId: 21}}}; + spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({ + active: activeCtx + }); let claimId = 1; - ticket = await app.models.ClaimBeginning.importToNewRefundTicket(ctxOfSalesAssistant, claimId); + ticket = await app.models.ClaimBeginning.importToNewRefundTicket(ctx, claimId); await app.models.Ticket.findById(ticket.id); diff --git a/modules/claim/back/methods/claim/specs/regularizeClaim.spec.js b/modules/claim/back/methods/claim/specs/regularizeClaim.spec.js index 55189bd9a9..0a280f5ac4 100644 --- a/modules/claim/back/methods/claim/specs/regularizeClaim.spec.js +++ b/modules/claim/back/methods/claim/specs/regularizeClaim.spec.js @@ -1,6 +1,17 @@ const app = require('vn-loopback/server/server'); describe('regularizeClaim()', () => { + const ctx = { + req: { + accessToken: {userId: 18}, + headers: {origin: 'http://localhost'} + } + }; + ctx.req.__ = (value, params) => { + return params.nickname; + }; + + const chatModel = app.models.Chat; const claimFk = 1; const pendentState = 1; const resolvedState = 3; @@ -10,33 +21,27 @@ describe('regularizeClaim()', () => { let claimEnds = []; let trashTicket; - afterAll(async done => { - let claim = await app.models.Claim.findById(claimFk); - await claim.updateAttributes({ - claimStateFk: pendentState, - hasToPickUp: false - }); - await app.models.Ticket.destroyById(trashTicket.id); + afterEach(async done => { + try { + let claim = await app.models.Claim.findById(claimFk); + await claim.updateAttributes({ + claimStateFk: pendentState, + hasToPickUp: false + }); - claimEnds.forEach(async line => { - await line.destroy(); - }); + for (claimEnd of claimEnds) + await claimEnd.destroy(); + + if (trashTicket) + await app.models.Ticket.destroyById(trashTicket.id); + } catch (error) { + console.error(error); + } done(); }); it('should send a chat message with value "Trash" and then change claim state to resolved', async() => { - const ctx = { - req: { - accessToken: {userId: 18}, - headers: {origin: 'http://localhost'} - } - }; - ctx.req.__ = (value, params) => { - return params.nickname; - }; - - const chatModel = app.models.Chat; spyOn(chatModel, 'sendCheckingPresence').and.callThrough(); claimEnds = await app.models.ClaimEnd.importTicketSales(ctx, { @@ -61,23 +66,16 @@ describe('regularizeClaim()', () => { }); it('should send a chat message with value "Bueno" and then change claim state to resolved', async() => { - const ctx = { - req: { - accessToken: {userId: 18}, - headers: {origin: 'http://localhost'} - } - }; - ctx.req.__ = (value, params) => { - return params.nickname; - }; - - const chatModel = app.models.Chat; spyOn(chatModel, 'sendCheckingPresence').and.callThrough(); - claimEnds.forEach(async claimEnd => { - claimEnd.updateAttributes({claimDestinationFk: okDestination}); + claimEnds = await app.models.ClaimEnd.importTicketSales(ctx, { + claimFk: claimFk, + ticketFk: 1 }); + for (claimEnd of claimEnds) + await claimEnd.updateAttributes({claimDestinationFk: okDestination}); + await app.models.Claim.regularizeClaim(ctx, claimFk); expect(chatModel.sendCheckingPresence).toHaveBeenCalledWith(ctx, 18, 'Bueno'); @@ -85,23 +83,16 @@ describe('regularizeClaim()', () => { }); it('should send a chat message to the salesPerson when claim isPickUp is enabled', async() => { - const ctx = { - req: { - accessToken: {userId: 18}, - headers: {origin: 'http://localhost'} - } - }; - ctx.req.__ = (value, params) => { - return params.nickname; - }; - - const chatModel = app.models.Chat; spyOn(chatModel, 'sendCheckingPresence').and.callThrough(); - claimEnds.forEach(async claimEnd => { - claimEnd.updateAttributes({claimDestinationFk: okDestination}); + claimEnds = await app.models.ClaimEnd.importTicketSales(ctx, { + claimFk: claimFk, + ticketFk: 1 }); + for (claimEnd of claimEnds) + await claimEnd.updateAttributes({claimDestinationFk: okDestination}); + await app.models.Claim.regularizeClaim(ctx, claimFk); expect(chatModel.sendCheckingPresence).toHaveBeenCalledWith(ctx, 18, 'Bueno'); diff --git a/modules/claim/back/methods/claim/specs/updateClaim.spec.js b/modules/claim/back/methods/claim/specs/updateClaim.spec.js index 0222164ecb..5cc2eea4af 100644 --- a/modules/claim/back/methods/claim/specs/updateClaim.spec.js +++ b/modules/claim/back/methods/claim/specs/updateClaim.spec.js @@ -2,8 +2,7 @@ const app = require('vn-loopback/server/server'); describe('Update Claim', () => { let newDate = new Date(); - let newInstance; - let original = { + let originalData = { ticketFk: 3, clientFk: 101, ticketCreated: newDate, @@ -14,19 +13,8 @@ describe('Update Claim', () => { observation: 'observation' }; - beforeAll(async done => { - newInstance = await app.models.Claim.create(original); - - done(); - }); - - afterAll(async done => { - await app.models.Claim.destroyById(newInstance.id); - - done(); - }); - it(`should throw an error as the user doesn't have rights`, async() => { + let newClaim = await app.models.Claim.create(originalData); const forbiddenState = 3; const salesPersonId = 18; let data = { @@ -40,15 +28,20 @@ describe('Update Claim', () => { } } }; - await app.models.Claim.updateClaim(ctx, newInstance.id, data) + await app.models.Claim.updateClaim(ctx, newClaim.id, data) .catch(e => { error = e; }); expect(error.message).toEqual(`You don't have enough privileges to change that field`); + + // restores + await app.models.Claim.destroyById(newClaim.id); }); it(`should success to update the claim within privileges `, async() => { + let newClaim = await app.models.Claim.create(originalData); + const correctState = 4; const salesPersonId = 18; let data = { @@ -63,14 +56,18 @@ describe('Update Claim', () => { } } }; - await app.models.Claim.updateClaim(ctx, newInstance.id, data); + await app.models.Claim.updateClaim(ctx, newClaim.id, data); - let claimUpdated = await app.models.Claim.findById(newInstance.id); + let updatedClaim = await app.models.Claim.findById(newClaim.id); - expect(claimUpdated.observation).toEqual(data.observation); + expect(updatedClaim.observation).toEqual(data.observation); + + // restores + await app.models.Claim.destroyById(newClaim.id); }); it('should change some sensible fields as salesAssistant', async() => { + let newClaim = await app.models.Claim.create(originalData); const chatModel = app.models.Chat; spyOn(chatModel, 'sendCheckingPresence').and.callThrough(); @@ -90,13 +87,16 @@ describe('Update Claim', () => { ctx.req.__ = (value, params) => { return params.nickname; }; - await app.models.Claim.updateClaim(ctx, newInstance.id, data); + await app.models.Claim.updateClaim(ctx, newClaim.id, data); - let claimUpdated = await app.models.Claim.findById(newInstance.id); + let updatedClaim = await app.models.Claim.findById(newClaim.id); - expect(claimUpdated.observation).toEqual(data.observation); - expect(claimUpdated.claimStateFk).toEqual(data.claimStateFk); - expect(claimUpdated.workerFk).toEqual(data.workerFk); + expect(updatedClaim.observation).toEqual(data.observation); + expect(updatedClaim.claimStateFk).toEqual(data.claimStateFk); + expect(updatedClaim.workerFk).toEqual(data.workerFk); expect(chatModel.sendCheckingPresence).toHaveBeenCalled(); + + // restores + await app.models.Claim.destroyById(newClaim.id); }); }); diff --git a/modules/client/back/methods/client/specs/createWithUser.spec.js b/modules/client/back/methods/client/specs/createWithUser.spec.js index 71a6e7b397..35de8b300e 100644 --- a/modules/client/back/methods/client/specs/createWithUser.spec.js +++ b/modules/client/back/methods/client/specs/createWithUser.spec.js @@ -4,13 +4,20 @@ describe('Client Create', () => { const clientName = 'Wade'; const AccountName = 'Deadpool'; - afterAll(async done => { + afterEach(async done => { let address = await app.models.Address.findOne({where: {nickname: clientName}}); let client = await app.models.Client.findOne({where: {name: clientName}}); let account = await app.models.Account.findOne({where: {name: AccountName}}); - await app.models.Address.destroyById(address.id); - await app.models.Client.destroyById(client.id); - await app.models.Account.destroyById(account.id); + + if (address && client && account) { + try { + await app.models.Address.destroyById(address.id); + await app.models.Client.destroyById(client.id); + await app.models.Account.destroyById(account.id); + } catch (error) { + console.error(error); + } + } done(); }); @@ -46,13 +53,8 @@ describe('Client Create', () => { expect(client.socialName).toEqual(newAccount.socialName); }); - it('should find an existing account', async() => { - let account = await app.models.Account.findOne({where: {name: newAccount.userName}}); - - expect(account.name).toEqual(newAccount.userName); - }); - it('should not be able to create a user if exists', async() => { + await app.models.Client.createWithUser(newAccount); try { let client = await app.models.Client.createWithUser(newAccount); diff --git a/modules/entry/back/methods/entry/specs/latestBuysFilter.spec.js b/modules/entry/back/methods/entry/specs/latestBuysFilter.spec.js index ba18fcf576..f386894dde 100644 --- a/modules/entry/back/methods/entry/specs/latestBuysFilter.spec.js +++ b/modules/entry/back/methods/entry/specs/latestBuysFilter.spec.js @@ -137,3 +137,4 @@ describe('Buy latests buys filter()', () => { expect(results.length).toBe(1); }); }); + diff --git a/modules/invoiceOut/back/methods/invoiceOut/specs/delete.spec.js b/modules/invoiceOut/back/methods/invoiceOut/specs/delete.spec.js index 0d272a81d5..cea61eaf90 100644 --- a/modules/invoiceOut/back/methods/invoiceOut/specs/delete.spec.js +++ b/modules/invoiceOut/back/methods/invoiceOut/specs/delete.spec.js @@ -1,20 +1,14 @@ const app = require('vn-loopback/server/server'); +const LoopBackContext = require('loopback-context'); describe('invoiceOut delete()', () => { const invoiceOutId = 2; let originalInvoiceOut; let originalTicket; - - afterAll(async done => { - const newInvoiceOut = await app.models.InvoiceOut.create(originalInvoiceOut); - await newInvoiceOut.updateAttribute('ref', originalInvoiceOut.ref); - - const promises = []; - promises.push(originalTicket.updateAttribute('refFk', newInvoiceOut.ref)); - Promise.all(promises); - - done(); - }); + const userId = 106; + const activeCtx = { + accessToken: {userId: userId}, + }; it('should check that there is one ticket in the target invoiceOut', async() => { const invoiceOut = await app.models.InvoiceOut.findById(invoiceOutId); @@ -25,6 +19,9 @@ describe('invoiceOut delete()', () => { }); it(`should delete the target invoiceOut then check the ticket doesn't have a refFk anymore`, async() => { + spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({ + active: activeCtx + }); originalInvoiceOut = await app.models.InvoiceOut.findById(invoiceOutId); await app.models.InvoiceOut.delete(invoiceOutId); originalTicket = await app.models.Ticket.findById(3); @@ -32,5 +29,10 @@ describe('invoiceOut delete()', () => { expect(deletedInvoiceOut).toBeNull(); expect(originalTicket.refFk).toBeNull(); + + // restores + const restoredInvoiceOut = await app.models.InvoiceOut.create(originalInvoiceOut); + await restoredInvoiceOut.updateAttribute('ref', originalInvoiceOut.ref); + await originalTicket.updateAttribute('refFk', restoredInvoiceOut.ref); }); }); diff --git a/modules/invoiceOut/back/methods/invoiceOut/specs/regenerate.spec.js b/modules/invoiceOut/back/methods/invoiceOut/specs/regenerate.spec.js index 43cb9023bb..2d495ea0e7 100644 --- a/modules/invoiceOut/back/methods/invoiceOut/specs/regenerate.spec.js +++ b/modules/invoiceOut/back/methods/invoiceOut/specs/regenerate.spec.js @@ -4,16 +4,6 @@ describe('invoiceOut regenerate()', () => { const invoiceReportFk = 30; const invoiceOutId = 1; - afterAll(async done => { - const invoiceOut = await app.models.InvoiceOut.findById(invoiceOutId); - await invoiceOut.updateAttributes({hasPdf: true}); - await app.models.InvoiceOut.rawSql(` - DELETE FROM vn.printServerQueue - WHERE reportFk = ?`, [invoiceReportFk]); - - done(); - }); - it('should check that the invoice has a PDF and is not in print generation queue', async() => { const invoiceOut = await app.models.InvoiceOut.findById(invoiceOutId); const [queue] = await app.models.InvoiceOut.rawSql(` @@ -35,5 +25,12 @@ describe('invoiceOut regenerate()', () => { expect(invoiceOut.hasPdf).toBeFalsy(); expect(queue.total).toEqual(1); + + // restores + const invoiceOutToRestore = await app.models.InvoiceOut.findById(invoiceOutId); + await invoiceOutToRestore.updateAttributes({hasPdf: true}); + await app.models.InvoiceOut.rawSql(` + DELETE FROM vn.printServerQueue + WHERE reportFk = ?`, [invoiceReportFk]); }); }); diff --git a/modules/item/back/methods/item/specs/updateTaxes.spec.js b/modules/item/back/methods/item/specs/updateTaxes.spec.js index c488cbc5ff..7ed6fa29ae 100644 --- a/modules/item/back/methods/item/specs/updateTaxes.spec.js +++ b/modules/item/back/methods/item/specs/updateTaxes.spec.js @@ -1,13 +1,7 @@ const app = require('vn-loopback/server/server'); describe('item updateTaxes()', () => { - afterAll(async done => { - let taxesInFixtures = [{id: 3, taxClassFk: 1}]; - - await app.models.Item.updateTaxes(taxesInFixtures); - - done(); - }); + let taxesInFixtures = [{id: 3, taxClassFk: 1}]; it('should throw an error if the taxClassFk is blank', async() => { let error; @@ -29,14 +23,12 @@ describe('item updateTaxes()', () => { let taxes = [{id: 3, taxClassFk: 2}]; - let result = await app.models.Item.updateTaxes(taxes); - - expect(result).toBeTruthy(); - }); - - it('should confirm the tax class was updated', async() => { - let taxCountry = await app.models.ItemTaxCountry.findById(3); + await app.models.Item.updateTaxes(taxes); + taxCountry = await app.models.ItemTaxCountry.findById(3); expect(taxCountry.taxClassFk).toEqual(2); + + // restores + await app.models.Item.updateTaxes(taxesInFixtures); }); }); diff --git a/modules/route/back/methods/route/specs/guessPriority.spec.js b/modules/route/back/methods/route/specs/guessPriority.spec.js index 075ea05c8f..448501e67e 100644 --- a/modules/route/back/methods/route/specs/guessPriority.spec.js +++ b/modules/route/back/methods/route/specs/guessPriority.spec.js @@ -14,18 +14,9 @@ describe('route guessPriority()', () => { done(); }); - it('should confirm the tickets in the target route have no priority yet', async() => { + it('should call guessPriority() and then check the tickets in the target route now have their priorities defined', async() => { routeTicketsToRestore = await app.models.Ticket.find({where: {routeFk: targetRouteId}}); - expect(routeTicketsToRestore.length).toEqual(2); - - expect(routeTicketsToRestore[0].id).toEqual(23); - expect(routeTicketsToRestore[0].priority).toBeNull(); - expect(routeTicketsToRestore[1].id).toEqual(24); - expect(routeTicketsToRestore[1].priority).toBeNull(); - }); - - it('should call guessPriority() and then check the tickets in the target route now have their priorities defined', async() => { await app.models.Route.guessPriority(targetRouteId); let routeTickets = await app.models.Ticket.find({where: {routeFk: targetRouteId}, fields: ['id', 'priority']}); diff --git a/modules/route/back/methods/route/specs/updateVolume.spec.js b/modules/route/back/methods/route/specs/updateVolume.spec.js index 3b4d51df7e..0a191d9aac 100644 --- a/modules/route/back/methods/route/specs/updateVolume.spec.js +++ b/modules/route/back/methods/route/specs/updateVolume.spec.js @@ -1,46 +1,43 @@ const app = require('vn-loopback/server/server'); +const LoopBackContext = require('loopback-context'); describe('route updateVolume()', () => { const routeId = 1; - const workerFk = 9; - const ctx = {req: {accessToken: {userId: workerFk}}}; - let originalRoute; - let ticketToRestore; - let logIdToDestroy; + const userId = 50; + const activeCtx = { + accessToken: {userId: userId}, + }; + const ctx = {req: activeCtx}; - afterAll(async done => { - await originalRoute.updateAttributes({m3: 1.8}); - await ticketToRestore.updateAttributes({routeFk: null}); - await app.models.RouteLog.destroyById(logIdToDestroy); - done(); - }); + it('should confirm the route volume is updated and logged when a ticket is added', async() => { + spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({ + active: activeCtx + }); + const route = await app.models.Route.findById(routeId); - it('should confirm the original volume of the route is the expected', async() => { - originalRoute = await app.models.Route.findById(routeId); + expect(route.m3).toEqual(1.8); - expect(originalRoute.m3).toEqual(1.8); - }); + const ticket = await app.models.Ticket.findById(14); - it('should confirm the route volume is updated when a ticket is added', async() => { - ticketToRestore = await app.models.Ticket.findById(14); - let updatedTicket = await app.models.Ticket.findById(14); - - await updatedTicket.updateAttributes({routeFk: routeId}); + await ticket.updateAttributes({routeFk: routeId}); await app.models.Route.updateVolume(ctx, routeId); - let updatedRoute = await app.models.Route.findById(routeId); + const updatedRoute = await app.models.Route.findById(routeId); - expect(updatedRoute.m3).not.toEqual(originalRoute.m3); - }); + expect(updatedRoute.m3).not.toEqual(route.m3); - it('should confirm the change is logged', async() => { - let logs = await app.models.RouteLog.find({fields: ['id', 'newInstance']}); + const logs = await app.models.RouteLog.find({fields: ['id', 'newInstance']}); - let m3Log = logs.filter(log => { - return log.newInstance.m3 === 1.9; + const m3Log = logs.filter(log => { + return log.newInstance.m3 === updatedRoute.m3; }); - logIdToDestroy = m3Log[0].id; + const logIdToDestroy = m3Log[0].id; expect(m3Log.length).toEqual(1); + + // restores + await ticket.updateAttributes({routeFk: null}); + await route.updateAttributes({m3: 1.8}); + await app.models.RouteLog.destroyById(logIdToDestroy); }); }); diff --git a/modules/ticket/back/methods/sale/specs/deleteSales.js b/modules/ticket/back/methods/sale/specs/deleteSales.spec.js similarity index 88% rename from modules/ticket/back/methods/sale/specs/deleteSales.js rename to modules/ticket/back/methods/sale/specs/deleteSales.spec.js index c23ac6758e..6ada9bb6ec 100644 --- a/modules/ticket/back/methods/sale/specs/deleteSales.js +++ b/modules/ticket/back/methods/sale/specs/deleteSales.spec.js @@ -2,12 +2,12 @@ const app = require('vn-loopback/server/server'); describe('sale deleteSales()', () => { let sale; - let newsale; + let newSale; beforeAll(async done => { sale = await app.models.Sale.findOne({where: {id: 9}}); sale.id = null; - newsale = await app.models.Sale.create(sale); + newSale = await app.models.Sale.create(sale); done(); }); @@ -31,7 +31,7 @@ describe('sale deleteSales()', () => { it('should delete the sales', async() => { let ctx = {req: {accessToken: {userId: 9}}}; - const sales = [{id: newsale.id, instance: 0}]; + const sales = [{id: newSale.id, instance: 0}]; const ticketId = 16; let res = await app.models.Sale.deleteSales(ctx, sales, ticketId); diff --git a/modules/ticket/back/methods/sale/specs/updatePrice.spec.js b/modules/ticket/back/methods/sale/specs/updatePrice.spec.js index 2ca2667693..c8702c1dbc 100644 --- a/modules/ticket/back/methods/sale/specs/updatePrice.spec.js +++ b/modules/ticket/back/methods/sale/specs/updatePrice.spec.js @@ -16,14 +16,6 @@ describe('sale updatePrice()', () => { done(); }); - afterAll(async done => { - await originalSale.save(); - await app.models.SaleComponent.updateAll({componentFk: manaComponentId, saleFk: saleId}, {value: 0}); - await originalSalesPersonMana.save(); - - done(); - }); - it('should throw an error if the ticket is not editable', async() => { let ctx = {req: {accessToken: {userId: 18}}}; let immutableSaleId = 1; @@ -43,36 +35,49 @@ describe('sale updatePrice()', () => { let price = ''; await app.models.Sale.updatePrice(ctx, saleId, price); - let saleUpdated = await app.models.Sale.findById(saleId); + let updatedSale = await app.models.Sale.findById(saleId); - expect(saleUpdated.price).toEqual(0); + expect(updatedSale.price).toEqual(0); + + // restores + await originalSale.updateAttributes(originalSale); + await app.models.SaleComponent.updateAll({componentFk: manaComponentId, saleFk: saleId}, {value: 0}); + await originalSalesPersonMana.updateAttributes(originalSalesPersonMana); }); - it('should now set price as a decimal number in a string', async() => { + it('should now set price as a number in a string', async() => { let ctx = {req: {accessToken: {userId: 18}}}; let price = '8'; await app.models.Sale.updatePrice(ctx, saleId, price); - let saleUpdated = await app.models.Sale.findById(saleId); + let updatedSale = await app.models.Sale.findById(saleId); - expect(saleUpdated.price).toEqual(8); + expect(updatedSale.price).toEqual(8); + + // restores + await originalSale.updateAttributes(originalSale); + await app.models.SaleComponent.updateAll({componentFk: manaComponentId, saleFk: saleId}, {value: 0}); + await originalSalesPersonMana.updateAttributes(originalSalesPersonMana); }); - it('should set price as a decimal number and check the sale has the mana component', async() => { + it('should set price as a decimal number and check the sale has the mana component changing the salesPersonMana', async() => { let ctx = {req: {accessToken: {userId: 18}}}; let price = 5.4; await app.models.Sale.updatePrice(ctx, saleId, price); - let saleUpdated = await app.models.Sale.findById(saleId); + let updatedSale = await app.models.Sale.findById(saleId); createdSaleComponent = await app.models.SaleComponent.findOne({where: {saleFk: saleId, componentFk: manaComponentId}}); - expect(saleUpdated.price).toBe(price); + expect(updatedSale.price).toBe(price); expect(createdSaleComponent.value).toEqual(-2.04); - }); - it('should check that the mana of salesPerson changed', async() => { let updatedSalesPersonMana = await app.models.WorkerMana.findById(18); expect(updatedSalesPersonMana.amount).not.toEqual(originalSalesPersonMana.amount); + + // restores + await originalSale.updateAttributes(originalSale); + await app.models.SaleComponent.updateAll({componentFk: manaComponentId, saleFk: saleId}, {value: 0}); + await originalSalesPersonMana.updateAttributes(originalSalesPersonMana); }); }); diff --git a/modules/ticket/back/methods/ticket-tracking/specs/changeState.spec.js b/modules/ticket/back/methods/ticket-tracking/specs/changeState.spec.js index 3c6c51252f..a171de7842 100644 --- a/modules/ticket/back/methods/ticket-tracking/specs/changeState.spec.js +++ b/modules/ticket/back/methods/ticket-tracking/specs/changeState.spec.js @@ -1,9 +1,23 @@ const app = require('vn-loopback/server/server'); +const LoopBackContext = require('loopback-context'); describe('ticket changeState()', () => { + const salesPersonId = 18; + const employeeId = 1; + const productionId = 49; + let activeCtx = { + accessToken: {userId: 9}, + }; + let ctx = {req: activeCtx}; let ticket; beforeAll(async done => { + spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({ + active: activeCtx + }); + }); + + beforeEach(async done => { let originalTicket = await app.models.Ticket.findOne({where: {id: 16}}); originalTicket.id = null; ticket = await app.models.Ticket.create(originalTicket); @@ -18,7 +32,7 @@ describe('ticket changeState()', () => { }); it('should throw if the ticket is not editable and the user isnt production', async() => { - let ctx = {req: {accessToken: {userId: 18}}}; + activeCtx.accessToken.userId = salesPersonId; let params = {ticketFk: 2, stateFk: 3}; let errCode; @@ -32,7 +46,7 @@ describe('ticket changeState()', () => { }); it('should throw an error if a worker with employee role attemps to a forbidden state', async() => { - let ctx = {req: {accessToken: {userId: 1}}}; + activeCtx.accessToken.userId = employeeId; let params = {ticketFk: 11, stateFk: 13}; let errCode; @@ -46,29 +60,21 @@ describe('ticket changeState()', () => { }); it('should be able to create a ticket tracking line for a not editable ticket if the user has the production role', async() => { - let ctx = {req: {accessToken: {userId: 49}}}; + activeCtx.accessToken.userId = productionId; let params = {ticketFk: ticket.id, stateFk: 3}; - let res = await app.models.TicketTracking.changeState(ctx, params); + let ticketTracking = await app.models.TicketTracking.changeState(ctx, params); - expect(res.__data.ticketFk).toBe(params.ticketFk); - expect(res.__data.stateFk).toBe(params.stateFk); - expect(res.__data.workerFk).toBe(49); - expect(res.__data.id).toBeDefined(); + expect(ticketTracking.__data.ticketFk).toBe(params.ticketFk); + expect(ticketTracking.__data.stateFk).toBe(params.stateFk); + expect(ticketTracking.__data.workerFk).toBe(49); + expect(ticketTracking.__data.id).toBeDefined(); + + // restores + await app.models.TicketTracking.destroyById(ticketTracking.__data.id); }); - it('should return an array with the created ticket tracking line', async() => { - let ctx = {req: {accessToken: {userId: 49}}}; - let params = {ticketFk: ticket.id, stateFk: 3}; - let res = await app.models.TicketTracking.changeState(ctx, params); - - expect(res.__data.ticketFk).toBe(params.ticketFk); - expect(res.__data.stateFk).toBe(params.stateFk); - expect(res.__data.workerFk).toBe(49); - expect(res.__data.id).toBeDefined(); - }); - - it('should return an array with the created ticket tracking line when the user is salesperson, uses the state assigned and thes a workerFk given', async() => { + it('should update the ticket tracking line when the user is salesperson, uses the state assigned and a valid worker id', async() => { let ctx = {req: {accessToken: {userId: 18}}}; let assignedState = await app.models.State.findOne({where: {code: 'PICKER_DESIGNED'}}); let params = {ticketFk: ticket.id, stateFk: assignedState.id, workerFk: 1}; diff --git a/modules/ticket/back/methods/ticket-tracking/specs/setDelivered.spec.js b/modules/ticket/back/methods/ticket-tracking/specs/setDelivered.spec.js index 520ccfb037..042ae0a1fa 100644 --- a/modules/ticket/back/methods/ticket-tracking/specs/setDelivered.spec.js +++ b/modules/ticket/back/methods/ticket-tracking/specs/setDelivered.spec.js @@ -1,24 +1,42 @@ const app = require('vn-loopback/server/server'); +const LoopBackContext = require('loopback-context'); describe('ticket setDelivered()', () => { + const userId = 50; + const activeCtx = { + accessToken: {userId: userId}, + }; + let ticketOne; let ticketTwo; beforeAll(async done => { - let originalTicketOne = await app.models.Ticket.findById(8); - let originalTicketTwo = await app.models.Ticket.findById(10); + spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({ + active: activeCtx + }); + try { + let originalTicketOne = await app.models.Ticket.findById(8); + let originalTicketTwo = await app.models.Ticket.findById(10); - originalTicketOne.id = null; - originalTicketTwo.id = null; - ticketOne = await app.models.Ticket.create(originalTicketOne); - ticketTwo = await app.models.Ticket.create(originalTicketTwo); + originalTicketOne.id = null; + originalTicketTwo.id = null; + + ticketOne = await app.models.Ticket.create(originalTicketOne); + ticketTwo = await app.models.Ticket.create(originalTicketTwo); + } catch (error) { + console.error(error); + } done(); }); afterAll(async done => { - await app.models.Ticket.destroyById(ticketOne.id); - await app.models.Ticket.destroyById(ticketTwo.id); + try { + await app.models.Ticket.destroyById(ticketOne.id); + await app.models.Ticket.destroyById(ticketTwo.id); + } catch (error) { + console.error(error); + } done(); }); @@ -31,6 +49,8 @@ describe('ticket setDelivered()', () => { let state = await app.models.TicketTracking.setDelivered(ctx, params); expect(state.id).toEqual(delivered.id); + + // restores + await app.models.TicketTracking.destroyById(state.id); }); }); - diff --git a/modules/ticket/back/methods/ticket/specs/filter.spec.js b/modules/ticket/back/methods/ticket/specs/filter.spec.js index 85b410671a..f5733c8da9 100644 --- a/modules/ticket/back/methods/ticket/specs/filter.spec.js +++ b/modules/ticket/back/methods/ticket/specs/filter.spec.js @@ -5,9 +5,8 @@ describe('ticket filter()', () => { const ctx = {req: {accessToken: {userId: 9}}, args: {}}; const filter = {order: 'id DESC'}; const result = await app.models.Ticket.filter(ctx, filter); - const ticketId = result[0].id; - expect(ticketId).toEqual(24); + expect(result.length).toEqual(24); }); it('should return the tickets matching the problems on true', async() => { @@ -71,7 +70,7 @@ describe('ticket filter()', () => { const length = result.length; const anyResult = result[Math.floor(Math.random() * Math.floor(length))]; - expect(result.length).toEqual(7); + expect(length).toEqual(7); expect(anyResult.state).toMatch(/(Libre|Arreglar)/); }); diff --git a/modules/ticket/back/methods/ticket/specs/makeInvoice.spec.js b/modules/ticket/back/methods/ticket/specs/makeInvoice.spec.js index b91751d5df..79bd598482 100644 --- a/modules/ticket/back/methods/ticket/specs/makeInvoice.spec.js +++ b/modules/ticket/back/methods/ticket/specs/makeInvoice.spec.js @@ -1,41 +1,53 @@ const app = require('vn-loopback/server/server'); +const LoopBackContext = require('loopback-context'); describe('ticket makeInvoice()', () => { + const userId = 19; + const activeCtx = { + accessToken: {userId: userId}, + }; + const ctx = {req: activeCtx}; + let invoice; let ticketId = 11; const okState = 3; - afterAll(async done => { - let ticket = await app.models.Ticket.findById(11); - await ticket.updateAttributes({refFk: null}); - - let ticketTrackings = await app.models.TicketTracking.find({ - where: { - ticketFk: ticketId, - stateFk: {neq: okState} - }, - order: 'id DESC' + beforeAll(async done => { + spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({ + active: activeCtx }); + }); - for (let state of ticketTrackings) - await state.destroy(); + afterAll(async done => { + try { + let ticket = await app.models.Ticket.findById(11); + await ticket.updateAttributes({refFk: null}); - let invoiceOut = await app.models.InvoiceOut.findById(invoice.invoiceFk); - await invoiceOut.destroy(); + let ticketTrackings = await app.models.TicketTracking.find({ + where: { + ticketFk: ticketId, + stateFk: {neq: okState} + }, + order: 'id DESC' + }); + for (let state of ticketTrackings) + await state.destroy(); + + let invoiceOut = await app.models.InvoiceOut.findById(invoice.invoiceFk); + await invoiceOut.destroy(); + } catch (error) { + console.error(error); + } done(); }); - it('should invoice a ticket', async() => { - let ctx = {req: {accessToken: {userId: 9}}}; + it('should invoice a ticket, then try again to fail', async() => { invoice = await app.models.Ticket.makeInvoice(ctx, ticketId); expect(invoice.invoiceFk).toBeDefined(); expect(invoice.serial).toEqual('T'); - }); - it('should not invoice an already invoiced ticket', async() => { - let ctx = {req: {accessToken: {userId: 9}}}; let error; await app.models.Ticket.makeInvoice(ctx, ticketId).catch(e => { @@ -43,5 +55,7 @@ describe('ticket makeInvoice()', () => { }).finally(() => { expect(error.message).toEqual(`This ticket can't be invoiced`); }); + + expect(error).toBeDefined(); }); }); diff --git a/modules/ticket/back/methods/ticket/specs/setDeleted.spec.js b/modules/ticket/back/methods/ticket/specs/setDeleted.spec.js index 518b6a4d8a..9291876ffb 100644 --- a/modules/ticket/back/methods/ticket/specs/setDeleted.spec.js +++ b/modules/ticket/back/methods/ticket/specs/setDeleted.spec.js @@ -1,18 +1,16 @@ const app = require('vn-loopback/server/server'); +const LoopBackContext = require('loopback-context'); const models = app.models; describe('ticket setDeleted()', () => { + const userId = 106; + const employeeUser = 110; + const activeCtx = { + accessToken: {userId: userId}, + }; it('should throw an error if the given ticket has a claim', async() => { + const ctx = {req: activeCtx}; const ticketId = 16; - const ctx = { - req: { - accessToken: {userId: 106}, - headers: { - origin: 'http://localhost:5000' - }, - __: () => {} - } - }; let error; try { @@ -26,7 +24,9 @@ describe('ticket setDeleted()', () => { }); it('should delete the ticket, remove the stowaway link and change the stowaway ticket state to "FIXING" and get rid of the itemshelving', async() => { - const employeeUser = 110; + spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({ + active: activeCtx + }); const ctx = { req: { accessToken: {userId: employeeUser}, @@ -96,7 +96,8 @@ describe('ticket setDeleted()', () => { expect(stowaway).toBeNull(); expect(stowawayTicketState.code).toEqual('FIXING'); - await shipTicket.destroy(); - await stowawayTicket.destroy(); + // restores + await models.Ticket.destroyById(shipTicket.id); + await models.Ticket.destroyById(stowawayTicket.id); }); }); diff --git a/modules/ticket/back/methods/ticket/specs/transferSales.spec.js b/modules/ticket/back/methods/ticket/specs/transferSales.spec.js index 63f2034bb2..3d62ccce98 100644 --- a/modules/ticket/back/methods/ticket/specs/transferSales.spec.js +++ b/modules/ticket/back/methods/ticket/specs/transferSales.spec.js @@ -1,18 +1,36 @@ const app = require('vn-loopback/server/server'); +const LoopBackContext = require('loopback-context'); describe('sale transferSales()', () => { - let createdTicketId; + const userId = 101; + const activeCtx = { + accessToken: {userId: userId}, + }; + const ctx = {req: activeCtx}; + let createdTicketsIds = []; - afterAll(async done => { - createdTicketsIds.forEach(async createdTicketId => { - await app.models.Ticket.destroyById(createdTicketId); + beforeAll(() => { + spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({ + active: activeCtx }); + }); + + afterEach(async done => { + if (createdTicketsIds.length) { + try { + createdTicketsIds.forEach(async createdTicketId => { + await app.models.Ticket.destroyById(createdTicketId); + }); + } catch (error) { + console.error(error); + } + } + done(); }); it('should throw an error as the ticket is not editable', async() => { - const ctx = {req: {accessToken: {userId: 101}}}; let error; const currentTicketId = 1; @@ -29,7 +47,6 @@ describe('sale transferSales()', () => { }); it('should throw an error if the receiving ticket is not editable', async() => { - const ctx = {req: {accessToken: {userId: 101}}}; let error; const currentTicketId = 16; @@ -45,60 +62,41 @@ describe('sale transferSales()', () => { expect(error).toBeDefined(); }); - it('should transfer the sales from one ticket to a new one', async() => { - const ctx = {req: {accessToken: {userId: 101}}}; - let currentTicket = await app.models.Ticket.findById(11); - let originalTicketSales = await app.models.Ticket.getSales(currentTicket.id); - salesToRestone = originalTicketSales; + it('should transfer the sales from one ticket to a new one then send them back and delete the created ticket', async() => { + const formerTicketId = 11; + let createdTicketId = undefined; - expect(originalTicketSales.length).toEqual(2); + let formerTicketSales = await app.models.Ticket.getSales(formerTicketId); - const currentTicketId = currentTicket.id; - const receiverTicketId = undefined; + expect(formerTicketSales.length).toEqual(2); let createdTicket = await app.models.Ticket.transferSales( - ctx, currentTicketId, receiverTicketId, originalTicketSales); + ctx, formerTicketId, createdTicketId, formerTicketSales); + createdTicketId = createdTicket.id; - createdTicketsIds.push(createdTicket.id); + createdTicketsIds.push(createdTicketId); - originalTicketSales = await app.models.Ticket.getSales(currentTicket.id); - receiverTicketSales = await app.models.Ticket.getSales(createdTicket.id); + formerTicketSales = await app.models.Ticket.getSales(formerTicketId); + createdTicketSales = await app.models.Ticket.getSales(createdTicketId); - expect(originalTicketSales.length).toEqual(0); - expect(receiverTicketSales.length).toEqual(2); - }); - - it('should transfer back the sales and set the created ticket as deleted', async() => { - const ctx = {req: {accessToken: {userId: 101}}}; - const currentTicket = await app.models.Ticket.findById(createdTicketId); - const receiverTicketId = 11; - - let createdTicket = await app.models.Ticket.findById(createdTicketId); - let createdTicketSales = await app.models.Ticket.getSales(createdTicketId); - let receiverTicketSales = await app.models.Ticket.getSales(receiverTicketId); - - const currentTicketId = currentTicket.id; - const sales = createdTicketSales; - - expect(createdTicket.isDeleted).toBeFalsy(); + expect(formerTicketSales.length).toEqual(0); expect(createdTicketSales.length).toEqual(2); - expect(receiverTicketSales.length).toEqual(0); await app.models.Ticket.transferSales( - ctx, currentTicketId, receiverTicketId, sales); + ctx, createdTicketId, formerTicketId, createdTicketSales); + + formerTicketSales = await app.models.Ticket.getSales(formerTicketId); + createdTicketSales = await app.models.Ticket.getSales(createdTicketId); createdTicket = await app.models.Ticket.findById(createdTicketId); - createdTicketSales = await app.models.Ticket.getSales(createdTicketId); - receiverTicketSales = await app.models.Ticket.getSales(receiverTicketId); expect(createdTicket.isDeleted).toBeTruthy(); + expect(formerTicketSales.length).toEqual(2); expect(createdTicketSales.length).toEqual(0); - expect(receiverTicketSales.length).toEqual(2); }); describe('sale transferPartialSales()', () => { it('should throw an error in the quantity to transfer exceeds the amount from the original sale', async() => { - const ctx = {req: {accessToken: {userId: 101}}}; let error; let currentTicket = await app.models.Ticket.findById(11); let currentTicketSales = await app.models.Ticket.getSales(currentTicket.id); @@ -119,44 +117,51 @@ describe('sale transferSales()', () => { }); it('should transfer two sales to a new ticket but one shall be partial', async() => { - const ctx = {req: {accessToken: {userId: 101}}}; - const originalTicketId = 11; - const receiverTicketId = undefined; + const formerTicketId = 11; + let createdTicketId = undefined; - let currentTicketSales = await app.models.Ticket.getSales(originalTicketId); + let formerTicketSales = await app.models.Ticket.getSales(formerTicketId); - const originalPartialSaleId = currentTicketSales[0].id; - const originalCompleteSaleId = currentTicketSales[1].id; - let originalQuantity = currentTicketSales[0].quantity; - currentTicketSales[0].quantity = 1; + const partialSaleId = formerTicketSales[0].id; + const completeSaleId = formerTicketSales[1].id; + let partialSaleTotalQuantity = formerTicketSales[0].quantity; + + expect(partialSaleTotalQuantity).toEqual(15); + + formerTicketSales[0].quantity = 1; let createdTicket = await app.models.Ticket.transferSales( - ctx, originalTicketId, receiverTicketId, currentTicketSales); + ctx, formerTicketId, createdTicketId, formerTicketSales); createdTicketId = createdTicket.id; createdTicketsIds.push(createdTicket.id); - currentTicketSales = await app.models.Ticket.getSales(originalTicketId); - receiverTicketSales = await app.models.Ticket.getSales(createdTicketId); + formerTicketSales = await app.models.Ticket.getSales(formerTicketId); + createdTicketSales = await app.models.Ticket.getSales(createdTicketId); - const [createdPartialSale] = receiverTicketSales.filter(sale => { - return sale.id != originalCompleteSaleId; + const [createdPartialSale] = createdTicketSales.filter(sale => { + return sale.id != completeSaleId; }); - expect(currentTicketSales.length).toEqual(1); - expect(currentTicketSales[0].quantity).toEqual(originalQuantity -= 1); - expect(receiverTicketSales.length).toEqual(2); + expect(formerTicketSales.length).toEqual(1); + expect(formerTicketSales[0].quantity).toEqual(partialSaleTotalQuantity - 1); + expect(createdTicketSales.length).toEqual(2); expect(createdPartialSale.quantity).toEqual(1); - let saleToRestore = await app.models.Sale.findById(originalPartialSaleId); - await saleToRestore.updateAttribute('quantity', originalQuantity); + let saleToRestore = await app.models.Sale.findById(partialSaleId); + await saleToRestore.updateAttribute('quantity', partialSaleTotalQuantity); - let saleToReturnToTicket = await app.models.Sale.findById(originalCompleteSaleId); - await saleToReturnToTicket.updateAttribute('ticketFk', originalTicketId); + let saleToReturnToTicket = await app.models.Sale.findById(completeSaleId); + await saleToReturnToTicket.updateAttribute('ticketFk', formerTicketId); - currentTicketSales = await app.models.Ticket.getSales(originalTicketId); + formerTicketSales = await app.models.Ticket.getSales(formerTicketId); - expect(currentTicketSales.length).toEqual(2); + const [returningPartialSale] = formerTicketSales.filter(sale => { + return sale.id == partialSaleId; + }); + + expect(returningPartialSale.quantity).toEqual(partialSaleTotalQuantity); + expect(formerTicketSales.length).toEqual(2); }); }); }); diff --git a/modules/ticket/back/methods/ticket/specs/updateEditableTicket.spec.js b/modules/ticket/back/methods/ticket/specs/updateEditableTicket.spec.js index a08565df20..ffe61e35d8 100644 --- a/modules/ticket/back/methods/ticket/specs/updateEditableTicket.spec.js +++ b/modules/ticket/back/methods/ticket/specs/updateEditableTicket.spec.js @@ -1,4 +1,11 @@ const app = require('vn-loopback/server/server'); +const LoopBackContext = require('loopback-context'); + +const userId = 9; +const activeCtx = { + accessToken: {userId: userId}, +}; +const ctx = {req: activeCtx}; describe('ticket updateEditableTicket()', () => { const validTicketId = 12; @@ -7,7 +14,6 @@ describe('ticket updateEditableTicket()', () => { const originalData = {addressFk: 123}; afterAll(async done => { - let ctx = {req: {accessToken: {userId: 9}}}; await app.models.Ticket.updateEditableTicket(ctx, validTicketId, originalData); done(); @@ -15,7 +21,6 @@ describe('ticket updateEditableTicket()', () => { it('should now throw an error if the ticket is not editable', async() => { let error; - let ctx = {req: {accessToken: {userId: 9}}}; await app.models.Ticket.updateEditableTicket(ctx, invalidTicketId, data).catch(e => { error = e; @@ -27,8 +32,9 @@ describe('ticket updateEditableTicket()', () => { }); it('should edit the ticket address', async() => { - let ctx = {req: {accessToken: {userId: 9}}}; - + spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({ + active: activeCtx + }); await app.models.Ticket.updateEditableTicket(ctx, validTicketId, data); let updatedTicket = await app.models.Ticket.findById(validTicketId); diff --git a/modules/ticket/back/models/ticket.js b/modules/ticket/back/models/ticket.js index 1150b73671..dfbd12a0a3 100644 --- a/modules/ticket/back/models/ticket.js +++ b/modules/ticket/back/models/ticket.js @@ -1,4 +1,6 @@ +const LoopBackContext = require('loopback-context'); + module.exports = Self => { require('../methods/ticket/changeWorker')(Self); require('../methods/ticket/getVolume')(Self); @@ -34,13 +36,16 @@ module.exports = Self => { require('../methods/ticket/getComponentsSum')(Self); Self.observe('before save', async function(ctx) { + const loopBackContext = LoopBackContext.getCurrentContext(); + const httpCtx = loopBackContext.active; + if (ctx.isNewInstance) return; let changes = ctx.data || ctx.instance; if (changes.routeFk === null && ctx.currentInstance.routeFk != null) { let instance = JSON.parse(JSON.stringify(ctx.currentInstance)); - let userId = ctx.options.accessToken.userId; + let userId = httpCtx.accessToken.userId; let logRecord = { originFk: ctx.currentInstance.routeFk, userFk: userId, diff --git a/modules/travel/back/methods/thermograph/specs/createThermograph.spec.js b/modules/travel/back/methods/thermograph/specs/createThermograph.spec.js index 733b713f03..a3fc98aa6d 100644 --- a/modules/travel/back/methods/thermograph/specs/createThermograph.spec.js +++ b/modules/travel/back/methods/thermograph/specs/createThermograph.spec.js @@ -18,7 +18,7 @@ describe('Termograph createThermograph()', () => { done(); }); - it(`should create a thermograph which is saved in both thermograph and travelThermograph`, async() => { + it(`should be able to create just once a thermograph which is saved in both thermograph and travelThermograph`, async() => { let createdTravelThermograpth = await models.TravelThermograph.findOne({where: {thermographFk: thermographId}}); expect(createdTravelThermograpth).toBeNull(); @@ -32,9 +32,7 @@ describe('Termograph createThermograph()', () => { expect(createdTravelThermograpth.warehouseFk).toEqual(warehouseId); expect(createdTravelThermograpth.temperature).toEqual(temperature); - }); - it(`should not be able to created duplicated entries`, async() => { let error; try { diff --git a/modules/worker/back/methods/worker-time-control/specs/timeEntry.spec.js b/modules/worker/back/methods/worker-time-control/specs/timeEntry.spec.js index ff5e13a2d9..5e37329886 100644 --- a/modules/worker/back/methods/worker-time-control/specs/timeEntry.spec.js +++ b/modules/worker/back/methods/worker-time-control/specs/timeEntry.spec.js @@ -1,12 +1,37 @@ const app = require('vn-loopback/server/server'); +const LoopBackContext = require('loopback-context'); + +describe('workerTimeControl add/delete timeEntry()', () => { + const HHRRId = 37; + const teamBossId = 13; + const employeeId = 1; + let activeCtx = { + accessToken: {userId: 50}, + }; + let ctx = {req: activeCtx}; -describe('workerTimeControl addTimeEntry()', () => { let timeEntry; let createdTimeEntry; + afterEach(async() => { + if (createdTimeEntry) { + try { + await app.models.WorkerTimeControl.destroyById(createdTimeEntry.id); + } catch (error) { + console.error(error); + } + } + }); + + beforeAll(() => { + spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({ + active: activeCtx + }); + }); + it('should fail to add a time entry if the target user is not a subordinate', async() => { + activeCtx.accessToken.userId = employeeId; let error; - let ctx = {req: {accessToken: {userId: 1}}}; let data = { workerFk: 2, timed: new Date() @@ -24,8 +49,8 @@ describe('workerTimeControl addTimeEntry()', () => { }); it('should fail to add if the current and the target user are the same and is not team boss', async() => { + activeCtx.accessToken.userId = employeeId; let error; - let ctx = {req: {accessToken: {userId: 1}}}; let data = { workerFk: 1, timed: new Date() @@ -42,12 +67,11 @@ describe('workerTimeControl addTimeEntry()', () => { expect(error.message).toBe(`You don't have enough privileges`); }); - it('should add if the current user is team boss and the target user is a subordinate', async() => { - todayAtSix = new Date(); + it('should add if the current user is team boss and the target user is a himself', async() => { + activeCtx.accessToken.userId = teamBossId; + let todayAtSix = new Date(); todayAtSix.setHours(18, 30, 0, 0); - let teamBossId = 13; - let ctx = {req: {accessToken: {userId: teamBossId}}}; let data = { workerFk: teamBossId, timed: todayAtSix @@ -60,10 +84,20 @@ describe('workerTimeControl addTimeEntry()', () => { expect(createdTimeEntry).toBeDefined(); }); - it('should try but fail to delete the created time entry for the team boss as team boss', async() => { + it('should try but fail to delete his own time entry', async() => { + activeCtx.accessToken.userId = teamBossId; let error; - let teamBossId = 13; - let ctx = {req: {accessToken: {userId: teamBossId}}}; + let todayAtSeven = new Date(); + todayAtSeven.setHours(19, 30, 0, 0); + + let data = { + workerFk: teamBossId, + timed: todayAtSeven + }; + + timeEntry = await app.models.WorkerTimeControl.addTimeEntry(ctx, data); + + createdTimeEntry = await app.models.WorkerTimeControl.findById(timeEntry.id); try { await app.models.WorkerTimeControl.deleteTimeEntry(ctx, createdTimeEntry.id); @@ -77,13 +111,23 @@ describe('workerTimeControl addTimeEntry()', () => { }); it('should delete the created time entry for the team boss as HHRR', async() => { - let HHRRId = 37; - let ctx = {req: {accessToken: {userId: HHRRId}}}; + activeCtx.accessToken.userId = HHRRId; + + let todayAtFive = new Date(); + todayAtFive.setHours(17, 30, 0, 0); + + let data = { + workerFk: teamBossId, + timed: todayAtFive + }; + + timeEntry = await app.models.WorkerTimeControl.addTimeEntry(ctx, data); + + createdTimeEntry = await app.models.WorkerTimeControl.findById(timeEntry.id); expect(createdTimeEntry).toBeDefined(); - ctx.req.accessToken.userId = HHRRId; - await app.models.WorkerTimeControl.deleteTimeEntry(ctx, timeEntry.id); + await app.models.WorkerTimeControl.deleteTimeEntry(ctx, createdTimeEntry.id); createdTimeEntry = await app.models.WorkerTimeControl.findById(timeEntry.id);