updated tests
gitea/salix/1915-claim_regularize_fk This commit looks good
Details
gitea/salix/1915-claim_regularize_fk This commit looks good
Details
This commit is contained in:
parent
a1c6c0ab39
commit
61408bdfd5
|
@ -141,6 +141,8 @@ class Controller {
|
||||||
const query = `GreugeTypes/findOne?${serializedParams}`;
|
const query = `GreugeTypes/findOne?${serializedParams}`;
|
||||||
return this.$http.get(query).then(res => {
|
return this.$http.get(query).then(res => {
|
||||||
this.greugeTypeFreightId = res.data.id;
|
this.greugeTypeFreightId = res.data.id;
|
||||||
|
|
||||||
|
return res;
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -148,6 +150,8 @@ class Controller {
|
||||||
const query = `GreugeConfigs/findOne`;
|
const query = `GreugeConfigs/findOne`;
|
||||||
return this.$http.get(query).then(res => {
|
return this.$http.get(query).then(res => {
|
||||||
this.freightPickUpPrice = res.data.freightPickUpPrice;
|
this.freightPickUpPrice = res.data.freightPickUpPrice;
|
||||||
|
|
||||||
|
return res;
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -158,7 +162,7 @@ class Controller {
|
||||||
promises.push(this.getGreugeTypeId());
|
promises.push(this.getGreugeTypeId());
|
||||||
promises.push(this.getGreugeConfig());
|
promises.push(this.getGreugeConfig());
|
||||||
|
|
||||||
Promise.all(promises).then(() => {
|
return Promise.all(promises).then(() => {
|
||||||
const data = {
|
const data = {
|
||||||
clientFk: this.claim.clientFk,
|
clientFk: this.claim.clientFk,
|
||||||
description: this.$translate.instant('ClaimGreugeDescription', {
|
description: this.$translate.instant('ClaimGreugeDescription', {
|
||||||
|
@ -168,7 +172,7 @@ class Controller {
|
||||||
greugeTypeFk: this.greugeTypeFreightId,
|
greugeTypeFk: this.greugeTypeFreightId,
|
||||||
ticketFk: this.claim.ticketFk
|
ticketFk: this.claim.ticketFk
|
||||||
};
|
};
|
||||||
this.$http.post(`Greuges/`, data).then(() => {
|
return this.$http.post(`Greuges/`, data).then(() => {
|
||||||
this.vnApp.showSuccess(this.$translate.instant('Data saved!'));
|
this.vnApp.showSuccess(this.$translate.instant('Data saved!'));
|
||||||
this.vnApp.showMessage(this.$translate.instant('Greuge inserted'));
|
this.vnApp.showMessage(this.$translate.instant('Greuge inserted'));
|
||||||
});
|
});
|
||||||
|
|
|
@ -165,7 +165,7 @@ describe('claim', () => {
|
||||||
expect(controller.vnApp.showSuccess).not.toHaveBeenCalledWith('Greuge inserted!');
|
expect(controller.vnApp.showSuccess).not.toHaveBeenCalledWith('Greuge inserted!');
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should perform a insert into greuges', () => {
|
it('should make a query and get the greugeTypeId and greuge config', () => {
|
||||||
spyOn(controller.card, 'reload');
|
spyOn(controller.card, 'reload');
|
||||||
spyOn(controller.vnApp, 'showSuccess');
|
spyOn(controller.vnApp, 'showSuccess');
|
||||||
|
|
||||||
|
@ -173,12 +173,44 @@ describe('claim', () => {
|
||||||
$httpBackend.expect('GET', `GreugeTypes/findOne?${greugeTypeParams}`).respond({id: 7});
|
$httpBackend.expect('GET', `GreugeTypes/findOne?${greugeTypeParams}`).respond({id: 7});
|
||||||
$httpBackend.expect('GET', `GreugeConfigs/findOne`).respond({freightPickUpPrice: 11});
|
$httpBackend.expect('GET', `GreugeConfigs/findOne`).respond({freightPickUpPrice: 11});
|
||||||
controller.onUpdateGreugeResponse('accept');
|
controller.onUpdateGreugeResponse('accept');
|
||||||
|
|
||||||
$httpBackend.flush();
|
$httpBackend.flush();
|
||||||
|
|
||||||
expect(controller.greugeTypeFreightId).toEqual(7);
|
expect(controller.greugeTypeFreightId).toEqual(7);
|
||||||
expect(controller.freightPickUpPrice).toEqual(11);
|
expect(controller.freightPickUpPrice).toEqual(11);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// #1957 - Investigate how to test nested httpBackend requests
|
||||||
|
xit('should perform a insert into greuges', () => {
|
||||||
|
spyOn(controller.card, 'reload');
|
||||||
|
spyOn(controller.vnApp, 'showSuccess');
|
||||||
|
|
||||||
|
spyOn(controller, 'getGreugeTypeId').and.returnValue(new Promise(resolve => {
|
||||||
|
return resolve({id: 7});
|
||||||
|
}));
|
||||||
|
spyOn(controller, 'getGreugeConfig').and.returnValue(new Promise(resolve => {
|
||||||
|
return resolve({freightPickUpPrice: 11});
|
||||||
|
}));
|
||||||
|
|
||||||
|
controller.claim.clientFk = 101;
|
||||||
|
controller.claim.id = 11;
|
||||||
|
let data = {
|
||||||
|
clientFk: 101,
|
||||||
|
description: `claim: ${controller.claim.id}`,
|
||||||
|
amount: 11,
|
||||||
|
greugeTypeFk: 7,
|
||||||
|
ticketFk: controller.claim.ticketFk
|
||||||
|
};
|
||||||
|
$httpBackend.expect('POST', `Greuges/`, data).respond(new Promise(resolve => {
|
||||||
|
return resolve({id: 11});
|
||||||
|
}));
|
||||||
|
controller.onUpdateGreugeResponse('accept').then(res => {
|
||||||
|
console.log('asdas');
|
||||||
|
}).catch(error => {
|
||||||
|
console.log('errorrrr!!');
|
||||||
|
});
|
||||||
|
|
||||||
|
$httpBackend.flush();
|
||||||
|
});
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
Loading…
Reference in New Issue