adress pr comments

dm3-org · Nov 21, 2024 · 7d14017 · 7d14017
1 parent 026f7f7
commit 7d14017
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 26 deletions.
diff --git a/packages/js-sdk/package.json b/packages/js-sdk/package.json
@@ -1,4 +1,3 @@
-
 {
     "name": "@dm3-org/dm3-js-sdk",
     "license": "BSD-2-Clause",

diff --git a/packages/js-sdk/src/Dm3Sdk.test.ts b/packages/js-sdk/src/Dm3Sdk.test.ts
@@ -42,7 +42,9 @@ describe('Dm3Sdk', () => {
             ethers.Wallet.createRandom(),
             'http://localhost:3000',
         );
+    });
 
+    beforeAll(() => {
         axiosMock = new MockAdapter(axios);
 
         //Mock BackendConnector HttpRequests
@@ -102,9 +104,8 @@ describe('Dm3Sdk', () => {
             });
 
             await dm3.conversations.addConversation('bob.eth');
-            const c = dm3.conversations.list;
-            expect(c.length).toBe(1);
-            expect(c[0].contact.name).toBe('bob.eth');
+            expect(dm3.conversations.list.length).toBe(1);
+            expect(dm3.conversations.list[0].contact.name).toBe('bob.eth');
         });
         it('can multiple conversations to the contact list', async () => {
             const mockTldResolver = {
@@ -156,12 +157,10 @@ describe('Dm3Sdk', () => {
 
             await dm3.conversations.addConversation('bob.eth');
             await dm3.conversations.addConversation('karl.eth');
-            const c = dm3.conversations.list;
-            dm3;
-            console.log(c);
-            expect(c.length).toBe(2);
-            expect(c[0].contact.name).toBe('bob.eth');
-            expect(c[1].contact.name).toBe('karl.eth');
+
+            expect(dm3.conversations.list.length).toBe(2);
+            expect(dm3.conversations.list[0].contact.name).toBe('bob.eth');
+            expect(dm3.conversations.list[1].contact.name).toBe('karl.eth');
         });
         it('dont add duplicate conversations', async () => {
             const mockTldResolver = {
@@ -192,9 +191,8 @@ describe('Dm3Sdk', () => {
 
             await dm3.conversations.addConversation('bob.eth');
             await dm3.conversations.addConversation('bob.eth');
-            const c = dm3.conversations.list;
-            expect(c.length).toBe(1);
-            expect(c[0].contact.name).toBe('bob.eth');
+            expect(dm3.conversations.list.length).toBe(1);
+            expect(dm3.conversations.list[0].contact.name).toBe('bob.eth');
         });
     });
 
@@ -231,12 +229,25 @@ describe('Dm3Sdk', () => {
 
             const msg1 = await msgFactory.createMessage('Hi');
 
-            const c = await dm3.conversations.addConversation('bob.eth');
-            expect(c?.messages.list().length).toBe(0);
-            await c?.messages.addMessage('bob.eth', msg1);
-
-            expect(c?.messages.list().length).toBe(1);
-            expect(c?.messages.list()[0].envelop.message.message).toBe('Hi');
+            expect(
+                (
+                    await dm3.conversations.addConversation('bob.eth')
+                )?.messages.list().length,
+            ).toBe(0);
+            await (
+                await dm3.conversations.addConversation('bob.eth')
+            )?.messages.addMessage('bob.eth', msg1);
+
+            expect(
+                (
+                    await dm3.conversations.addConversation('bob.eth')
+                )?.messages.list().length,
+            ).toBe(1);
+            expect(
+                (
+                    await dm3.conversations.addConversation('bob.eth')
+                )?.messages.list()[0].envelop.message.message,
+            ).toBe('Hi');
         });
         it('can send a message', async () => {
             const mockTldResolver = {
@@ -266,13 +277,26 @@ describe('Dm3Sdk', () => {
                 accountAddress: alice.address,
             });
 
-            const c = await dm3.conversations.addConversation('bob.eth');
-            expect(c?.messages.list().length).toBe(0);
-
-            await c?.messages.sendMessage('Hi');
-
-            expect(c?.messages.list().length).toBe(1);
-            expect(c?.messages.list()[0].envelop.message.message).toBe('Hi');
+            expect(
+                (
+                    await dm3.conversations.addConversation('bob.eth')
+                )?.messages.list().length,
+            ).toBe(0);
+
+            await (
+                await dm3.conversations.addConversation('bob.eth')
+            )?.messages.sendMessage('Hi');
+
+            expect(
+                (
+                    await dm3.conversations.addConversation('bob.eth')
+                )?.messages.list().length,
+            ).toBe(1);
+            expect(
+                (
+                    await dm3.conversations.addConversation('bob.eth')
+                )?.messages.list()[0].envelop.message.message,
+            ).toBe('Hi');
         });
     });
 });