jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Further test fixes to oauth, ldap and mail tests

Browse Source
This commit is contained in:
Johannes Zellner
2018-01-26 21:10:53 +01:00
parent c3211c7603
commit 7441e11c2d
3 changed files with 33 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/ldap-test.js
+14 -14
View File
@@ -253,7 +253,7 @@ describe('Ldap', function () {
it('succeeds without accessRestriction when email is enabled', function (done) {
// use maildb to not trigger further events
maildb.update(DOMAIN, { enabled: true }, function (error) {
maildb.update(DOMAIN_0.domain, { enabled: true }, function (error) {
expect(error).not.to.be.ok();
var client = ldap.createClient({ url: 'ldap://127.0.0.1:' + config.get('ldapPort') });
@@ -263,7 +263,7 @@ describe('Ldap', function () {
client.unbind();
maildb.update(DOMAIN, { enabled: false }, done);
maildb.update(DOMAIN_0.domain, { enabled: false }, done);
});
});
});
@@ -309,7 +309,7 @@ describe('Ldap', function () {
var client = ldap.createClient({ url: 'ldap://127.0.0.1:' + config.get('ldapPort') });
var opts = {
filter: '(&(l=Seattle)(email=*@' + DOMAIN + '))'
filter: '(&(l=Seattle)(email=*@' + DOMAIN_0.domain + '))'
};
client.search('o=example', opts, function (error, result) {
@@ -385,7 +385,7 @@ describe('Ldap', function () {
it ('succeeds with basic filter and email enabled', function (done) {
// user settingsdb instead of settings, to not trigger further events
maildb.update(DOMAIN, { enabled: true }, function (error) {
maildb.update(DOMAIN_0.domain, { enabled: true }, function (error) {
expect(error).not.to.be.ok();
var client = ldap.createClient({ url: 'ldap://127.0.0.1:' + config.get('ldapPort') });
@@ -416,7 +416,7 @@ describe('Ldap', function () {
client.unbind();
maildb.update(DOMAIN, { enabled: false }, done);
maildb.update(DOMAIN_0.domain, { enabled: false }, done);
});
});
});
@@ -852,7 +852,7 @@ describe('Ldap', function () {
it('email enabled - allows with valid email', function (done) {
// use maildb to not trigger further events
maildb.update(DOMAIN, { enabled: true }, function (error) {
maildb.update(DOMAIN_0.domain, { enabled: true }, function (error) {
expect(error).not.to.be.ok();
var client = ldap.createClient({ url: 'ldap://127.0.0.1:' + config.get('ldapPort') });
@@ -862,14 +862,14 @@ describe('Ldap', function () {
client.unbind();
maildb.update(DOMAIN, { enabled: false }, done);
maildb.update(DOMAIN_0.domain, { enabled: false }, done);
});
});
});
it('email enabled - does not allow with invalid password', function (done) {
// use maildb to not trigger further events
maildb.update(DOMAIN, { enabled: true }, function (error) {
maildb.update(DOMAIN_0.domain, { enabled: true }, function (error) {
expect(error).not.to.be.ok();
var client = ldap.createClient({ url: 'ldap://127.0.0.1:' + config.get('ldapPort') });
@@ -879,7 +879,7 @@ describe('Ldap', function () {
client.unbind();
maildb.update(DOMAIN, { enabled: false }, done);
maildb.update(DOMAIN_0.domain, { enabled: false }, done);
});
});
});
@@ -888,7 +888,7 @@ describe('Ldap', function () {
describe('app sendmail bind', function () {
// these tests should work even when email is disabled
before(function (done) {
maildb.update(DOMAIN, { enabled: false }, done);
maildb.update(DOMAIN_0.domain, { enabled: false }, done);
});
it('does not allow with invalid app', function (done) {
@@ -940,7 +940,7 @@ describe('Ldap', function () {
it('email enabled - allows with valid email', function (done) {
// use maildb to not trigger further events
maildb.update(DOMAIN, { enabled: true }, function (error) {
maildb.update(DOMAIN_0.domain, { enabled: true }, function (error) {
expect(error).not.to.be.ok();
var client = ldap.createClient({ url: 'ldap://127.0.0.1:' + config.get('ldapPort') });
@@ -950,14 +950,14 @@ describe('Ldap', function () {
client.unbind();
maildb.update(DOMAIN, { enabled: false }, done);
maildb.update(DOMAIN_0.domain, { enabled: false }, done);
});
});
});
it('email enabled - does not allow with invalid password', function (done) {
// use maildb to not trigger further events
maildb.update(DOMAIN, { enabled: true }, function (error) {
maildb.update(DOMAIN_0.domain, { enabled: true }, function (error) {
expect(error).not.to.be.ok();
var client = ldap.createClient({ url: 'ldap://127.0.0.1:' + config.get('ldapPort') });
@@ -967,7 +967,7 @@ describe('Ldap', function () {
client.unbind();
maildb.update(DOMAIN, { enabled: false }, done);
maildb.update(DOMAIN_0.domain, { enabled: false }, done);
});
});
});
src/test/mail-test.js
+5 -2
View File
@@ -8,6 +8,7 @@
var async = require('async'),
config = require('../config.js'),
database = require('../database.js'),
domains = require('../domains.js'),
expect = require('expect.js'),
mail = require('../mail.js'),
maildb = require('../maildb.js');
@@ -16,7 +17,8 @@ const DOMAIN_0 = {
domain: 'example.com',
zoneName: 'example.com',
provider: 'manual',
config: { }
config: {},
fallbackCertificate: null
};
function setup(done) {
@@ -27,7 +29,8 @@ function setup(done) {
async.series([
database.initialize,
database._clear,
// DOMAIN_0 already added for test through domaindb.addDefaultDomain()
domains.add.bind(null, DOMAIN_0.domain, DOMAIN_0.zoneName, DOMAIN_0.provider, DOMAIN_0.config, DOMAIN_0.fallbackCertificate),
mail.add.bind(null, DOMAIN_0.domain)
], done);
}