From 3ff20d48d7a27988a1afee22cf99f730616c49c9 Mon Sep 17 00:00:00 2001 From: Bernat Date: Sun, 29 Apr 2018 13:50:42 +0200 Subject: [PATCH] refactor back end test,failed because of new fixtures --- .../common/methods/item-tag/specs/filterItemTags.spec.js | 2 +- services/loopback/common/methods/ticket/specs/get-taxes.spec.js | 2 +- services/loopback/common/methods/ticket/specs/get-total.spec.js | 2 +- services/loopback/common/methods/ticket/summary.js | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/services/loopback/common/methods/item-tag/specs/filterItemTags.spec.js b/services/loopback/common/methods/item-tag/specs/filterItemTags.spec.js index 3ca35ece13..a45e7e51b1 100644 --- a/services/loopback/common/methods/item-tag/specs/filterItemTags.spec.js +++ b/services/loopback/common/methods/item-tag/specs/filterItemTags.spec.js @@ -4,6 +4,6 @@ describe('item filterItemTags()', () => { it('should call the filterItemTags method', async() => { let [result] = await app.models.ItemTag.filterItemTags(1); - expect(result.name).toEqual('Yellow'); + expect(result.name).toEqual('Blue'); }); }); diff --git a/services/loopback/common/methods/ticket/specs/get-taxes.spec.js b/services/loopback/common/methods/ticket/specs/get-taxes.spec.js index 087c8ce10c..320f20e134 100644 --- a/services/loopback/common/methods/ticket/specs/get-taxes.spec.js +++ b/services/loopback/common/methods/ticket/specs/get-taxes.spec.js @@ -4,7 +4,7 @@ describe('ticket getTaxes()', () => { it('should call the getTaxes method', done => { app.models.Ticket.getTaxes(1) .then(response => { - expect(response[0].tax).toEqual(1.05); + expect(response[0].tax).toEqual(6.05); done(); }); }); diff --git a/services/loopback/common/methods/ticket/specs/get-total.spec.js b/services/loopback/common/methods/ticket/specs/get-total.spec.js index 0a9d74e840..d5f140effe 100644 --- a/services/loopback/common/methods/ticket/specs/get-total.spec.js +++ b/services/loopback/common/methods/ticket/specs/get-total.spec.js @@ -4,7 +4,7 @@ describe('ticket getTotal()', () => { it('should call the getTotal method and return the response', done => { app.models.Ticket.getTotal(1) .then(response => { - expect(response).toEqual(11.55); + expect(response).toEqual(248.05); done(); }); }); diff --git a/services/loopback/common/methods/ticket/summary.js b/services/loopback/common/methods/ticket/summary.js index 83eb9f416c..030b846f68 100644 --- a/services/loopback/common/methods/ticket/summary.js +++ b/services/loopback/common/methods/ticket/summary.js @@ -78,7 +78,7 @@ module.exports = Self => { where: { ticketFk: ticketFk }, - order: 'concept ASC', + order: 'itemFk ASC', include: [{ relation: 'item', scope: {