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

refs #6915 test_master24_8 #2067

Merged
alexm merged 561 commits from test_master24_8 into master 2024-02-22 07:31:34 +00:00
Conversation 0 Commits 561 Files Changed 306 +8 -14
4 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 2cab007f57 - Show all commits

1
back/tests.js
View File

@ -96,6 +96,7 @@ async function test() {
// runner.loadConfigFile('back/jasmine.json'); // runner.loadConfigFile('back/jasmine.json');
runner.loadConfig(config); runner.loadConfig(config);
process.env.SPEC_IS_RUNNING = true;
await runner.execute(); await runner.execute();
} }

6
modules/route/back/methods/route/specs/downloadCmrsZip.spec.js
View File

@ -1,10 +1,6 @@
const models = require('vn-loopback/server/server').models; const models = require('vn-loopback/server/server').models;
describe('route downloadCmrsZip()', () => { describe('route downloadCmrsZip()', () => {
beforeEach(() => {
spyOn(models.Route, 'downloadCmrsZip').and.returnValue(true);
});
it('should create a zip file with the given cmr ids', async() => { it('should create a zip file with the given cmr ids', async() => {
const tx = await models.Route.beginTransaction({}); const tx = await models.Route.beginTransaction({});
const ctx = { const ctx = {
@ -19,7 +15,7 @@ describe('route downloadCmrsZip()', () => {
try { try {
const stream = await models.Route.downloadCmrsZip(ctx, cmrs); const stream = await models.Route.downloadCmrsZip(ctx, cmrs);
expect(stream).toBeTrue(); expect(stream[0]).toBeDefined();
await tx.rollback(); await tx.rollback();
} catch (e) { } catch (e) {
await tx.rollback(); await tx.rollback();

12
modules/ticket/back/methods/ticket/specs/saveCmr.spec.js
View File

@ -1,10 +1,6 @@
const models = require('vn-loopback/server/server').models; const models = require('vn-loopback/server/server').models;
describe('ticket saveCmr()', () => { describe('ticket saveCmr()', () => {
beforeEach(() => {
spyOn(models.Ticket, 'saveCmr').and.returnValue(true);
});
it(`should throw error if the cmr can't save`, async() => { it(`should throw error if the cmr can't save`, async() => {
const tx = await models.Ticket.beginTransaction({}); const tx = await models.Ticket.beginTransaction({});
const ctx = { const ctx = {
@ -18,11 +14,11 @@ describe('ticket saveCmr()', () => {
}; };
try { try {
const options = {transaction: tx}; const options = {transaction: tx};
const ticket = [1]; const ticket = [2];
await models.Ticket.saveCmr(ctx, ticket); await models.Ticket.saveCmr(ctx, ticket, options);
const hasDmsCmr = await models.TicketDms.findOne({ const hasDmsCmr = await models.TicketDms.findOne({
where: {ticketFk: ticket[1]}, where: {ticketFk: ticket[0]},
include: [{ include: [{
relation: 'dms', relation: 'dms',
fields: ['id'], fields: ['id'],
@ -35,7 +31,7 @@ describe('ticket saveCmr()', () => {
}] }]
}, options); }, options);
expect(hasDmsCmr?.dms()?.dmsType()).toEqual(1); expect(hasDmsCmr?.dms()?.id).toBeGreaterThanOrEqual(1);
await tx.rollback(); await tx.rollback();
} catch (e) { } catch (e) {
await tx.rollback(); await tx.rollback();

3
print/core/cluster.js
View File

@ -35,7 +35,8 @@ module.exports = {
logger.error(`[Print] => ${err.message}`); logger.error(`[Print] => ${err.message}`);
}); });
cluster.on('queue', () => logger.info('Printing task initialized by pool')); cluster.on('queue', () =>
process.env.SPEC_IS_RUNNING === 'false' && logger.info('Printing task initialized by pool'));
}); });
} }
}; };