From d0fb80483ea4f1186f62ea77c254fb4c35f5b014 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Mon, 20 Jun 2022 12:09:09 +0200 Subject: [PATCH 01/12] Update admin/src/components/ChangeUserRoleFormular.spec.js Co-authored-by: Moriz Wahl --- admin/src/components/ChangeUserRoleFormular.spec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/src/components/ChangeUserRoleFormular.spec.js b/admin/src/components/ChangeUserRoleFormular.spec.js index 7df3209ed..d824508a9 100644 --- a/admin/src/components/ChangeUserRoleFormular.spec.js +++ b/admin/src/components/ChangeUserRoleFormular.spec.js @@ -52,7 +52,7 @@ describe('ChangeUserRoleFormular', () => { wrapper = Wrapper() }) - it('a DIV element with the class.delete-user-formular', () => { + it('has a DIV element with the class.delete-user-formular', () => { expect(wrapper.find('.change-user-role-formular').exists()).toBe(true) }) }) From 7e266f9ec1feed1ca925f2fbf9e2a90e64ae5519 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Mon, 20 Jun 2022 12:09:29 +0200 Subject: [PATCH 02/12] Update admin/src/components/ChangeUserRoleFormular.spec.js Co-authored-by: Moriz Wahl --- admin/src/components/ChangeUserRoleFormular.spec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/src/components/ChangeUserRoleFormular.spec.js b/admin/src/components/ChangeUserRoleFormular.spec.js index d824508a9..d75f1da63 100644 --- a/admin/src/components/ChangeUserRoleFormular.spec.js +++ b/admin/src/components/ChangeUserRoleFormular.spec.js @@ -72,7 +72,7 @@ describe('ChangeUserRoleFormular', () => { expect(wrapper.text()).toContain('userRole.notChangeYourSelf') }) - it('role select is disabled', () => { + it('has role select disabled', () => { expect(wrapper.find('select[disabled="disabled"]').exists()).toBe(true) }) }) From 53a90d299c89283100ad1c04162d0091933c2221 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Mon, 20 Jun 2022 12:09:43 +0200 Subject: [PATCH 03/12] Update admin/src/components/ChangeUserRoleFormular.spec.js Co-authored-by: Moriz Wahl --- admin/src/components/ChangeUserRoleFormular.spec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/src/components/ChangeUserRoleFormular.spec.js b/admin/src/components/ChangeUserRoleFormular.spec.js index d75f1da63..c4ed2e4d1 100644 --- a/admin/src/components/ChangeUserRoleFormular.spec.js +++ b/admin/src/components/ChangeUserRoleFormular.spec.js @@ -104,7 +104,7 @@ describe('ChangeUserRoleFormular', () => { expect(wrapper.find('select.role-select').exists()).toBe(true) }) - it('role select is enabled', () => { + it('has role select enabled', () => { expect(wrapper.find('select.role-select[disabled="disabled"]').exists()).toBe(false) }) From d12cf4c987836bc1eabf223ab93884ece474aaf2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Mon, 20 Jun 2022 12:10:01 +0200 Subject: [PATCH 04/12] Update admin/src/components/ChangeUserRoleFormular.spec.js Co-authored-by: Moriz Wahl --- admin/src/components/ChangeUserRoleFormular.spec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/src/components/ChangeUserRoleFormular.spec.js b/admin/src/components/ChangeUserRoleFormular.spec.js index c4ed2e4d1..b1941df60 100644 --- a/admin/src/components/ChangeUserRoleFormular.spec.js +++ b/admin/src/components/ChangeUserRoleFormular.spec.js @@ -138,7 +138,7 @@ describe('ChangeUserRoleFormular', () => { rolesToSelect = wrapper.find('select.role-select').findAll('option') }) - it('select is set to "usual user"', () => { + it('has selected option set to "usual user"', () => { expect(wrapper.find('select.role-select').element.value).toBe('user') }) From 638e58c84e76f57c546ab92d3de94c9622c93f59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Mon, 20 Jun 2022 12:10:08 +0200 Subject: [PATCH 05/12] Update backend/src/graphql/resolver/AdminResolver.test.ts Co-authored-by: Moriz Wahl --- backend/src/graphql/resolver/AdminResolver.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/graphql/resolver/AdminResolver.test.ts b/backend/src/graphql/resolver/AdminResolver.test.ts index 2993c216f..ce1406e42 100644 --- a/backend/src/graphql/resolver/AdminResolver.test.ts +++ b/backend/src/graphql/resolver/AdminResolver.test.ts @@ -141,7 +141,7 @@ describe('AdminResolver', () => { }) describe('user gets new role', () => { - describe('is admin', () => { + describe('to admin', () => { it('returns date string', async () => { const result = await mutate({ mutation: setUserRole, From 6bf2a63e17b39f9231e75f4f2dfc9d3c82a4d15c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Mon, 20 Jun 2022 12:10:25 +0200 Subject: [PATCH 06/12] Update admin/src/components/ChangeUserRoleFormular.spec.js Co-authored-by: Moriz Wahl --- admin/src/components/ChangeUserRoleFormular.spec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/src/components/ChangeUserRoleFormular.spec.js b/admin/src/components/ChangeUserRoleFormular.spec.js index b1941df60..dcbc2ca62 100644 --- a/admin/src/components/ChangeUserRoleFormular.spec.js +++ b/admin/src/components/ChangeUserRoleFormular.spec.js @@ -144,7 +144,7 @@ describe('ChangeUserRoleFormular', () => { describe('change select to', () => { describe('same role', () => { - it('not calling the API', () => { + it('does not call the API', () => { rolesToSelect.at(0).setSelected() expect(apolloMutateMock).not.toHaveBeenCalled() }) From 7064bc33c361d7199cacc4b84ede779596a28055 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Mon, 20 Jun 2022 12:10:55 +0200 Subject: [PATCH 07/12] Update admin/src/components/ChangeUserRoleFormular.spec.js Co-authored-by: Moriz Wahl --- admin/src/components/ChangeUserRoleFormular.spec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/src/components/ChangeUserRoleFormular.spec.js b/admin/src/components/ChangeUserRoleFormular.spec.js index dcbc2ca62..1290c3a9c 100644 --- a/admin/src/components/ChangeUserRoleFormular.spec.js +++ b/admin/src/components/ChangeUserRoleFormular.spec.js @@ -204,7 +204,7 @@ describe('ChangeUserRoleFormular', () => { rolesToSelect = wrapper.find('select.role-select').findAll('option') }) - it('select is set to "admin"', () => { + it('has selected option set to "admin"', () => { expect(wrapper.find('select.role-select').element.value).toBe('admin') }) From f1a23fe9b72bad83c392e151a7e27ba4cb50b726 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Mon, 20 Jun 2022 12:11:30 +0200 Subject: [PATCH 08/12] Update backend/src/graphql/resolver/AdminResolver.test.ts Co-authored-by: Moriz Wahl --- backend/src/graphql/resolver/AdminResolver.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/graphql/resolver/AdminResolver.test.ts b/backend/src/graphql/resolver/AdminResolver.test.ts index ce1406e42..5514c6f41 100644 --- a/backend/src/graphql/resolver/AdminResolver.test.ts +++ b/backend/src/graphql/resolver/AdminResolver.test.ts @@ -159,7 +159,7 @@ describe('AdminResolver', () => { }) describe('is usual user', () => { - it('returns string', async () => { + it('returns null', async () => { await expect( mutate({ mutation: setUserRole, variables: { userId: user.id, isAdmin: false } }), ).resolves.toEqual( From d9becacb4cf2186e353719e9a7faac0eb906dbaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Mon, 20 Jun 2022 12:11:38 +0200 Subject: [PATCH 09/12] Update backend/src/graphql/resolver/AdminResolver.test.ts Co-authored-by: Moriz Wahl --- backend/src/graphql/resolver/AdminResolver.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/graphql/resolver/AdminResolver.test.ts b/backend/src/graphql/resolver/AdminResolver.test.ts index 5514c6f41..103e163ee 100644 --- a/backend/src/graphql/resolver/AdminResolver.test.ts +++ b/backend/src/graphql/resolver/AdminResolver.test.ts @@ -188,7 +188,7 @@ describe('AdminResolver', () => { }) describe('user has already role to be set', () => { - describe('is admin', () => { + describe('to admin', () => { it('throws an error', async () => { await mutate({ mutation: setUserRole, From 036a9666935cd41c2ecf8fae2732ff12eff4dcad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Mon, 20 Jun 2022 12:11:49 +0200 Subject: [PATCH 10/12] Update backend/src/graphql/resolver/AdminResolver.test.ts Co-authored-by: Moriz Wahl --- backend/src/graphql/resolver/AdminResolver.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/graphql/resolver/AdminResolver.test.ts b/backend/src/graphql/resolver/AdminResolver.test.ts index 103e163ee..c9201075a 100644 --- a/backend/src/graphql/resolver/AdminResolver.test.ts +++ b/backend/src/graphql/resolver/AdminResolver.test.ts @@ -204,7 +204,7 @@ describe('AdminResolver', () => { }) }) - describe('is usual user', () => { + describe('to usual user', () => { it('throws an error', async () => { await mutate({ mutation: setUserRole, From 00a224f0ce38b7e5fb63abe64f39b008e25632a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Mon, 20 Jun 2022 12:12:01 +0200 Subject: [PATCH 11/12] Update backend/src/graphql/resolver/AdminResolver.test.ts Co-authored-by: Moriz Wahl --- backend/src/graphql/resolver/AdminResolver.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/graphql/resolver/AdminResolver.test.ts b/backend/src/graphql/resolver/AdminResolver.test.ts index c9201075a..404ed519e 100644 --- a/backend/src/graphql/resolver/AdminResolver.test.ts +++ b/backend/src/graphql/resolver/AdminResolver.test.ts @@ -158,7 +158,7 @@ describe('AdminResolver', () => { }) }) - describe('is usual user', () => { + describe('to usual user', () => { it('returns null', async () => { await expect( mutate({ mutation: setUserRole, variables: { userId: user.id, isAdmin: false } }), From 67f045837877669abfe0678ec5357f03ee0de53a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Mon, 20 Jun 2022 12:12:14 +0200 Subject: [PATCH 12/12] Update admin/src/components/ChangeUserRoleFormular.spec.js Co-authored-by: Moriz Wahl --- admin/src/components/ChangeUserRoleFormular.spec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/src/components/ChangeUserRoleFormular.spec.js b/admin/src/components/ChangeUserRoleFormular.spec.js index 1290c3a9c..ccb5c0587 100644 --- a/admin/src/components/ChangeUserRoleFormular.spec.js +++ b/admin/src/components/ChangeUserRoleFormular.spec.js @@ -210,7 +210,7 @@ describe('ChangeUserRoleFormular', () => { describe('change select to', () => { describe('same role', () => { - it('not calling the API', () => { + it('does not call the API', () => { rolesToSelect.at(1).setSelected() expect(apolloMutateMock).not.toHaveBeenCalled() })