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

jenkins_backTest_solved #1142

Merged
joan merged 5 commits from jenkins_backTest_solved into dev 2022-11-15 09:04:43 +00:00
Conversation 0 Commits 5 Files Changed 3 +6 -5
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/invoiceOut/back/methods/invoiceOut/specs/downloadZip.spec.js
View File

@ -13,7 +13,7 @@ describe('InvoiceOut downloadZip()', () => {
}; };
it('should return part of link to dowloand the zip', async() => { it('should return part of link to dowloand the zip', async() => {
const tx = await models.Order.beginTransaction({}); const tx = await models.InvoiceOut.beginTransaction({});
try { try {
const options = {transaction: tx}; const options = {transaction: tx};
@ -30,7 +30,7 @@ describe('InvoiceOut downloadZip()', () => {
}); });
it('should return an error if the size of the files is too large', async() => { it('should return an error if the size of the files is too large', async() => {
const tx = await models.Order.beginTransaction({}); const tx = await models.InvoiceOut.beginTransaction({});
let error; let error;
try { try {

2
modules/invoiceOut/front/summary/index.html
View File

@ -85,7 +85,7 @@
</span> </span>
</vn-td> </vn-td>
<vn-td expand>{{ticket.shipped | date: 'dd/MM/yyyy' | dashIfEmpty}}</vn-td> <vn-td expand>{{ticket.shipped | date: 'dd/MM/yyyy' | dashIfEmpty}}</vn-td>
<vn-td number>{{ticket.totalWithVat | currency: 'EUR': 2}}</vn-td> <vn-td number expand>{{ticket.totalWithVat | currency: 'EUR': 2}}</vn-td>
</vn-tr> </vn-tr>
</vn-tbody> </vn-tbody>
</vn-table> </vn-table>

5
modules/ticket/front/expedition/index.spec.js
View File

@ -76,9 +76,10 @@ describe('Ticket', () => {
it('should make a query and then call to the $state go() method', () => { it('should make a query and then call to the $state go() method', () => {
jest.spyOn(controller.$state, 'go').mockReturnThis(); jest.spyOn(controller.$state, 'go').mockReturnThis();
const landed = new Date();
const ticket = { const ticket = {
clientFk: 1101, clientFk: 1101,
landed: new Date(), landed: landed,
addressFk: 121, addressFk: 121,
agencyModeFk: 1, agencyModeFk: 1,
warehouseFk: 1 warehouseFk: 1
@ -90,7 +91,7 @@ describe('Ticket', () => {
const expectedParams = { const expectedParams = {
clientId: 1101, clientId: 1101,
landed: new Date(), landed: landed,
warehouseId: 1, warehouseId: 1,
addressId: 121, addressId: 121,
agencyModeId: 1, agencyModeId: 1,