migrate tests to node:test
This commit is contained in:
@@ -4,7 +4,7 @@ import backupSites from '../../backupsites.js';
|
||||
import debugModule from 'debug';
|
||||
import constants from '../../constants.js';
|
||||
import database from '../../database.js';
|
||||
import expect from 'expect.js';
|
||||
import assert from 'node:assert/strict';
|
||||
import mailer from '../../mailer.js';
|
||||
import nock from 'nock';
|
||||
import oidcClients from '../../oidcclients.js';
|
||||
@@ -115,7 +115,7 @@ async function setup() {
|
||||
// setup
|
||||
let response = await superagent.post(`${serverUrl}/api/v1/provision/setup`)
|
||||
.send({ domainConfig: { provider: 'noop', domain: dashboardDomain, config: {}, tlsConfig: { provider: 'fallback' } } });
|
||||
expect(response.status).to.eql(200);
|
||||
assert.deepEqual(response.status, 200);
|
||||
|
||||
await timers.setTimeout(2000);
|
||||
|
||||
@@ -132,19 +132,19 @@ async function setup() {
|
||||
.query({ setupToken: 'somesetuptoken' })
|
||||
.send({ username: owner.username, password: owner.password, email: owner.email })
|
||||
.ok(() => true);
|
||||
expect(response.status).to.eql(201);
|
||||
assert.deepEqual(response.status, 201);
|
||||
owner.token = response.body.token;
|
||||
owner.id = response.body.userId;
|
||||
expect(scope1.isDone()).to.be.ok();
|
||||
assert.ok(scope1.isDone());
|
||||
scope1.persist(false);
|
||||
expect(scope2.isDone()).to.be.ok();
|
||||
assert.ok(scope2.isDone());
|
||||
scope2.persist(false);
|
||||
|
||||
// create an admin
|
||||
response = await superagent.post(`${serverUrl}/api/v1/users`)
|
||||
.query({ access_token: owner.token })
|
||||
.send({ username: admin.username, email: admin.email, password: admin.password, role: 'admin' });
|
||||
expect(response.status).to.equal(201);
|
||||
assert.equal(response.status, 201);
|
||||
admin.id = response.body.id;
|
||||
// HACK to get a token for second user (passwords are generated and the user should have gotten a password setup link...)
|
||||
const token1 = await tokens.add({ identifier: admin.id, clientId: oidcClients.ID_WEBADMIN, expires: Date.now() + (60 * 60 * 1000), name: 'fromtest', allowedIpRanges: '' });
|
||||
@@ -154,7 +154,7 @@ async function setup() {
|
||||
response = await superagent.post(`${serverUrl}/api/v1/users`)
|
||||
.query({ access_token: owner.token })
|
||||
.send({ username: user.username, email: user.email, password: user.password });
|
||||
expect(response.status).to.equal(201);
|
||||
assert.equal(response.status, 201);
|
||||
user.id = response.body.id;
|
||||
// HACK to get a token for second user (passwords are generated and the user should have gotten a password setup link...)
|
||||
const token2 = await tokens.add({ identifier: user.id, clientId: oidcClients.ID_WEBADMIN, expires: Date.now() + (60 * 60 * 1000), name: 'fromtest', allowedIpRanges: '' });
|
||||
@@ -182,7 +182,7 @@ function clearMailQueue() {
|
||||
|
||||
async function checkMails(number) {
|
||||
await timers.setTimeout(1000);
|
||||
expect(mailer._mailQueue.length).to.equal(number);
|
||||
assert.equal(mailer._mailQueue.length, number);
|
||||
clearMailQueue();
|
||||
}
|
||||
|
||||
@@ -191,7 +191,7 @@ async function waitForTask(taskId) {
|
||||
|
||||
for (let i = 0; i < 30; i++) {
|
||||
const result = await tasks.get(taskId);
|
||||
expect(result).to.not.be(null);
|
||||
assert.notEqual(result, null);
|
||||
if (!result.active) {
|
||||
if (result.success) return result;
|
||||
throw new Error(`Task ${taskId} failed: ${result.error.message} - ${result.error.stack}`);
|
||||
|
||||
Reference in New Issue
Block a user