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

This commit is contained in:
Julian Lam
2017-07-25 12:28:43 -04:00
177 changed files with 645 additions and 615 deletions

View File

@@ -1772,6 +1772,26 @@ describe('Controllers', function () {
});
});
describe('admin middlewares', function () {
it('should redirect to login', function (done) {
request(nconf.get('url') + '//api/admin/advanced/database', { json: true }, function (err, res, body) {
assert.ifError(err);
assert.equal(res.statusCode, 200);
assert(body.indexOf('Login to your account') !== -1);
done();
});
});
it('should redirect to login', function (done) {
request(nconf.get('url') + '//admin/advanced/database', { json: true }, function (err, res, body) {
assert.ifError(err);
assert.equal(res.statusCode, 200);
assert(body.indexOf('Login to your account') !== -1);
done();
});
});
});
after(function (done) {
var analytics = require('../src/analytics');
analytics.writeData(done);