Compare commits

..

No commits in common. "30c6d3d8db9fe37a51e596a73add8b87e8616e54" and "01ed51489eb92fff907d46a930ecf0b0eb5cad2b" have entirely different histories.

2 changed files with 4 additions and 8 deletions

View File

@ -182,7 +182,6 @@ describe('POST /api/donations/fixed successfully', () => {
"donor": added_donor, "donor": added_donor,
"amount": 1000, "amount": 1000,
"payedAmount": 0, "payedAmount": 0,
"status": "OPEN",
"responseType": "DONATION" "responseType": "DONATION"
}); });
}); });
@ -199,7 +198,6 @@ describe('POST /api/donations/fixed successfully', () => {
"donor": added_donor, "donor": added_donor,
"amount": 1000, "amount": 1000,
"payedAmount": 1000, "payedAmount": 1000,
"status": "PAYED",
"responseType": "DONATION" "responseType": "DONATION"
}); });
}); });
@ -238,7 +236,7 @@ describe('POST /api/donations/distance successfully', () => {
expect(res.status).toEqual(200); expect(res.status).toEqual(200);
expect(res.headers['content-type']).toContain("application/json") expect(res.headers['content-type']).toContain("application/json")
}); });
it('creating a new distance donation with most params should return 200', async () => { it('creating a new fixed donation with most params should return 200', async () => {
const res = await axios.post(base + '/api/donations/distance', { const res = await axios.post(base + '/api/donations/distance', {
"runner": added_runner.id, "runner": added_runner.id,
"amountPerDistance": 100, "amountPerDistance": 100,
@ -253,11 +251,10 @@ describe('POST /api/donations/distance successfully', () => {
"runner": added_runner, "runner": added_runner,
"amount": 0, "amount": 0,
"payedAmount": 0, "payedAmount": 0,
"status": "PAYED",
"responseType": "DISTANCEDONATION" "responseType": "DISTANCEDONATION"
}) })
}); });
it('creating a new distance donation with all params should return 200', async () => { it('creating a new fixed donation with all params should return 200', async () => {
const res = await axios.post(base + '/api/donations/distance', { const res = await axios.post(base + '/api/donations/distance', {
"runner": added_runner.id, "runner": added_runner.id,
"amountPerDistance": 100, "amountPerDistance": 100,
@ -273,7 +270,6 @@ describe('POST /api/donations/distance successfully', () => {
"runner": added_runner, "runner": added_runner,
"amount": 0, "amount": 0,
"payedAmount": 1000, "payedAmount": 1000,
"status": "PAYED",
"responseType": "DISTANCEDONATION" "responseType": "DISTANCEDONATION"
}) })
}); });

View File

@ -222,7 +222,7 @@ describe('adding + updating fixed donation valid', () => {
}, axios_config); }, axios_config);
expect(res.status).toEqual(200); expect(res.status).toEqual(200);
expect(res.headers['content-type']).toContain("application/json"); expect(res.headers['content-type']).toContain("application/json");
expect(res.data.payedAmount).toEqual(10); expect(res.data.amount).toEqual(42);
}); });
it('updating donor should return 200', async () => { it('updating donor should return 200', async () => {
const res = await axios.put(base + '/api/donations/fixed/' + added_donation.id, { const res = await axios.put(base + '/api/donations/fixed/' + added_donation.id, {
@ -339,7 +339,7 @@ describe('adding + updating distance donation valid', () => {
delete res.data.donor.donationAmount; delete res.data.donor.donationAmount;
expect(res.status).toEqual(200); expect(res.status).toEqual(200);
expect(res.headers['content-type']).toContain("application/json"); expect(res.headers['content-type']).toContain("application/json");
expect(res.data.payedAmount).toEqual(10); expect(res.data.amountPerDistance).toEqual(69);
}); });
it('updating runner should return 200', async () => { it('updating runner should return 200', async () => {
const res = await axios.put(base + '/api/donations/distance/' + added_donation.id, { const res = await axios.put(base + '/api/donations/distance/' + added_donation.id, {