Refactor remaining tests.

test/events/event.js

@@ -6,9 +6,7 @@ const Event = require('../../lib/events/event');
 const resources = require('../../lib/resources');
 
 describe('Events', function () {
-  afterEach(helpers.afterEach);
-
-  var rawEvent = {
+  const rawEvent = {
     message: '(service app) has started 4 bananas: (banana 8ddca76b-3ca5-4166-9cbb-aebdb8631861) (banana 630213ae-e078-491e-8b67-4d3e2d1ce6fd) (banana ec6a21c0-1f75-49fc-bbcd-144e77bd97b0) (banana f61d518f-ef95-40a8-9ce9-afd6e1ada4a7).'
   }
 
@@ -19,7 +17,7 @@ describe('Events', function () {
   }
 
   it('should extract banana resource identifiers', function () {
-    var event = new BananaEvent(null, rawEvent);
+    const event = new BananaEvent(null, rawEvent);
     expect(event.resources['bananas']).to.eql([
       '8ddca76b-3ca5-4166-9cbb-aebdb8631861',
       '630213ae-e078-491e-8b67-4d3e2d1ce6fd',
@@ -29,7 +27,7 @@ describe('Events', function () {
   });
 
   it('should load banana resources', function (done) {
-    var event = new BananaEvent('service', rawEvent);
+    const event = new BananaEvent('service', rawEvent);
 
     resources['bananas'] = function (service, ids, cb) {
       expect(service).to.equal('service');

test/events/steady-event.js

@@ -5,9 +5,7 @@ const expect = require('expect.js');
 const SteadyEvent = require('../../lib/events/steady-event');
 
 describe('Events:SteadyEvent', function () {
-  afterEach(helpers.afterEach);
-
-  var rawEvent = {
+  const rawEvent = {
     message: '(service app) has reached a steady state.'
   }
 

test/events/tasks-started.js

@@ -5,9 +5,7 @@ const expect = require('expect.js');
 const TasksStartedEvent = require('../../lib/events/tasks-started-event');
 
 describe('Events:TasksStartedEvent', function () {
-  afterEach(helpers.afterEach);
-
-  var rawEvent = {
+  const rawEvent = {
     message: '(service app) has started 4 tasks: (task 8ddca76b-3ca5-4166-9cbb-aebdb8631861) (task 630213ae-e078-491e-8b67-4d3e2d1ce6fd) (task ec6a21c0-1f75-49fc-bbcd-144e77bd97b0) (task f61d518f-ef95-40a8-9ce9-afd6e1ada4a7).'
   }
 

test/events/tasks-stopped.js

@@ -5,9 +5,7 @@ const expect = require('expect.js');
 const TasksStoppedEvent = require('../../lib/events/tasks-stopped-event');
 
 describe('Events:TasksStoppedEvent', function () {
-  afterEach(helpers.afterEach);
-
-  var rawEvent = {
+  const rawEvent = {
     message: '(service app) has stopped 2 running tasks: (task aaa9d935-0ab2-45a9-aaac-5c75ed18f9a4) (task ae0efe15-0633-44f7-84fc-c265f9618a78).'
   }
 

test/renderer/index.js

@@ -2,9 +2,7 @@
 
 const expect = require('expect.js');
 const _ = require('lodash');
-const AWS = require('aws-sdk-mock');
 const moment = require('moment');
-const sinon = require('sinon');
 const tk = require('timekeeper');
 const streamBuffers = require('stream-buffers');
 const EventEmitter = require('events');

test/renderer/states/not-found.js

@@ -10,7 +10,7 @@ const NotFoundRenderState = require('../../../lib/renderer/states/not-found');
 describe('Renderer:State:NotFound', function () {
   it('should include TaskDefinitionArn in done message', function () {
     let taskDefinitionArn = 'arn:taskdefinition:1';
-    var service = new EventEmitter();
+    const service = new EventEmitter();
     let deployment = new Deployment({ service: service, taskDefinitionArn: taskDefinitionArn });
     let bufferStream = new streamBuffers.WritableStreamBuffer();
 

test/renderer/states/tasks-started.js

@@ -10,7 +10,7 @@ const TasksStartedRenderState = require('../../../lib/renderer/states/tasks-star
 describe('Renderer:State:TasksStarted', function () {
   it('should include TaskDefinitionArn in done message', function () {
     let taskDefinitionArn = 'arn:taskdefinition:1';
-    var service = new EventEmitter();
+    const service = new EventEmitter();
     let bufferStream = new streamBuffers.WritableStreamBuffer();
     let deployment = new Deployment({ service: service, taskDefinitionArn: taskDefinitionArn });
     deployment.tasksStarted.push('task1');

test/resources/tasks.js

@@ -1,23 +1,30 @@
 'use strict'
 
 const expect = require('expect.js');
+const { mockClient } = require('aws-sdk-client-mock');
+const {
+  ECS,
+  DescribeTasksCommand
+} = require('@aws-sdk/client-ecs');
 
 const tasks = require('../../lib/resources/tasks');
 
 describe('Resources:Tasks', function () {
-  afterEach(helpers.afterEach);
+  const ecsMock = mockClient(ECS);
+  afterEach(() => { ecsMock.reset(); });
+  beforeEach(() => { ecsMock.reset(); });
 
   it('should load tasks from AWS', function (done) {
-    AWS.mock('ECS', 'describeTasks', function (params, cb) {
+    ecsMock.on(DescribeTasksCommand).callsFake((params) => {
       expect(params).to.eql({
         cluster: 'yo',
         tasks: ['task1', 'task2']
       });
 
-      cb(null, { tasks: [1, 2] });
+      return Promise.resolve({ tasks: [1, 2] });
     });
 
-    var service = { options: { clusterArn: 'yo' } };
+    const service = { options: { clusterArn: 'yo' } };
 
     tasks(service, ['task1', 'task2'], (err, tasks) => {
       expect(err).to.equal(null);

test/service.js

@@ -51,6 +51,9 @@ describe('Service', function () {
     serviceTasks = sinon
       .stub(Service.prototype, '_tasks')
       .callsFake(() => serviceDependencyFixtures['tasks']);
+
+    ecsMock.reset();
+    elbMock.reset();
   });
 
   afterEach(() => {