Merge remote-tracking branch 'origin/develop' into bootstrap5

This commit is contained in:
Julian Lam
2022-09-21 12:12:27 -04:00
25 changed files with 231 additions and 95 deletions

View File

@@ -194,8 +194,11 @@ describe('API', async () => {
const socketAdmin = require('../src/socket.io/admin');
// export data for admin user
await socketUser.exportProfile({ uid: adminUid }, { uid: adminUid });
await wait(2000);
await socketUser.exportPosts({ uid: adminUid }, { uid: adminUid });
await wait(2000);
await socketUser.exportUploads({ uid: adminUid }, { uid: adminUid });
await wait(2000);
await socketAdmin.user.exportUsersCSV({ uid: adminUid }, {});
// wait for export child process to complete
await wait(5000);

View File

@@ -425,6 +425,7 @@ describe('Post\'s', () => {
cid: cid,
title: 'topic to edit',
content: 'A post to edit',
tags: ['nodebb'],
}, (err, data) => {
assert.ifError(err);
pid = data.postData.pid;

View File

@@ -212,7 +212,7 @@ describe('Upload Controllers', () => {
assert.ifError(err);
assert.strictEqual(res.statusCode, 500);
assert(body && body.status && body.status.message);
assert(body.status.message.startsWith('Input file has corrupt header: pngload: end of stream'));
assert.strictEqual(body.status.message, 'Input file contains unsupported image format');
done();
});
});