IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2025-12-13 07:45:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into fix-error-message-in-user-resolver

Browse Source
This commit is contained in:
mahula 2023-02-01 10:01:06 +01:00 committed by GitHub
commit f83666cae6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.github/workflows/lint_pr.yml vendored
View File

@ -1,7 +1,6 @@
name: "gradido lint pull request CI" name: "gradido lint pull request CI"
on: on:
pull_request:
pull_request_target: pull_request_target:
types: types:
- opened - opened

18
backend/src/graphql/resolver/util/creations.test.ts
View File

@ -62,7 +62,7 @@ describe('util/creation', () => {
amount: 160.0, amount: 160.0,
memo: 'Admin contribution for the last month', memo: 'Admin contribution for the last month',
creationDate: contributionDateFormatter( creationDate: contributionDateFormatter(
new Date(now.getFullYear(), now.getMonth() - 1, now.getDate()), new Date(now.getFullYear(), now.getMonth() - 1, 1),
), ),
}, },
}) })
@ -73,7 +73,7 @@ describe('util/creation', () => {
amount: 450.0, amount: 450.0,
memo: 'Admin contribution for two months ago', memo: 'Admin contribution for two months ago',
creationDate: contributionDateFormatter( creationDate: contributionDateFormatter(
new Date(now.getFullYear(), now.getMonth() - 2, now.getDate()), new Date(now.getFullYear(), now.getMonth() - 2, 1),
), ),
}, },
}) })
@ -95,7 +95,7 @@ describe('util/creation', () => {
amount: 500.0, amount: 500.0,
memo: 'Contribution for the last month', memo: 'Contribution for the last month',
creationDate: contributionDateFormatter( creationDate: contributionDateFormatter(
new Date(now.getFullYear(), now.getMonth() - 1, now.getDate()), new Date(now.getFullYear(), now.getMonth() - 1, 1),
), ),
}, },
}) })
@ -114,9 +114,7 @@ describe('util/creation', () => {
}), }),
expect.objectContaining({ expect.objectContaining({
userId: user.id, userId: user.id,
contributionDate: setZeroHours( contributionDate: setZeroHours(new Date(now.getFullYear(), now.getMonth() - 1, 1)),
new Date(now.getFullYear(), now.getMonth() - 1, now.getDate()),
),
amount: expect.decimalEqual(160), amount: expect.decimalEqual(160),
memo: 'Admin contribution for the last month', memo: 'Admin contribution for the last month',
moderatorId: admin.id, moderatorId: admin.id,
@ -125,9 +123,7 @@ describe('util/creation', () => {
}), }),
expect.objectContaining({ expect.objectContaining({
userId: user.id, userId: user.id,
contributionDate: setZeroHours( contributionDate: setZeroHours(new Date(now.getFullYear(), now.getMonth() - 2, 1)),
new Date(now.getFullYear(), now.getMonth() - 2, now.getDate()),
),
amount: expect.decimalEqual(450), amount: expect.decimalEqual(450),
memo: 'Admin contribution for two months ago', memo: 'Admin contribution for two months ago',
moderatorId: admin.id, moderatorId: admin.id,
@ -145,9 +141,7 @@ describe('util/creation', () => {
}), }),
expect.objectContaining({ expect.objectContaining({
userId: user.id, userId: user.id,
contributionDate: setZeroHours( contributionDate: setZeroHours(new Date(now.getFullYear(), now.getMonth() - 1, 1)),
new Date(now.getFullYear(), now.getMonth() - 1, now.getDate()),
),
amount: expect.decimalEqual(500), amount: expect.decimalEqual(500),
memo: 'Contribution for the last month', memo: 'Contribution for the last month',
moderatorId: null, moderatorId: null,