3638-export_database #899

Merged
joan merged 17 commits from 3638-export_database into dev 2022-03-23 10:43:17 +00:00
2 changed files with 3 additions and 3 deletions
Showing only changes of commit 6a91fe6c11 - Show all commits

View File

@ -28,8 +28,8 @@ describe('ticket setDeleted()', () => {
expect(error.message).toEqual('You must delete the claim id %d first');
});
it('should delete the ticket, remove the stowaway link and change the stowaway ticket state to "FIXING" and get rid of the itemshelving', async() => {
// test excluded by task #3693
xit('should delete the ticket, remove the stowaway link and change the stowaway ticket state to "FIXING" and get rid of the itemshelving', async() => {
const tx = await models.Ticket.beginTransaction({});
try {

View File

@ -12,6 +12,6 @@ describe('Worker getWorkedHours()', () => {
const [result] = await models.Worker.getWorkedHours(workerID, started, ended);
expect(result.expectedHours).toEqual(28800); // 8:00 hours in seconds
expect(result.workedHours).toEqual(29400); // 8:10 hours in seconds
expect(result.workedHours).toEqual(28200); // 7:50 hours in seconds
});
});