use forked version of chai-as-promised for chai 5 compatibility + rem…

…ove chai-immutable

package.json

@@ -40,8 +40,7 @@
   },
   "devDependencies": {
     "chai": "5.0.0",
-    "chai-as-promised": "7.1.1",
-    "chai-immutable": "2.1.0",
+    "@rvagg/chai-as-promised": "8.0.1",
     "coveralls": "3.1.1",
     "cspell": "8.0.0",
     "eslint": "8.26.0",

test/test-history.js

@@ -6,7 +6,7 @@
 
 'use strict';
 
-import chai from 'chai';
+import * as chai from 'chai';
 
 import History from '../lib/history.js';
 

test/test-job.js

@@ -5,16 +5,13 @@
 
 'use strict';
 
-import chai from 'chai';
-import chaiImmutable from 'chai-immutable';
+import * as chai from 'chai';
 import Immutable from 'immutable';
 import Job from '../lib/job.js';
 
 const { expect } = chai;
 const { List } = Immutable;
 
-chai.use(chaiImmutable);
-
 describe('Job', () => {
   describe('object', () => {
     it('should be immutable (aka frozen)', () => {
@@ -48,7 +45,7 @@ describe('Job', () => {
     it('should successfully update a list of errors', () => {
       const job = new Job().set('errors', new List('error'));
 
-      expect(job.get('errors')).to.equal(new List('error'));
+      expect(job.get('errors')).to.eql(new List('error'));
     });
 
     it('should not accept non-string statuses', () => {

test/test-json-http-service.js

@@ -7,7 +7,7 @@
 
 'use strict';
 
-import chai from 'chai';
+import * as chai from 'chai';
 import JsonHttpService from '../lib/json-http-service.js';
 
 const { expect } = chai;

test/test-orchestrator.js

@@ -5,20 +5,18 @@
 
 'use strict';
 
-import chai from 'chai';
-import chaiAsPromised from 'chai-as-promised';
-import chaiImmutable from 'chai-immutable';
+import * as chai from 'chai';
+import chaiAsPromised from '@rvagg/chai-as-promised';
 import Immutable from 'immutable';
 import Promise from 'promise';
 import Job from '../lib/job.js';
 
 import Orchestrator from '../lib/orchestrator.js';
 import RequestState from '../lib/request-state.js';
 
-const { expect } = chai;
+const { assert, expect } = chai;
 
 chai.use(chaiAsPromised);
-chai.use(chaiImmutable);
 
 describe('Orchestrator', () => {
   describe('hasFinished(state)', () => {
@@ -126,7 +124,8 @@ describe('Orchestrator', () => {
     });
 
     it('should return a list with 2 elements', () => {
-      expect(resultOk).to.be.an.instanceOf(Immutable.List).and.to.have.size(2);
+      expect(resultOk).to.be.an.instanceOf(Immutable.List);
+      assert.equal(resultOk.size, 2);
     });
 
     it('should return Promises', () => {
@@ -156,11 +155,6 @@ describe('Orchestrator', () => {
         .get(1)
         .then(state => expect(state.jobs.get('dummy').status).to.equal('ok')));
 
-    it('should set the second returned state as successful job', () =>
-      resultOk
-        .get(1)
-        .then(state => expect(state.jobs.get('dummy').status).to.equal('ok')));
-
     it('should set the second returned state as failed job', () =>
       resultFailure
         .get(1)
@@ -171,7 +165,7 @@ describe('Orchestrator', () => {
     it('should return a state with errors when a job fails', () =>
       resultFailure
         .get(1)
-        .then(state => expect(state.jobs.get('dummy').errors).to.have.size(1)));
+        .then(state => assert.equal(state.jobs.get('dummy').errors.size, 1)));
 
     it('should return a failed state when a job fails', () =>
       expect(resultFailure.get(1)).to.eventually.have.property(
@@ -189,7 +183,7 @@ describe('Orchestrator', () => {
     it('should return a state with errors when a job errors', () =>
       resultError
         .get(1)
-        .then(state => expect(state.jobs.get('dummy').errors).to.have.size(1)));
+        .then(state => assert(state.jobs.get('dummy').errors.size, 1)));
 
     it('should return an errored state when a job errors', () =>
       expect(resultError.get(1)).to.eventually.have.property(

test/test-request-state.js

@@ -5,18 +5,15 @@
 
 'use strict';
 
-import chai from 'chai';
-import chaiImmutable from 'chai-immutable';
+import * as chai from 'chai';
 import Immutable from 'immutable';
 
 import Job from '../lib/job.js';
 
 import RequestState from '../lib/request-state.js';
 
 const { List, Map } = Immutable;
-const { expect } = chai;
-
-chai.use(chaiImmutable);
+const { assert, expect } = chai;
 
 describe('RequestState', () => {
   const state = new RequestState('something', new Map({ dummy: new Job() }));
@@ -54,7 +51,7 @@ describe('RequestState', () => {
       const newState = state.addToHistory('Some random fact');
 
       // TODO Improve test when History is refactored
-      expect(newState.get('history').facts).to.have.size(1);
+      assert.equal(newState.get('history').facts.size, 1);
     });
   });
 
@@ -91,7 +88,7 @@ describe('RequestState', () => {
     it('should update the status of a specific job', () => {
       const newState = state.setJobErrors('dummy', List.of('error'));
 
-      expect(newState.get('jobs').get('dummy').get('errors')).to.have.size(1);
+      assert.equal(newState.get('jobs').get('dummy').get('errors').size, 1);
     });
 
     it('should handle inexisting jobs', () => {

test/test.js

@@ -7,9 +7,8 @@
  * @module
  */
 
-import chai from 'chai';
-import chaiImmutable from 'chai-immutable';
-import chaiAsPromised from 'chai-as-promised';
+import * as chai from 'chai';
+import chaiAsPromised from '@rvagg/chai-as-promised';
 import Promise from 'promise';
 import Fs from 'fs';
 import Immutable from 'immutable';
@@ -36,10 +35,9 @@ const {
 // Switch the environment into testing mode
 process.env.NODE_ENV = 'dev';
 
-const { expect } = chai;
+const { assert, expect } = chai;
 const { List, Map } = Immutable;
 
-chai.use(chaiImmutable);
 chai.use(chaiAsPromised);
 
 let pendingTests = 6;
@@ -109,8 +107,12 @@ describe('DocumentDownloader', () => {
       expect(content).to.be.an.instanceOf(Promise);
     });
 
-    it('should promise a List of size 2', () =>
-      expect(content).to.eventually.be.an.instanceOf(List).of.size(2));
+    it('should promise a List of size 2', () => {
+      expect(content).to.eventually.be.an.instanceOf(List);
+      content.then(content => {
+        assert.equal(content.size, 2);
+      });
+    });
 
     it('should fetch multiple URLs', () =>
       content.then(content => {
@@ -341,7 +343,9 @@ describe('DocumentDownloader', () => {
         'img/image2.jpg',
       );
 
-      expect(DocumentDownloader.getFilenames(manifest)).to.equal(filenames);
+      DocumentDownloader.getFilenames(manifest).forEach((v, k) => {
+        assert.equal(v, filenames.get(k));
+      });
     });
   });
 
@@ -431,8 +435,11 @@ describe('SpecberusWrapper', () => {
       metadata,
     );
 
-    it('should return an error property that has 1 errors', () =>
-      expect(content).that.eventually.has.property('errors').that.has.size(1));
+    it('should return an error property that has 1 errors', () => {
+      content.then(content => {
+        assert.equal(content.errors.size, 1);
+      });
+    });
   });
 
   describe('validate(url-with-css-warnings)', () => {
@@ -445,8 +452,12 @@ describe('SpecberusWrapper', () => {
       metadata,
     );
 
-    it('should return an error property that has no errors', () =>
-      expect(content).that.eventually.has.property('errors').that.has.size(0));
+    it('should return an error property that has no errors', () => {
+      expect(content).that.eventually.has.property('errors');
+      content.then(content => {
+        assert.equal(content.errors.size, 0);
+      });
+    });
   });
 
   describe('extractMetadata(url)', () => {
@@ -667,14 +678,18 @@ describe('Publisher', () => {
       expect(promise).to.eventually.be.an.instanceOf(List));
 
     it('should return no errors if publication is successful', () =>
-      expect(promise).to.eventually.be.empty);
+      promise.then(promise => {
+        assert.equal(promise.size, 0);
+      }));
 
     it('should return errors when the publication has failed', () => {
       const errPromise = new Publisher(new BadRequestService()).publish(
         metadata,
       );
 
-      return expect(errPromise).to.eventually.have.size(1);
+      errPromise.then(content => {
+        assert.equal(content.size, 1);
+      });
     });
 
     it('should reject if not yet implemented', () => {