Merge branch 'dev' of http://git.verdnatura.es/salix into dev

This commit is contained in:
Carlos Jimenez 2018-08-21 15:02:05 +02:00
commit 76a44a6543
2 changed files with 1 additions and 11 deletions

View File

@ -1,10 +0,0 @@
const app = require(`${servicesDir}/ticket/server/server`);
xdescribe('ticket getShipped()', () => {
it('should return a shipment date', async() => {
let params = {where: {itemFk: 1, warehouseFk: 2}};
let result = await app.models.Ticket.getDiary(params);
expect(result).toBeDefined();
});
});

View File

@ -9,7 +9,7 @@ describe('order catalogFilter()', () => {
}
};
let result = await app.models.Order.catalogFilter(filter);
let firstItemId = result[0].itemFk;
let firstItemId = result[0].id;
expect(result.length).toEqual(2);
expect(firstItemId).toEqual(3);