From b6f1b0730a51dcfc6c8a97a84b021cadd0644bbf Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Tue, 12 Jul 2022 08:44:36 +0200
Subject: [PATCH] Change the orders and structure from the tests for
 listContributions.

---
 .../resolver/ContributionResolver.test.ts     | 75 +++++++++----------
 1 file changed, 35 insertions(+), 40 deletions(-)

diff --git a/backend/src/graphql/resolver/ContributionResolver.test.ts b/backend/src/graphql/resolver/ContributionResolver.test.ts
index 1e3034b59..b3d6aeb3c 100644
--- a/backend/src/graphql/resolver/ContributionResolver.test.ts
+++ b/backend/src/graphql/resolver/ContributionResolver.test.ts
@@ -150,6 +150,10 @@ describe('ContributionResolver', () => {
     describe('authenticated', () => {
       beforeAll(async () => {
         await userFactory(testEnv, bibiBloxberg)
+        await userFactory(testEnv, peterLustig)
+        const bibisCreation = creations.find((creation) => creation.email === 'bibi@bloxberg.de')
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+        await creationFactory(testEnv, bibisCreation!)
         await query({
           query: login,
           variables: { email: 'bibi@bloxberg.de', password: 'Aa12345_' },
@@ -163,46 +167,9 @@ describe('ContributionResolver', () => {
           },
         })
       })
-
-      it('returns only unconfirmed creations', async () => {
-        await expect(
-          query({
-            query: listContributions,
-            variables: {
-              currentPage: 1,
-              pageSize: 25,
-              order: 'DESC',
-              filterConfirmed: true,
-            },
-          }),
-        ).resolves.toEqual(
-          expect.objectContaining({
-            data: {
-              listContributions: expect.arrayContaining([
-                expect.objectContaining({
-                  id: expect.any(Number),
-                  memo: 'Test env contribution',
-                  amount: '100',
-                }),
-              ]),
-            },
-          }),
-        )
-      })
-
-      describe('Adding confirmed creations', () => {
-        beforeAll(async () => {
-          await userFactory(testEnv, peterLustig)
-          const bibisCreation = creations.find((creation) => creation.email === 'bibi@bloxberg.de')
-          // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-          await creationFactory(testEnv, bibisCreation!)
-          await query({
-            query: login,
-            variables: { email: 'bibi@bloxberg.de', password: 'Aa12345_' },
-          })
-        })
-
-        it('filter confirmed is false', async () => {
+      
+      describe('filter confirmed is false', () => {
+        it('returns creations', async () => {
           await expect(
             query({
               query: listContributions,
@@ -233,6 +200,34 @@ describe('ContributionResolver', () => {
           )
         })
       })
+
+      describe('filter confirmed is true', () => {
+        it('returns only unconfirmed creations', async () => {
+          await expect(
+            query({
+              query: listContributions,
+              variables: {
+                currentPage: 1,
+                pageSize: 25,
+                order: 'DESC',
+                filterConfirmed: true,
+              },
+            }),
+          ).resolves.toEqual(
+            expect.objectContaining({
+              data: {
+                listContributions: expect.arrayContaining([
+                  expect.objectContaining({
+                    id: expect.any(Number),
+                    memo: 'Test env contribution',
+                    amount: '100',
+                  }),
+                ]),
+              },
+            }),
+          )
+        })
+      })
     })
   })
 })