rewrite connect test (mqttjs#1417)

vishnureddy17 · web-flow · commit 25c91922f5af · 2022-02-08T10:38:23.000-08:00
diff --git a/src/client.ts b/src/client.ts
@@ -90,7 +90,11 @@ export class MqttClient extends EventEmitter {
 
     // Using this method to clean up the constructor to do options handling 
     logger.debug(`populating internal client options object...`);
-    this._options = {...defaultConnectOptions, ...options}
+    this._options = {
+      clientId: defaultClientId(),
+      ...defaultConnectOptions,
+      ...options
+    }
 
     this.conn = this._options.customStreamFactory? this._options.customStreamFactory(this._options) : connectionFactory(this._options);
   
@@ -144,10 +148,6 @@ export class MqttClient extends EventEmitter {
     })
   }
 
-  mergeDefaultOptions(options: ConnectOptions): ConnectOptions {
-    return {clientId: defaultClientId(), ...defaultConnectOptions, ...options}
-  }
-
   async handleIncomingPacket (packet: Packet): Promise<void> {
     logger.debug(`handleIncomingPacket packet.cmd=${packet.cmd}`);
     switch (packet.cmd) {
diff --git a/test/test_connect.js b/test/test_connect.js
@@ -44,19 +44,27 @@ test.before('set up aedes broker', async t => {
   });
 });
 
-/* TODO */
-test('should send a CONNECT packet to the broker and receive a CONNACK', async t => {
-  const client = await connect({
+test('should send a CONNECT packet to the broker and receive a CONNACK', (t) => {
+  t.plan(0)
+  const clientId = 'basic-connect-test'
+
+  let resolveClientConnected
+  const clientConnectedPromise = new Promise((resolve) => {
+    resolveClientConnected = resolve
+  })
+
+  const clientConnectedListener = (client) => {
+    if (client.id === clientId) {
+      t.context.broker.removeListener('client', clientConnectedListener)
+      resolveClientConnected()
+    }
+  }
+  t.context.broker.on('client', clientConnectedListener)
+  
+  const clientPromise = connect({
     brokerUrl: 'mqtt://localhost',
-  });
-  t.assert(!!client);
-});
+    clientId
+  })
 
-/**
- * 1) Send a Connect packet
- * 2) writeToStream returns false and emits an error on this.conn('error')
- * 
- * We shouldn't be throwing away the whole client because 1 packet failed.
- * 
- * UPDATE: matteo advises otherwise: https://github.com/mqttjs/mqtt-packet/issues/126#issuecomment-1029373619
- */
+  return Promise.all([clientConnectedPromise, clientPromise])
+})
