From 2b1e6746169b05756125d37595c5744aea12b8ee Mon Sep 17 00:00:00 2001
From: JGiter <dimaadipmi@gmail.com>
Date: Fri, 27 May 2022 11:28:43 +0300
Subject: [PATCH] fix: exchange credential tests grouping

---
 e2e/verifiable-credentials.service.e2e.ts | 86 ++++++++++++-----------
 1 file changed, 44 insertions(+), 42 deletions(-)

diff --git a/e2e/verifiable-credentials.service.e2e.ts b/e2e/verifiable-credentials.service.e2e.ts
index f9d59208..9ed7d609 100644
--- a/e2e/verifiable-credentials.service.e2e.ts
+++ b/e2e/verifiable-credentials.service.e2e.ts
@@ -381,56 +381,58 @@ describe('Verifiable credentials tests', () => {
 
     beforeEach(async () => {
       requiredCredentials = await createExampleSignedCredential([]);
+      const vp =
+        await verifiableCredentialsService.createVerifiablePresentation([
+          requiredCredentials,
+        ]);
       (axios as jest.Mocked<typeof axios>).post.mockImplementation((url) => {
         return Promise.resolve({
           data: url === exchangeUrl ? vpRequest : '',
         });
       });
-      getClaimsBySubject.mockResolvedValue([requiredCredentials]);
-
-      test('initiateExchange() should return presentation matching presentation request', async () => {
-        const vc = await createExampleSignedCredential([]);
-        vc;
-        (axios as jest.Mocked<typeof axios>).post.mockImplementationOnce(
-          (url) => {
-            return Promise.resolve({
-              data: url === exchangeUrl ? vpRequest : '',
-            });
-          }
-        );
-
-        const [{ selectResults }] =
-          await verifiableCredentialsService.initiateExchange({
-            type: VC_API_EXCHANGE,
-            url: exchangeUrl,
-          });
-        expect(selectResults.verifiableCredential).toHaveLength(1);
-      });
+      getClaimsBySubject.mockResolvedValue([{ vp }]);
+    });
 
-      test('continueExchange() should return issued credentials', async () => {
-        const [{ selectResults }] =
-          await verifiableCredentialsService.initiateExchange({
-            type: VC_API_EXCHANGE,
-            url: exchangeUrl,
+    test('initiateExchange() should return presentation matching presentation request', async () => {
+      (axios as jest.Mocked<typeof axios>).post.mockImplementationOnce(
+        (url) => {
+          return Promise.resolve({
+            data: url === exchangeUrl ? vpRequest : '',
           });
+        }
+      );
 
-        (axios as jest.Mocked<typeof axios>).put.mockImplementationOnce((url) =>
-          Promise.resolve({
-            data:
-              url === vpRequest.interact.service[0].serviceEndpoint
-                ? { errors: [], vp: issuedPresentation, vpRequest: undefined }
-                : null,
-          })
-        );
-
-        expect(
-          await verifiableCredentialsService.continueExchange({
-            vpRequest,
-            credentials:
-              selectResults.verifiableCredential as VerifiableCredential<RoleCredentialSubject>[],
-          })
-        ).toEqual(issuedPresentation);
-      });
+      const [{ selectResults }] =
+        await verifiableCredentialsService.initiateExchange({
+          type: VC_API_EXCHANGE,
+          url: exchangeUrl,
+        });
+      expect(selectResults.verifiableCredential).toHaveLength(1);
+    });
+
+    test('continueExchange() should return issued credentials', async () => {
+      const [{ selectResults }] =
+        await verifiableCredentialsService.initiateExchange({
+          type: VC_API_EXCHANGE,
+          url: exchangeUrl,
+        });
+
+      (axios as jest.Mocked<typeof axios>).put.mockImplementationOnce((url) =>
+        Promise.resolve({
+          data:
+            url === vpRequest.interact.service[0].serviceEndpoint
+              ? { errors: [], vp: issuedPresentation, vpRequest: undefined }
+              : null,
+        })
+      );
+
+      expect(
+        await verifiableCredentialsService.continueExchange({
+          vpRequest,
+          credentials:
+            selectResults.verifiableCredential as VerifiableCredential<RoleCredentialSubject>[],
+        })
+      ).toEqual(issuedPresentation);
     });
   });
 });