export assertions through chai

nikkhn · nikkhn · commit e17bd8eb3415 · 2021-02-18T11:35:41.000-10:00
diff --git a/test/features/app/app.js b/test/features/app/app.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const preq   = require('preq');
-const { assert } = require('../../utils/assert.js');
+const assert = require('../../utils/assert.js');
 const Server = require('../../utils/server.js');
 
 describe('express app', function () {
diff --git a/test/features/app/spec.js b/test/features/app/spec.js
@@ -2,7 +2,7 @@
 
 const parallel = require('mocha.parallel');
 const preq   = require('preq');
-const { assert } = require('../../utils/assert.js');
+const assert = require('../../utils/assert.js');
 const Server = require('../../utils/server.js');
 const URI    = require('swagger-router').URI;
 const OpenAPISchemaValidator = require('openapi-schema-validator').default;
diff --git a/test/features/ex/errors.js b/test/features/ex/errors.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const preq   = require('preq');
-const { assert } = require('../../utils/assert.js');
+const assert = require('../../utils/assert.js');
 const Server = require('../../utils/server.js');
 
 describe('errors', function () {
diff --git a/test/features/info/info.js b/test/features/info/info.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const preq   = require('preq');
-const { assert } = require('../../utils/assert.js');
+const assert = require('../../utils/assert.js');
 const Server = require('../../utils/server.js');
 
 describe('service information', function () {
diff --git a/test/features/v1/page.js b/test/features/v1/page.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const preq   = require('preq');
-const { assert } = require('../../utils/assert.js');
+const assert = require('../../utils/assert.js');
 const Server = require('../../utils/server.js');
 
 describe('page gets', function () {
diff --git a/test/features/v1/siteinfo.js b/test/features/v1/siteinfo.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const preq   = require('preq');
-const { assert } = require('../../utils/assert.js');
+const assert = require('../../utils/assert.js');
 const Server = require('../../utils/server.js');
 
 describe('wiki site info', function () {
diff --git a/test/utils/assert.js b/test/utils/assert.js
@@ -1,54 +1,37 @@
 'use strict';
 
-const { assert } = require('chai');
+const { use } = require('chai');
 
-/**
- * Asserts whether the return status was as expected
- *
- * @param {Object} res
- * @param {integer} expected
- */
-function status(res, expected) {
+module.exports = use(function (_chai, _utils) {
+	const { assert } = _chai;
 
-    assert.deepEqual(res.status, expected,
-        `Expected status to be ${expected}, but was ${res.status}`);
+    assert.status = (res, expected) => {
+        const msg = `Expected status to be ${expected}, but was ${res.status}`;
+        new _chai.Assertion(res.status, msg, assert.status, true).to.eql(expected);
+    };
 
-}
+    assert.contentType = (res, expectedRegexString) => {
+        const actual = res.headers['content-type'];
+        const msg = `Expected content-type to match ${expectedRegexString}, but was ${actual}`;
+        new _chai.Assertion(actual, msg, assert.contentType, true).to.match(RegExp(expectedRegexString));
+    };
 
-/**
- * Asserts whether content type was as expected
- *
- * @param {Object} res
- * @param {string} expectedRegexString
- */
-function contentType(res, expectedRegexString) {
+    assert.fails = (promise, onRejected) => {
 
-    const actual = res.headers['content-type'];
-    assert.ok(RegExp(expectedRegexString).test(actual),
-        `Expected content-type to match ${expectedRegexString}, but was ${actual}`);
+        let failed = false;
 
-}
-
-function fails(promise, onRejected) {
-
-    let failed = false;
-
-    function trackFailure(e) {
-        failed = true;
-        return onRejected(e);
-    }
-
-    function check() {
-        if (!failed) {
-            throw new Error('expected error was not thrown');
+        function trackFailure(e) {
+            failed = true;
+            return onRejected(e);
         }
-    }
 
-    return promise.catch(trackFailure).then(check);
+        function check() {
+            if (!failed) {
+                throw new Error('expected error was not thrown');
+            }
+        }
+        return promise.catch(trackFailure).then(check);
 
-}
+    };
 
-module.exports.assert = assert;
-module.exports.assert.contentType = contentType;
-module.exports.assert.status = status;
-module.exports.assert.fails = fails;
+}).assert;
