From 8dc120230574a9658666c7aeee1cc0e04a841467 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Thu, 9 Jun 2022 16:38:29 +0200
Subject: [PATCH] Fix 'setUserRole' resolver tests

---
 .../graphql/resolver/AdminResolver.test.ts    | 58 ++++++++-----------
 1 file changed, 23 insertions(+), 35 deletions(-)

diff --git a/backend/src/graphql/resolver/AdminResolver.test.ts b/backend/src/graphql/resolver/AdminResolver.test.ts
index 979acf952..94ce87e55 100644
--- a/backend/src/graphql/resolver/AdminResolver.test.ts
+++ b/backend/src/graphql/resolver/AdminResolver.test.ts
@@ -135,22 +135,24 @@ describe('AdminResolver', () => {
             user = await userFactory(testEnv, bibiBloxberg)
           })
 
-          it('returns date string', async () => {
-            const result = await mutate({
-              mutation: setUserRole,
-              variables: { userId: user.id, isAdmin: true },
-            })
-            expect(result).toEqual(
-              expect.objectContaining({
-                data: {
-                  setUserRole: expect.any(String),
-                },
-              }),
-            )
-            expect(new Date(result.data.setUserRole)).toEqual(expect.any(Date))
-          })
-
           describe('user gets new role', () => {
+            describe('is admin', () => {
+              it('returns date string', async () => {
+                const result = await mutate({
+                  mutation: setUserRole,
+                  variables: { userId: user.id, isAdmin: true },
+                })
+                expect(result).toEqual(
+                  expect.objectContaining({
+                    data: {
+                      setUserRole: expect.any(String),
+                    },
+                  }),
+                )
+                expect(new Date(result.data.setUserRole)).toEqual(expect.any(Date))
+              })
+            })
+
             describe('is usual user', () => {
               it('returns string', async () => {
                 await expect(
@@ -158,24 +160,7 @@ describe('AdminResolver', () => {
                 ).resolves.toEqual(
                   expect.objectContaining({
                     data: {
-                      setUserRole: expect.any(String),
-                    },
-                  }),
-                )
-              })
-            })
-
-            describe('is admin', () => {
-              it('returns string', async () => {
-                await expect(
-                  mutate({
-                    mutation: setUserRole,
-                    variables: { userId: user.id, isAdmin: true },
-                  }),
-                ).resolves.toEqual(
-                  expect.objectContaining({
-                    data: {
-                      setUserRole: expect.any(String),
+                      setUserRole: null,
                     },
                   }),
                 )
@@ -184,8 +169,7 @@ describe('AdminResolver', () => {
           })
         })
 
-        // Wolle
-        describe.skip('change role with error', () => {
+        describe('change role with error', () => {
           describe('is own role', () => {
             it('throws an error', async () => {
               await expect(
@@ -201,6 +185,10 @@ describe('AdminResolver', () => {
           describe('user has already role to be set', () => {
             describe('is admin', () => {
               it('throws an error', async () => {
+                await mutate({
+                  mutation: setUserRole,
+                  variables: { userId: user.id, isAdmin: true },
+                })
                 await expect(
                   mutate({ mutation: setUserRole, variables: { userId: user.id, isAdmin: true } }),
                 ).resolves.toEqual(