use new MockRelay class in relay.test.ts

relay.test.ts

@@ -2,43 +2,57 @@ import { expect, test } from 'bun:test'
 
 import { finalizeEvent, generateSecretKey, getPublicKey } from './pure.ts'
 import { Relay } from './relay.ts'
-import { newMockRelay } from './test-helpers.ts'
+import { MockRelay } from './test-helpers.ts'
 
 test('connectivity', async () => {
-  const { url } = newMockRelay()
+  const mockRelay = new MockRelay()
-  const relay = new Relay(url)
+
+  const relay = new Relay(mockRelay.getUrl())
   await relay.connect()
+
   expect(relay.connected).toBeTrue()
+
   relay.close()
+  mockRelay.close()
+  mockRelay.stop()
 })
 
 test('connectivity, with Relay.connect()', async () => {
-  const { url } = newMockRelay()
+  const mockRelay = new MockRelay()
-  const relay = await Relay.connect(url)
+
+  const relay = await Relay.connect(mockRelay.getUrl())
+
   expect(relay.connected).toBeTrue()
+
   relay.close()
+  mockRelay.close()
+  mockRelay.stop()
 })
 
 test('querying', async done => {
-  const { url, authors } = newMockRelay()
+  const mockRelay = new MockRelay()
+
   const kind = 0
 
-  const relay = new Relay(url)
+  const relay = new Relay(mockRelay.getUrl())
   await relay.connect()
 
   relay.subscribe(
     [
       {
-        authors: authors,
+        authors: mockRelay.getAuthors(),
         kinds: [kind],
       },
     ],
     {
       onevent(event) {
-        expect(authors).toContain(event.pubkey)
+        expect(mockRelay.getAuthors()).toContain(event.pubkey)
         expect(event).toHaveProperty('kind', kind)
 
         relay.close()
+        mockRelay.close()
+        mockRelay.stop()
+
         done()
       },
     },
@@ -46,12 +60,13 @@ test('querying', async done => {
 })
 
 test('listening and publishing and closing', async done => {
+  const mockRelay = new MockRelay()
+
   const sk = generateSecretKey()
   const pk = getPublicKey(sk)
   const kind = 23571
 
-  const { url } = newMockRelay()
+  const relay = new Relay(mockRelay.getUrl())
-  const relay = new Relay(url)
   await relay.connect()
 
   let sub = relay.subscribe(
@@ -66,11 +81,15 @@ test('listening and publishing and closing', async done => {
         expect(event).toHaveProperty('pubkey', pk)
         expect(event).toHaveProperty('kind', kind)
         expect(event).toHaveProperty('content', 'content')
-        sub.close()
+
+        sub.close() // close the subscription and will trigger onclose()
       },
-      oneose() {},
       onclose() {
         relay.close()
+
+        mockRelay.close()
+        mockRelay.stop()
+
         done()
       },
     },