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

Merge branch 'dev' into 3791-travel_extra-community
gitea/salix/pipeline/head This commit looks good Details

This commit is contained in:
Carlos Jimenez Ruiz 2022-03-29 10:21:31 +00:00
parent 9ad782cb59 6e8499ddfb
commit b68e458890
5 changed files with 1566 additions and 908 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
db/dump/dumpedFixtures.sql
View File

File diff suppressed because one or more lines are too long

1524
db/dump/structure.sql
View File

File diff suppressed because it is too large Load Diff

2
e2e/paths/06-claim/02_development.spec.js
View File

@ -66,7 +66,7 @@ describe('Claim development', () => {
.waitToGetProperty(selectors.claimDevelopment.firstClaimRedelivery, 'value'); .waitToGetProperty(selectors.claimDevelopment.firstClaimRedelivery, 'value');
expect(reason).toEqual('Calor'); expect(reason).toEqual('Calor');
expect(result).toEqual('Cocido'); expect(result).toEqual('Baboso/Cocido');
expect(responsible).toEqual('Calidad general'); expect(responsible).toEqual('Calidad general');
expect(worker).toEqual('adminAssistantNick'); expect(worker).toEqual('adminAssistantNick');
expect(redelivery).toEqual('Cliente'); expect(redelivery).toEqual('Cliente');

2
e2e/paths/09-invoice-out/03_manualInvoice.spec.js
View File

@ -50,7 +50,7 @@ describe('InvoiceOut manual invoice path', () => {
}); });
it('should create an invoice from a client', async() => { it('should create an invoice from a client', async() => {
await page.autocompleteSearch(selectors.invoiceOutIndex.manualInvoiceClient, 'Charles Xavier'); await page.autocompleteSearch(selectors.invoiceOutIndex.manualInvoiceClient, 'Max Eisenhardt');
await page.autocompleteSearch(selectors.invoiceOutIndex.manualInvoiceSerial, 'Global nacional'); await page.autocompleteSearch(selectors.invoiceOutIndex.manualInvoiceSerial, 'Global nacional');
await page.autocompleteSearch(selectors.invoiceOutIndex.manualInvoiceTaxArea, 'national'); await page.autocompleteSearch(selectors.invoiceOutIndex.manualInvoiceTaxArea, 'national');
await page.waitToClick(selectors.invoiceOutIndex.saveInvoice); await page.waitToClick(selectors.invoiceOutIndex.saveInvoice);

4
modules/monitor/back/methods/sales-monitor/specs/salesFilter.spec.js
View File

@ -222,8 +222,8 @@ describe('SalesMonitor salesFilter()', () => {
const firstTicket = result.shift(); const firstTicket = result.shift();
const secondTicket = result.shift(); const secondTicket = result.shift();
expect(firstTicket.totalProblems).toEqual(3); expect(firstTicket.totalProblems).toEqual(1);
expect(secondTicket.totalProblems).toEqual(2); expect(secondTicket.totalProblems).toEqual(1);
await tx.rollback(); await tx.rollback();
} catch (e) { } catch (e) {