mirror of
https://github.com/NodeBB/NodeBB.git
synced 2026-03-06 04:21:17 +01:00
Merge branch 'master' into develop
This commit is contained in:
@@ -985,15 +985,15 @@ describe('Post\'s', () => {
|
||||
assert.equal(posts[1].data.content, 'this is a queued reply');
|
||||
});
|
||||
|
||||
it('should error if data is invalid', (done) => {
|
||||
socketPosts.editQueuedContent({ uid: globalModUid }, null, (err) => {
|
||||
assert.equal(err.message, '[[error:invalid-data]]');
|
||||
done();
|
||||
});
|
||||
it('should error if data is invalid', async () => {
|
||||
await assert.rejects(
|
||||
apiPosts.editQueuedPost({ uid: globalModUid }, null),
|
||||
{ message: '[[error:invalid-data]]' },
|
||||
);
|
||||
});
|
||||
|
||||
it('should edit post in queue', async () => {
|
||||
await socketPosts.editQueuedContent({ uid: globalModUid }, { id: queueId, content: 'newContent' });
|
||||
await apiPosts.editQueuedPost({ uid: globalModUid }, { id: queueId, content: 'newContent' });
|
||||
const { body } = await request.get(`${nconf.get('url')}/api/post-queue`, { jar });
|
||||
const { posts } = body;
|
||||
assert.equal(posts[1].type, 'reply');
|
||||
@@ -1001,7 +1001,7 @@ describe('Post\'s', () => {
|
||||
});
|
||||
|
||||
it('should edit topic title in queue', async () => {
|
||||
await socketPosts.editQueuedContent({ uid: globalModUid }, { id: topicQueueId, title: 'new topic title' });
|
||||
await apiPosts.editQueuedPost({ uid: globalModUid }, { id: topicQueueId, title: 'new topic title' });
|
||||
const { body } = await request.get(`${nconf.get('url')}/api/post-queue`, { jar });
|
||||
const { posts } = body;
|
||||
assert.equal(posts[0].type, 'topic');
|
||||
@@ -1009,39 +1009,39 @@ describe('Post\'s', () => {
|
||||
});
|
||||
|
||||
it('should edit topic category in queue', async () => {
|
||||
await socketPosts.editQueuedContent({ uid: globalModUid }, { id: topicQueueId, cid: 2 });
|
||||
await apiPosts.editQueuedPost({ uid: globalModUid }, { id: topicQueueId, cid: 2 });
|
||||
const { body } = await request.get(`${nconf.get('url')}/api/post-queue`, { jar });
|
||||
const { posts } = body;
|
||||
assert.equal(posts[0].type, 'topic');
|
||||
assert.equal(posts[0].data.cid, 2);
|
||||
await socketPosts.editQueuedContent({ uid: globalModUid }, { id: topicQueueId, cid: cid });
|
||||
await apiPosts.editQueuedPost({ uid: globalModUid }, { id: topicQueueId, cid: cid });
|
||||
});
|
||||
|
||||
it('should prevent regular users from approving posts', (done) => {
|
||||
socketPosts.accept({ uid: uid }, { id: queueId }, (err) => {
|
||||
assert.equal(err.message, '[[error:no-privileges]]');
|
||||
done();
|
||||
});
|
||||
it('should prevent regular users from approving posts', async () => {
|
||||
await assert.rejects(
|
||||
apiPosts.acceptQueuedPost({ uid: uid }, { id: queueId }),
|
||||
{ message: '[[error:no-privileges]]' },
|
||||
);
|
||||
});
|
||||
|
||||
it('should prevent regular users from approving non existing posts', (done) => {
|
||||
socketPosts.accept({ uid: uid }, { id: 123123 }, (err) => {
|
||||
assert.equal(err.message, '[[error:no-post]]');
|
||||
done();
|
||||
});
|
||||
it('should prevent regular users from approving non existing posts', async () => {
|
||||
await assert.rejects(
|
||||
apiPosts.acceptQueuedPost({ uid: uid }, { id: 123123 }),
|
||||
{ message: '[[error:no-post]]' },
|
||||
);
|
||||
});
|
||||
|
||||
it('should accept queued posts and submit', async () => {
|
||||
const ids = await db.getSortedSetRange('post:queue', 0, -1);
|
||||
await socketPosts.accept({ uid: globalModUid }, { id: ids[0] });
|
||||
await socketPosts.accept({ uid: globalModUid }, { id: ids[1] });
|
||||
await apiPosts.acceptQueuedPost({ uid: globalModUid }, { id: ids[0] });
|
||||
await apiPosts.acceptQueuedPost({ uid: globalModUid }, { id: ids[1] });
|
||||
});
|
||||
|
||||
it('should not crash if id does not exist', (done) => {
|
||||
socketPosts.reject({ uid: globalModUid }, { id: '123123123' }, (err) => {
|
||||
assert.equal(err.message, '[[error:no-post]]');
|
||||
done();
|
||||
});
|
||||
it('should not crash if id does not exist', async () => {
|
||||
await assert.rejects(
|
||||
apiPosts.removeQueuedPost({ uid: globalModUid }, { id: '123123123' }),
|
||||
{ message: '[[error:no-post]]' },
|
||||
);
|
||||
});
|
||||
|
||||
it('should bypass post queue if user is in exempt group', async () => {
|
||||
|
||||
Reference in New Issue
Block a user