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

more tests

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2017-05-10 16:27:44 -04:00
parent 873801e9f3
commit 73f31640d7
4 changed files with 62 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/controllers/admin/blacklist.js
View File

@@ -1,19 +1,20 @@
'use strict';
var async = require('async');
var meta = require('../../meta');
var blacklistController = {};
var blacklistController = module.exports;
blacklistController.get = function (req, res, next) {
meta.blacklist.get(function (err, rules) {
if (err) {
return next(err);
}
async.waterfall([
function (next) {
meta.blacklist.get(next);
},
function (rules) {
res.render('admin/manage/ip-blacklist', {
rules: rules,
title: '[[pages:ip-blacklist]]',
});
});
},
], next);
};
module.exports = blacklistController;

20
src/controllers/globalmods.js
View File

@@ -1,18 +1,22 @@
'use strict';
var async = require('async');
var user = require('../user');
var adminBlacklistController = require('./admin/blacklist');
var globalModsController = {};
var globalModsController = module.exports;
globalModsController.ipBlacklist = function (req, res, next) {
user.isAdminOrGlobalMod(req.uid, function (err, isAdminOrGlobalMod) {
if (err || !isAdminOrGlobalMod) {
return next(err);
async.waterfall([
function (next) {
user.isAdminOrGlobalMod(req.uid, next);
},
function (isAdminOrGlobalMod, next) {
if (!isAdminOrGlobalMod) {
return next();
}
adminBlacklistController.get(req, res, next);
});
},
], next);
};
module.exports = globalModsController;

17
test/controllers-admin.js
View File

@@ -414,6 +414,23 @@ describe('Admin Controllers', function () {
});
});
it('/ip-blacklist should 404 for regular user', function (done) {
request(nconf.get('url') + '/api/ip-blacklist', { json: true }, function (err, res, body) {
assert.ifError(err);
assert(body);
assert.equal(res.statusCode, 404);
done();
});
});
it('should load /ip-blacklist', function (done) {
request(nconf.get('url') + '/api/ip-blacklist', { jar: jar, json: true }, function (err, res, body) {
assert.ifError(err);
assert(body);
done();
});
});
it('should load /admin/appearance/themes', function (done) {
request(nconf.get('url') + '/api/admin/appearance/themes', { jar: jar, json: true }, function (err, res, body) {
assert.ifError(err);

18
test/uploads.js
View File

@@ -218,6 +218,24 @@ describe('Upload Controllers', function () {
});
});
it('should upload default avatar', function (done) {
helpers.uploadFile(nconf.get('url') + '/api/admin/uploadDefaultAvatar', path.join(__dirname, '../test/files/test.png'), { }, jar, csrf_token, function (err, res, body) {
assert.ifError(err);
assert.equal(res.statusCode, 200);
assert.equal(body[0].url, nconf.get('relative_path') + '/assets/uploads/system/avatar-default.png');
done();
});
});
it('should upload og image', function (done) {
helpers.uploadFile(nconf.get('url') + '/api/admin/uploadOgImage', path.join(__dirname, '../test/files/test.png'), { }, jar, csrf_token, function (err, res, body) {
assert.ifError(err);
assert.equal(res.statusCode, 200);
assert.equal(body[0].url, nconf.get('relative_path') + '/assets/uploads/system/og-image.png');
done();
});
});
it('should upload favicon', function (done) {
helpers.uploadFile(nconf.get('url') + '/api/admin/uploadfavicon', path.join(__dirname, '../test/files/favicon.ico'), {}, jar, csrf_token, function (err, res, body) {
assert.ifError(err);