This commit is contained in:
parent
9f9d953b86
commit
21cf05ddd0
|
@ -1,6 +1,6 @@
|
|||
const {models} = require('vn-loopback/server/server');
|
||||
|
||||
fdescribe('itemShelving return()', () => {
|
||||
describe('itemShelving return()', () => {
|
||||
beforeAll(async() => {
|
||||
ctx = {
|
||||
req: {
|
||||
|
|
|
@ -24,12 +24,17 @@ module.exports = Self => {
|
|||
},
|
||||
});
|
||||
|
||||
Self.card = async(itemFk, warehouseFk) => {
|
||||
Self.card = async(itemFk, warehouseFk, options) => {
|
||||
const myOptions = {};
|
||||
|
||||
if (typeof options == 'object')
|
||||
Object.assign(myOptions, options);
|
||||
|
||||
const models = Self.app.models;
|
||||
|
||||
const [[itemInfo]] = await Self.rawSql('CALL vn.item_getInfo(?, ?)', [itemFk, warehouseFk]);
|
||||
const [[itemInfo]] = await Self.rawSql('CALL vn.item_getInfo(?, ?)', [itemFk, warehouseFk], myOptions);
|
||||
|
||||
const barcodeItems = await Self.rawSql('SELECT vn.barcodeToItem(?) as realIdItem', [itemFk]);
|
||||
const barcodeItems = await Self.rawSql('SELECT vn.barcodeToItem(?) as realIdItem', [itemFk], myOptions);
|
||||
const [realIdItem] = barcodeItems.map(barcodeItem => barcodeItem.realIdItem);
|
||||
|
||||
const barcodes = await models.ItemBarcode.find({
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
const models = require('vn-loopback/server/server').models;
|
||||
const LoopBackContext = require('loopback-context');
|
||||
|
||||
fdescribe('sale model ', () => {
|
||||
describe('sale model ', () => {
|
||||
const ctx = {
|
||||
req: {
|
||||
accessToken: {userId: 9},
|
||||
|
|
|
@ -79,7 +79,7 @@ describe('Travel extraCommunityFilter()', () => {
|
|||
|
||||
const result = await app.models.Travel.extraCommunityFilter(ctx, filter);
|
||||
|
||||
expect(result.length).toEqual(9);
|
||||
expect(result.length).toEqual(8);
|
||||
});
|
||||
|
||||
it('should return the travel matching "cargoSupplierFk"', async() => {
|
||||
|
|
|
@ -80,6 +80,6 @@ describe('Travel filter()', () => {
|
|||
|
||||
const result = await app.models.Travel.filter(ctx);
|
||||
|
||||
expect(result.length).toEqual(6);
|
||||
expect(result.length).toEqual(5);
|
||||
});
|
||||
});
|
||||
|
|
|
@ -15,7 +15,7 @@ module.exports = Self => {
|
|||
if (typeof options == 'object')
|
||||
Object.assign(myOptions, options);
|
||||
|
||||
const isOperator = await Self.findById(user, myOptions);
|
||||
const isOperator = await Self.findById(userId, myOptions);
|
||||
if (!isOperator) await Self.create({workerFk: userId}, myOptions);
|
||||
};
|
||||
};
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
const {models} = require('vn-loopback/server/server');
|
||||
|
||||
describe('operator add()', () => {
|
||||
const itBoss = 104;
|
||||
const noWorker = 100000;
|
||||
const noOperator = 104;
|
||||
const operator = 9;
|
||||
|
||||
beforeAll(async() => {
|
||||
ctx = {
|
||||
|
@ -14,18 +14,23 @@ describe('operator add()', () => {
|
|||
};
|
||||
});
|
||||
|
||||
it('should throw an error if the worker does not exist', async() => {
|
||||
it('should not add an existent operator', async() => {
|
||||
const tx = await models.Operator.beginTransaction({});
|
||||
const options = {transaction: tx};
|
||||
ctx.req.accessToken.userId = noWorker;
|
||||
ctx.req.accessToken.userId = operator;
|
||||
|
||||
try {
|
||||
const operatorBefore = await models.Operator.find(null, options);
|
||||
const isOperator = await models.Operator.findOne(null, options);
|
||||
|
||||
expect(isOperator).toBeDefined();
|
||||
|
||||
await models.Operator.add(ctx, options);
|
||||
const operatorAfter = await models.Operator.find(null, options);
|
||||
|
||||
expect(operatorBefore.length).toEqual(operatorAfter.length);
|
||||
await tx.rollback();
|
||||
} catch (e) {
|
||||
const error = e;
|
||||
|
||||
expect(error.message).toEqual('This worker does not exist');
|
||||
await tx.rollback();
|
||||
}
|
||||
});
|
||||
|
@ -33,7 +38,7 @@ describe('operator add()', () => {
|
|||
it('should add a new operator successfully', async() => {
|
||||
const tx = await models.Operator.beginTransaction({});
|
||||
const options = {transaction: tx};
|
||||
ctx.req.accessToken.userId = itBoss;
|
||||
ctx.req.accessToken.userId = noOperator;
|
||||
|
||||
try {
|
||||
const operatorBefore = await models.Operator.find(null, options);
|
||||
|
|
Loading…
Reference in New Issue