diff --git a/backend/src/graphql/resolver/ContributionResolver.test.ts b/backend/src/graphql/resolver/ContributionResolver.test.ts index 93a31fb77..5b2c0fcaf 100644 --- a/backend/src/graphql/resolver/ContributionResolver.test.ts +++ b/backend/src/graphql/resolver/ContributionResolver.test.ts @@ -96,11 +96,10 @@ afterAll(async () => { describe('ContributionResolver', () => { let bibi: any - let peter: any beforeAll(async () => { bibi = await userFactory(testEnv, bibiBloxberg) - admin = peter = await userFactory(testEnv, peterLustig) + admin = await userFactory(testEnv, peterLustig) await userFactory(testEnv, raeuberHotzenplotz) const bibisCreation = creations.find((creation) => creation.email === 'bibi@bloxberg.de') // eslint-disable-next-line @typescript-eslint/no-non-null-assertion @@ -1163,6 +1162,9 @@ describe('ContributionResolver', () => { expect(contributionListObject).toMatchObject({ contributionCount: 7, contributionList: expect.arrayContaining([ + expect.not.objectContaining({ + state: 'DELETED', + }), expect.objectContaining({ amount: '100', state: 'CONFIRMED', @@ -1181,12 +1183,6 @@ describe('ContributionResolver', () => { memo: 'Test contribution to deny', amount: '100', }), - expect.not.objectContaining({ - id: contributionToDelete.data.createContribution.id, - state: 'DELETED', - memo: 'Test contribution to delete', - amount: '100', - }), expect.objectContaining({ id: inProgressContribution.data.createContribution.id, state: 'IN_PROGRESS', @@ -1230,6 +1226,9 @@ describe('ContributionResolver', () => { expect(contributionListObject).toMatchObject({ contributionCount: 7, contributionList: expect.arrayContaining([ + expect.not.objectContaining({ + state: 'DELETED', + }), expect.objectContaining({ amount: '100', state: 'CONFIRMED', @@ -1248,12 +1247,6 @@ describe('ContributionResolver', () => { memo: 'Test contribution to deny', amount: '100', }), - expect.not.objectContaining({ - id: contributionToDelete.data.createContribution.id, - state: 'DELETED', - memo: 'Test contribution to delete', - amount: '100', - }), expect.objectContaining({ id: inProgressContribution.data.createContribution.id, state: 'IN_PROGRESS', @@ -1297,6 +1290,9 @@ describe('ContributionResolver', () => { expect(contributionListObject).toMatchObject({ contributionCount: 7, contributionList: expect.arrayContaining([ + expect.not.objectContaining({ + state: 'DELETED', + }), expect.objectContaining({ amount: '100', state: 'CONFIRMED', @@ -1315,12 +1311,6 @@ describe('ContributionResolver', () => { memo: 'Test contribution to deny', amount: '100', }), - expect.not.objectContaining({ - id: contributionToDelete.data.createContribution.id, - state: 'DELETED', - memo: 'Test contribution to delete', - amount: '100', - }), expect.objectContaining({ id: inProgressContribution.data.createContribution.id, state: 'IN_PROGRESS', @@ -1370,30 +1360,6 @@ describe('ContributionResolver', () => { id: contributionToConfirm.data.createContribution.id, memo: 'Test contribution to confirm', }), - expect.not.objectContaining({ - id: pendingContribution.data.createContribution.id, - state: 'PENDING', - memo: 'Test PENDING contribution update', - amount: '10', - }), - expect.not.objectContaining({ - id: contributionToDeny.data.createContribution.id, - state: 'DENIED', - memo: 'Test contribution to deny', - amount: '100', - }), - expect.not.objectContaining({ - id: contributionToDelete.data.createContribution.id, - state: 'DELETED', - memo: 'Test contribution to delete', - amount: '100', - }), - expect.not.objectContaining({ - id: inProgressContribution.data.createContribution.id, - state: 'IN_PROGRESS', - memo: 'Test IN_PROGRESS contribution', - amount: '100', - }), expect.objectContaining({ id: bibiCreatedContribution.id, state: 'CONFIRMED', @@ -1407,10 +1373,16 @@ describe('ContributionResolver', () => { amount: '166', }), expect.not.objectContaining({ - id: expect.any(Number), + state: 'PENDING', + }), + expect.not.objectContaining({ state: 'DENIED', - memo: 'Whatever contribution', - amount: '166', + }), + expect.not.objectContaining({ + state: 'DELETED', + }), + expect.not.objectContaining({ + state: 'IN_PROGRESS', }), ]), }) @@ -1432,10 +1404,16 @@ describe('ContributionResolver', () => { contributionCount: 1, contributionList: expect.arrayContaining([ expect.not.objectContaining({ - amount: '100', state: 'CONFIRMED', - id: contributionToConfirm.data.createContribution.id, - memo: 'Test contribution to confirm', + }), + expect.not.objectContaining({ + state: 'DENIED', + }), + expect.not.objectContaining({ + state: 'DELETED', + }), + expect.not.objectContaining({ + state: 'IN_PROGRESS', }), expect.objectContaining({ id: pendingContribution.data.createContribution.id, @@ -1443,42 +1421,6 @@ describe('ContributionResolver', () => { memo: 'Test PENDING contribution update', amount: '10', }), - expect.not.objectContaining({ - id: contributionToDeny.data.createContribution.id, - state: 'DENIED', - memo: 'Test contribution to deny', - amount: '100', - }), - expect.not.objectContaining({ - id: contributionToDelete.data.createContribution.id, - state: 'DELETED', - memo: 'Test contribution to delete', - amount: '100', - }), - expect.not.objectContaining({ - id: inProgressContribution.data.createContribution.id, - state: 'IN_PROGRESS', - memo: 'Test IN_PROGRESS contribution', - amount: '100', - }), - expect.not.objectContaining({ - id: bibiCreatedContribution.id, - state: 'CONFIRMED', - memo: 'Herzlich Willkommen bei Gradido!', - amount: '1000', - }), - expect.not.objectContaining({ - id: expect.any(Number), - state: 'CONFIRMED', - memo: 'Whatever contribution', - amount: '166', - }), - expect.not.objectContaining({ - id: expect.any(Number), - state: 'DENIED', - memo: 'Whatever contribution', - amount: '166', - }), ]), }) }) @@ -1499,28 +1441,16 @@ describe('ContributionResolver', () => { contributionCount: 1, contributionList: expect.arrayContaining([ expect.not.objectContaining({ - amount: '100', state: 'CONFIRMED', - id: contributionToConfirm.data.createContribution.id, - memo: 'Test contribution to confirm', }), expect.not.objectContaining({ - id: pendingContribution.data.createContribution.id, state: 'PENDING', - memo: 'Test PENDING contribution update', - amount: '10', }), expect.not.objectContaining({ - id: contributionToDeny.data.createContribution.id, state: 'DENIED', - memo: 'Test contribution to deny', - amount: '100', }), expect.not.objectContaining({ - id: contributionToDelete.data.createContribution.id, state: 'DELETED', - memo: 'Test contribution to delete', - amount: '100', }), expect.objectContaining({ id: inProgressContribution.data.createContribution.id, @@ -1528,24 +1458,6 @@ describe('ContributionResolver', () => { memo: 'Test IN_PROGRESS contribution', amount: '100', }), - expect.not.objectContaining({ - id: bibiCreatedContribution.id, - state: 'CONFIRMED', - memo: 'Herzlich Willkommen bei Gradido!', - amount: '1000', - }), - expect.not.objectContaining({ - id: expect.any(Number), - state: 'CONFIRMED', - memo: 'Whatever contribution', - amount: '166', - }), - expect.not.objectContaining({ - id: expect.any(Number), - state: 'DENIED', - memo: 'Whatever contribution', - amount: '166', - }), ]), }) }) @@ -1565,54 +1477,30 @@ describe('ContributionResolver', () => { expect(contributionListObject).toMatchObject({ contributionCount: 2, contributionList: expect.arrayContaining([ - expect.not.objectContaining({ - amount: '100', - state: 'CONFIRMED', - id: contributionToConfirm.data.createContribution.id, - memo: 'Test contribution to confirm', - }), - expect.not.objectContaining({ - id: pendingContribution.data.createContribution.id, - state: 'PENDING', - memo: 'Test PENDING contribution update', - amount: '10', - }), expect.objectContaining({ id: contributionToDeny.data.createContribution.id, state: 'DENIED', memo: 'Test contribution to deny', amount: '100', }), - expect.not.objectContaining({ - id: contributionToDelete.data.createContribution.id, - state: 'DELETED', - memo: 'Test contribution to delete', - amount: '100', - }), - expect.not.objectContaining({ - id: inProgressContribution.data.createContribution.id, - state: 'IN_PROGRESS', - memo: 'Test IN_PROGRESS contribution', - amount: '100', - }), - expect.not.objectContaining({ - id: bibiCreatedContribution.id, - state: 'CONFIRMED', - memo: 'Herzlich Willkommen bei Gradido!', - amount: '1000', - }), - expect.not.objectContaining({ - id: expect.any(Number), - state: 'CONFIRMED', - memo: 'Whatever contribution', - amount: '166', - }), expect.objectContaining({ id: expect.any(Number), state: 'DENIED', memo: 'Whatever contribution', amount: '166', }), + expect.not.objectContaining({ + state: 'CONFIRMED', + }), + expect.not.objectContaining({ + state: 'DELETED', + }), + expect.not.objectContaining({ + state: 'IN_PROGRESS', + }), + expect.not.objectContaining({ + state: 'PENDING', + }), ]), }) }) @@ -1662,42 +1550,27 @@ describe('ContributionResolver', () => { memo: 'Test PENDING contribution update', amount: '10', }), - expect.not.objectContaining({ - id: contributionToDeny.data.createContribution.id, - state: 'DENIED', - memo: 'Test contribution to deny', - amount: '100', - }), - expect.not.objectContaining({ - id: contributionToDelete.data.createContribution.id, - state: 'DELETED', - memo: 'Test contribution to delete', - amount: '100', - }), - expect.not.objectContaining({ - id: inProgressContribution.data.createContribution.id, - state: 'IN_PROGRESS', - memo: 'Test IN_PROGRESS contribution', - amount: '100', - }), expect.objectContaining({ id: bibiCreatedContribution.id, state: 'CONFIRMED', memo: 'Herzlich Willkommen bei Gradido!', amount: '1000', }), - expect.not.objectContaining({ - id: expect.any(Number), - state: 'DENIED', - memo: 'Whatever contribution', - amount: '166', - }), expect.objectContaining({ id: expect.any(Number), state: 'CONFIRMED', memo: 'Whatever contribution', amount: '166', }), + expect.not.objectContaining({ + state: 'DENIED', + }), + expect.not.objectContaining({ + state: 'DELETED', + }), + expect.not.objectContaining({ + state: 'IN_PROGRESS', + }), ]), }) })