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

Fixup all the tests to use domain tlsConfig

Browse Source
This commit is contained in:
Johannes Zellner
2018-01-31 18:09:38 +01:00
parent 1ec294a04b
commit d1ef35ae1d
15 changed files with 73 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/apps-test.js
+6 -4
View File
@@ -74,14 +74,16 @@ describe('Apps', function () {
domain: 'example.com',
zoneName: 'example.com',
provider: 'manual',
config: { }
config: { },
tlsConfig: { provider: 'fallback' }
};
const DOMAIN_1 = {
domain: 'example2.com',
zoneName: 'example2.com',
provider: 'manual',
config: { }
config: { },
tlsConfig: { provider: 'fallback' }
};
var APP_0 = {
@@ -140,8 +142,8 @@ describe('Apps', function () {
async.series([
database.initialize,
database._clear,
domains.add.bind(null, DOMAIN_0.domain, DOMAIN_0.zoneName, DOMAIN_0.provider, DOMAIN_0.config, null),
domains.add.bind(null, DOMAIN_1.domain, DOMAIN_1.zoneName, DOMAIN_1.provider, DOMAIN_1.config, null),
domains.add.bind(null, DOMAIN_0.domain, DOMAIN_0.zoneName, DOMAIN_0.provider, DOMAIN_0.config, null, DOMAIN_0.tlsConfig),
domains.add.bind(null, DOMAIN_1.domain, DOMAIN_1.zoneName, DOMAIN_1.provider, DOMAIN_1.config, null, DOMAIN_1.tlsConfig),
userdb.add.bind(null, ADMIN_0.id, ADMIN_0),
userdb.add.bind(null, USER_0.id, USER_0),
userdb.add.bind(null, USER_1.id, USER_1),
src/test/apptask-test.js
+3 -2
View File
@@ -57,7 +57,8 @@ const DOMAIN_0 = {
accessKeyId: 'accessKeyId',
secretAccessKey: 'secretAccessKey',
endpoint: 'http://localhost:5353'
}
},
tlsConfig: { provider: 'fallback' }
};
var APP = {
@@ -104,7 +105,7 @@ describe('apptask', function () {
async.series([
database.initialize,
database._clear,
domains.add.bind(null, DOMAIN_0.domain, DOMAIN_0.zoneName, DOMAIN_0.provider, DOMAIN_0.config, null),
domains.add.bind(null, DOMAIN_0.domain, DOMAIN_0.zoneName, DOMAIN_0.provider, DOMAIN_0.config, null, DOMAIN_0.tlsConfig),
appdb.add.bind(null, APP.id, APP.appStoreId, APP.manifest, APP.location, APP.domain, APP.portBindings, APP),
settings.initialize,
settings.setTlsConfig.bind(null, { provider: 'caas' })
src/test/database-test.js
+18 -10
View File
@@ -68,21 +68,24 @@ const DOMAIN_0 = {
domain: 'foobar.com',
zoneName: 'foobar.com',
provider: 'digitalocean',
config: { token: 'abcd' }
config: { token: 'abcd' },
tlsConfig: { provider: 'fallback' }
};
const DOMAIN_1 = {
domain: 'foo.cloudron.io',
zoneName: 'cloudron.io',
provider: 'manual',
config: null
config: null,
tlsConfig: { provider: 'fallback' }
};
const TEST_DOMAIN = {
domain: 'example.com',
zoneName: 'example.com',
provider: 'manual',
config: {}
config: {},
tlsConfig: { provider: 'fallback' }
};
describe('database', function () {
@@ -105,15 +108,15 @@ describe('database', function () {
describe('domains', function () {
it('can add domain', function (done) {
domaindb.add(DOMAIN_0.domain, { zoneName: DOMAIN_0.zoneName, provider: DOMAIN_0.provider, config: DOMAIN_0.config }, done);
domaindb.add(DOMAIN_0.domain, { zoneName: DOMAIN_0.zoneName, provider: DOMAIN_0.provider, config: DOMAIN_0.config, tlsConfig: DOMAIN_0.tlsConfig }, done);
});
it('can add another domain', function (done) {
domaindb.add(DOMAIN_1.domain, { zoneName: DOMAIN_1.zoneName, provider: DOMAIN_1.provider, config: DOMAIN_1.config }, done);
domaindb.add(DOMAIN_1.domain, { zoneName: DOMAIN_1.zoneName, provider: DOMAIN_1.provider, config: DOMAIN_1.config, tlsConfig: DOMAIN_1.tlsConfig }, done);
});
it('cannot add same domain twice', function (done) {
domaindb.add(DOMAIN_0.domain, { zoneName: DOMAIN_0.zoneName, provider: DOMAIN_0.provider, config: DOMAIN_0.config }, function (error) {
domaindb.add(DOMAIN_0.domain, { zoneName: DOMAIN_0.zoneName, provider: DOMAIN_0.provider, config: DOMAIN_0.config, tlsConfig: DOMAIN_0.tlsConfig }, function (error) {
expect(error).to.be.ok();
expect(error.reason).to.be(DatabaseError.ALREADY_EXISTS);
done();
@@ -134,8 +137,9 @@ describe('database', function () {
it('can update domain', function (done) {
const newConfig = { provider: 'manual' };
const newTlsConfig = { provider: 'foobar' };
domaindb.update(DOMAIN_1.domain, { provider: DOMAIN_1.provider, config: newConfig }, function (error) {
domaindb.update(DOMAIN_1.domain, { provider: DOMAIN_1.provider, config: newConfig, tlsConfig: newTlsConfig }, function (error) {
expect(error).to.equal(null);
domaindb.get(DOMAIN_1.domain, function (error, result) {
@@ -145,8 +149,10 @@ describe('database', function () {
expect(result.zoneName).to.equal(DOMAIN_1.zoneName);
expect(result.provider).to.equal(DOMAIN_1.provider);
expect(result.config).to.eql(newConfig);
expect(result.tlsConfig).to.eql(newTlsConfig);
DOMAIN_1.config = newConfig;
DOMAIN_1.tlsConfig = newTlsConfig;
done();
});
@@ -164,11 +170,13 @@ describe('database', function () {
expect(result[0].zoneName).to.equal(DOMAIN_1.zoneName);
expect(result[0].provider).to.equal(DOMAIN_1.provider);
expect(result[0].config).to.eql(DOMAIN_1.config);
expect(result[0].tlsConfig).to.eql(DOMAIN_1.tlsConfig);
expect(result[1].domain).to.equal(DOMAIN_0.domain);
expect(result[1].zoneName).to.equal(DOMAIN_0.zoneName);
expect(result[1].provider).to.equal(DOMAIN_0.provider);
expect(result[1].config).to.eql(DOMAIN_0.config);
expect(result[1].tlsConfig).to.eql(DOMAIN_0.tlsConfig);
done();
});
@@ -744,7 +752,7 @@ describe('database', function () {
};
before(function (done) {
domaindb.add(DOMAIN_0.domain, { zoneName: DOMAIN_0.zoneName, provider: DOMAIN_0.provider, config: DOMAIN_0.config }, done);
domaindb.add(DOMAIN_0.domain, { zoneName: DOMAIN_0.zoneName, provider: DOMAIN_0.provider, config: DOMAIN_0.config, tlsConfig: DOMAIN_0.tlsConfig }, done);
});
after(function (done) {
@@ -1585,7 +1593,7 @@ describe('database', function () {
describe('mailboxes', function () {
before(function (done) {
domaindb.add(DOMAIN_0.domain, { zoneName: DOMAIN_0.zoneName, provider: DOMAIN_0.provider, config: DOMAIN_0.config }, done);
domaindb.add(DOMAIN_0.domain, { zoneName: DOMAIN_0.zoneName, provider: DOMAIN_0.provider, config: DOMAIN_0.config, tlsConfig: DOMAIN_0.tlsConfig }, done);
});
after(function (done) {
@@ -1751,7 +1759,7 @@ describe('database', function () {
};
before(function (done) {
domaindb.add(DOMAIN_0.domain, { zoneName: DOMAIN_0.zoneName, provider: DOMAIN_0.provider, config: DOMAIN_0.config }, done);
domaindb.add(DOMAIN_0.domain, { zoneName: DOMAIN_0.zoneName, provider: DOMAIN_0.provider, config: DOMAIN_0.config, tlsConfig: DOMAIN_0.tlsConfig }, done);
});
after(function (done) {
src/test/digest-test.js
+3 -2
View File
@@ -36,7 +36,8 @@ const DOMAIN_0 = {
zoneName: 'example.com',
config: {},
provider: 'manual',
fallbackCertificate: null
fallbackCertificate: null,
tlsConfig: { provider: 'fallback' }
};
var AUDIT_SOURCE = {
@@ -70,7 +71,7 @@ describe('digest', function () {
database.initialize,
database._clear,
settings.initialize,
domains.add.bind(null, DOMAIN_0.domain, DOMAIN_0.zoneName, DOMAIN_0.provider, DOMAIN_0.config, DOMAIN_0.fallbackCertificate),
domains.add.bind(null, DOMAIN_0.domain, DOMAIN_0.zoneName, DOMAIN_0.provider, DOMAIN_0.config, DOMAIN_0.fallbackCertificate, DOMAIN_0.tlsConfig),
mail.add.bind(null, DOMAIN_0.domain),
user.createOwner.bind(null, USER_0.username, USER_0.password, USER_0.email, USER_0.displayName, AUDIT_SOURCE),
function (callback) {
src/test/dns-test.js
+8 -8
View File
@@ -22,7 +22,8 @@ var DOMAIN_0 = {
zoneName: 'example-dns-test.com',
provider: 'noop',
config: {},
fallbackCertificate: null
fallbackCertificate: null,
tlsConfig: { provider: 'fallback' }
};
describe('dns provider', function () {
@@ -34,7 +35,7 @@ describe('dns provider', function () {
database.initialize,
settings.initialize,
database._clear,
domains.add.bind(null, DOMAIN_0.domain, DOMAIN_0.zoneName, DOMAIN_0.provider, DOMAIN_0.config, DOMAIN_0.fallbackCertificate)
domains.add.bind(null, DOMAIN_0.domain, DOMAIN_0.zoneName, DOMAIN_0.provider, DOMAIN_0.config, DOMAIN_0.fallbackCertificate, DOMAIN_0.tlsConfig)
], done);
});
@@ -48,10 +49,9 @@ describe('dns provider', function () {
describe('noop', function () {
before(function (done) {
DOMAIN_0.provider = 'noop';
DOMAIN_0.config = {
};
DOMAIN_0.config = {};
domains.update(DOMAIN_0.domain, DOMAIN_0.provider, DOMAIN_0.config, null, done);
domains.update(DOMAIN_0.domain, DOMAIN_0.provider, DOMAIN_0.config, null, DOMAIN_0.tlsConfig, done);
});
it('upsert succeeds', function (done) {
@@ -92,7 +92,7 @@ describe('dns provider', function () {
token: TOKEN
};
domains.update(DOMAIN_0.domain, DOMAIN_0.provider, DOMAIN_0.config, null, done);
domains.update(DOMAIN_0.domain, DOMAIN_0.provider, DOMAIN_0.config, null, DOMAIN_0.tlsConfig, done);
});
it('upsert non-existing record succeeds', function (done) {
@@ -419,7 +419,7 @@ describe('dns provider', function () {
AWS._originalRoute53 = AWS.Route53;
AWS.Route53 = Route53Mock;
domains.update(DOMAIN_0.domain, DOMAIN_0.provider, DOMAIN_0.config, null, done);
domains.update(DOMAIN_0.domain, DOMAIN_0.provider, DOMAIN_0.config, null, DOMAIN_0.tlsConfig, done);
});
after(function () {
@@ -575,7 +575,7 @@ describe('dns provider', function () {
_OriginalGCDNS = GCDNS.prototype.getZones;
GCDNS.prototype.getZones = mockery(zoneQueue);
domains.update(DOMAIN_0.domain, DOMAIN_0.provider, DOMAIN_0.config, null, done);
domains.update(DOMAIN_0.domain, DOMAIN_0.provider, DOMAIN_0.config, null, DOMAIN_0.tlsConfig, done);
});
after(function () {
src/test/ldap-test.js
+3 -2
View File
@@ -27,7 +27,8 @@ const DOMAIN_0 = {
zoneName: 'example.com',
config: {},
provider: 'manual',
fallbackCertificate: null
fallbackCertificate: null,
tlsConfig: { provider: 'fallback' }
};
// owner
@@ -96,7 +97,7 @@ function setup(done) {
database.initialize.bind(null),
database._clear.bind(null),
ldapServer.start.bind(null),
domains.add.bind(null, DOMAIN_0.domain, DOMAIN_0.zoneName, DOMAIN_0.provider, DOMAIN_0.config, DOMAIN_0.fallbackCertificate),
domains.add.bind(null, DOMAIN_0.domain, DOMAIN_0.zoneName, DOMAIN_0.provider, DOMAIN_0.config, DOMAIN_0.fallbackCertificate, DOMAIN_0.tlsConfig),
maildb.add.bind(null, DOMAIN_0.domain),
appdb.add.bind(null, APP_0.id, APP_0.appStoreId, APP_0.manifest, APP_0.location, APP_0.domain, APP_0.portBindings, APP_0),
appdb.update.bind(null, APP_0.id, { containerId: APP_0.containerId }),
src/test/mail-test.js
+3 -2
View File
@@ -18,7 +18,8 @@ const DOMAIN_0 = {
zoneName: 'example.com',
provider: 'manual',
config: {},
fallbackCertificate: null
fallbackCertificate: null,
tlsConfig: { provider: 'fallback' }
};
function setup(done) {
@@ -29,7 +30,7 @@ function setup(done) {
async.series([
database.initialize,
database._clear,
domains.add.bind(null, DOMAIN_0.domain, DOMAIN_0.zoneName, DOMAIN_0.provider, DOMAIN_0.config, DOMAIN_0.fallbackCertificate),
domains.add.bind(null, DOMAIN_0.domain, DOMAIN_0.zoneName, DOMAIN_0.provider, DOMAIN_0.config, DOMAIN_0.fallbackCertificate, DOMAIN_0.tlsConfig),
mail.add.bind(null, DOMAIN_0.domain)
], done);
}
src/test/updatechecker-test.js
+8 -7
View File
@@ -35,7 +35,8 @@ const DOMAIN_0 = {
zoneName: 'example.com',
config: {},
provider: 'manual',
fallbackCertificate: null
fallbackCertificate: null,
tlsConfig: { provider: 'fallback' }
};
var AUDIT_SOURCE = {
@@ -74,7 +75,7 @@ describe('updatechecker - box - manual (email)', function () {
database.initialize,
database._clear,
settings.initialize,
domains.add.bind(null, DOMAIN_0.domain, DOMAIN_0.zoneName, DOMAIN_0.provider, DOMAIN_0.config, DOMAIN_0.fallbackCertificate),
domains.add.bind(null, DOMAIN_0.domain, DOMAIN_0.zoneName, DOMAIN_0.provider, DOMAIN_0.config, DOMAIN_0.fallbackCertificate, DOMAIN_0.tlsConfig),
mail.add.bind(null, DOMAIN_0.domain),
user.createOwner.bind(null, USER_0.username, USER_0.password, USER_0.email, USER_0.displayName, AUDIT_SOURCE),
settings.setAutoupdatePattern.bind(null, constants.AUTOUPDATE_PATTERN_NEVER),
@@ -176,7 +177,7 @@ describe('updatechecker - box - automatic (no email)', function () {
async.series([
database.initialize,
settings.initialize,
domains.add.bind(null, DOMAIN_0.domain, DOMAIN_0.zoneName, DOMAIN_0.provider, DOMAIN_0.config, DOMAIN_0.fallbackCertificate),
domains.add.bind(null, DOMAIN_0.domain, DOMAIN_0.zoneName, DOMAIN_0.provider, DOMAIN_0.config, DOMAIN_0.fallbackCertificate, DOMAIN_0.tlsConfig),
mail.add.bind(null, DOMAIN_0.domain),
mailer._clearMailQueue,
user.createOwner.bind(null, USER_0.username, USER_0.password, USER_0.email, USER_0.displayName, AUDIT_SOURCE),
@@ -220,7 +221,7 @@ describe('updatechecker - box - automatic free (email)', function () {
async.series([
database.initialize,
settings.initialize,
domains.add.bind(null, DOMAIN_0.domain, DOMAIN_0.zoneName, DOMAIN_0.provider, DOMAIN_0.config, DOMAIN_0.fallbackCertificate),
domains.add.bind(null, DOMAIN_0.domain, DOMAIN_0.zoneName, DOMAIN_0.provider, DOMAIN_0.config, DOMAIN_0.fallbackCertificate, DOMAIN_0.tlsConfig),
mail.add.bind(null, DOMAIN_0.domain),
mailer._clearMailQueue,
user.createOwner.bind(null, USER_0.username, USER_0.password, USER_0.email, USER_0.displayName, AUDIT_SOURCE),
@@ -290,7 +291,7 @@ describe('updatechecker - app - manual (email)', function () {
database.initialize,
database._clear,
settings.initialize,
domains.add.bind(null, DOMAIN_0.domain, DOMAIN_0.zoneName, DOMAIN_0.provider, DOMAIN_0.config, DOMAIN_0.fallbackCertificate),
domains.add.bind(null, DOMAIN_0.domain, DOMAIN_0.zoneName, DOMAIN_0.provider, DOMAIN_0.config, DOMAIN_0.fallbackCertificate, DOMAIN_0.tlsConfig),
mail.add.bind(null, DOMAIN_0.domain),
mailer._clearMailQueue,
appdb.add.bind(null, APP_0.id, APP_0.appStoreId, APP_0.manifest, APP_0.location, APP_0.domain, APP_0.portBindings, APP_0),
@@ -406,7 +407,7 @@ describe('updatechecker - app - automatic (no email)', function () {
database.initialize,
database._clear,
settings.initialize,
domains.add.bind(null, DOMAIN_0.domain, DOMAIN_0.zoneName, DOMAIN_0.provider, DOMAIN_0.config, DOMAIN_0.fallbackCertificate),
domains.add.bind(null, DOMAIN_0.domain, DOMAIN_0.zoneName, DOMAIN_0.provider, DOMAIN_0.config, DOMAIN_0.fallbackCertificate, DOMAIN_0.tlsConfig),
mail.add.bind(null, DOMAIN_0.domain),
mailer._clearMailQueue,
appdb.add.bind(null, APP_0.id, APP_0.appStoreId, APP_0.manifest, APP_0.location, APP_0.domain, APP_0.portBindings, APP_0),
@@ -471,7 +472,7 @@ describe('updatechecker - app - automatic free (email)', function () {
database.initialize,
database._clear,
settings.initialize,
domains.add.bind(null, DOMAIN_0.domain, DOMAIN_0.zoneName, DOMAIN_0.provider, DOMAIN_0.config, DOMAIN_0.fallbackCertificate),
domains.add.bind(null, DOMAIN_0.domain, DOMAIN_0.zoneName, DOMAIN_0.provider, DOMAIN_0.config, DOMAIN_0.fallbackCertificate, DOMAIN_0.tlsConfig),
mail.add.bind(null, DOMAIN_0.domain),
mailer._clearMailQueue,
appdb.add.bind(null, APP_0.id, APP_0.appStoreId, APP_0.manifest, APP_0.location, APP_0.domain, APP_0.portBindings, APP_0),
src/test/user-test.js
+3 -2
View File
@@ -44,7 +44,8 @@ const DOMAIN_0 = {
zoneName: 'example.com',
provider: 'manual',
config: {},
fallbackCertificate: null
fallbackCertificate: null,
tlsConfig: { provider: 'fallback' }
};
function cleanupUsers(done) {
@@ -76,7 +77,7 @@ function setup(done) {
async.series([
database.initialize,
database._clear,
domains.add.bind(null, DOMAIN_0.domain, DOMAIN_0.zoneName, DOMAIN_0.provider, DOMAIN_0.config, DOMAIN_0.fallbackCertificate),
domains.add.bind(null, DOMAIN_0.domain, DOMAIN_0.zoneName, DOMAIN_0.provider, DOMAIN_0.config, DOMAIN_0.fallbackCertificate, DOMAIN_0.tlsConfig),
mail.add.bind(null, DOMAIN_0.domain),
mailer._clearMailQueue
], done);