Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-12-20 15:30:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: #7567, allow invite and approval at the same time

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2019-06-04 11:10:20 -04:00
parent a097b19293
commit 4b843ba16f
9 changed files with 49 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
test/user.js
View File

@@ -1588,13 +1588,11 @@ describe('User', function () {
});
describe('approval queue', function () {
var socketAdmin = require('../src/socket.io/admin');
var oldRegistrationType;
var oldRegistrationApprovalType;
var adminUid;
before(function (done) {
oldRegistrationType = meta.config.registrationType;
meta.config.registrationType = 'admin-approval';
oldRegistrationApprovalType = meta.config.registrationApprovalType;
meta.config.registrationApprovalType = 'admin-approval';
User.create({ username: 'admin', password: '123456' }, function (err, uid) {
assert.ifError(err);
adminUid = uid;
@@ -1603,7 +1601,7 @@ describe('User', function () {
});
after(function (done) {
meta.config.registrationType = oldRegistrationType;
meta.config.registrationApprovalType = oldRegistrationApprovalType;
done();
});