Disconnect clients at end of tests

reactiflux · Aug 9, 2020 · 6a98615 · 6a98615
1 parent 1a1ead9
commit 6a98615
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 1 deletion.
diff --git a/lib/bot.js b/lib/bot.js
@@ -133,6 +133,12 @@ class Bot {
     this.attachListeners();
   }
 
+  disconnect() {
+    this.ircClient.disconnect();
+    this.discord.destroy();
+    Object.values(this.webhooks).forEach(x => x.client.destroy());
+  }
+
   attachListeners() {
     this.discord.on('ready', () => {
       logger.info('Connected to Discord');

diff --git a/test/bot-events.test.js b/test/bot-events.test.js
@@ -7,6 +7,7 @@ import discord from 'discord.js';
 import Bot from '../lib/bot';
 import logger from '../lib/logger';
 import createDiscordStub from './stubs/discord-stub';
+import createWebhookStub from './stubs/webhook-stub';
 import ClientStub from './stubs/irc-client-stub';
 import config from './fixtures/single-test-config.json';
 
@@ -25,7 +26,6 @@ describe('Bot Events', function () {
     bot.sendToIRC = sandbox.stub();
     bot.sendToDiscord = sandbox.stub();
     bot.sendExactToDiscord = sandbox.stub();
-    // TODO: investigate this making tests hang?
     return bot;
   };
 
@@ -37,13 +37,15 @@ describe('Bot Events', function () {
     this.sendStub = sandbox.stub();
     irc.Client = ClientStub;
     discord.Client = createDiscordStub(this.sendStub);
+    discord.WebhookClient = createWebhookStub(this.sendStub);
     ClientStub.prototype.send = sandbox.stub();
     ClientStub.prototype.join = sandbox.stub();
     this.bot = createBot();
     this.bot.connect();
   });
 
   afterEach(function () {
+    this.bot.disconnect();
     sandbox.restore();
   });
 

diff --git a/test/stubs/discord-stub.js b/test/stubs/discord-stub.js
@@ -25,6 +25,8 @@ export default function createDiscordStub(sendStub) {
       this.rest = this.createRestStub();
     }
 
+    destroy() {}
+
     addTextChannel(guild, textChannel) {
       const textChannelData = {
         type: discord.Constants.ChannelTypes.TEXT,

diff --git a/test/stubs/irc-client-stub.js b/test/stubs/irc-client-stub.js
@@ -1,10 +1,13 @@
 import events from 'events';
 
+/* eslint-disable class-methods-use-this */
 class ClientStub extends events.EventEmitter {
   constructor(...args) {
     super();
     this.nick = args[1]; // eslint-disable-line prefer-destructuring
   }
+
+  disconnect() {}
 }
 
 export default ClientStub;
diff --git a/test/stubs/webhook-stub.js b/test/stubs/webhook-stub.js
@@ -10,5 +10,7 @@ export default function createWebhookStub(sendWebhookMessage) {
       sendWebhookMessage(...args);
       return new Promise(() => {});
     }
+
+    destroy() {}
   };
 }