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/routes/test/backups-test.js
+3 -2
View File
@@ -25,7 +25,8 @@ const DOMAIN_0 = {
zoneName: 'example-backups-test.com',
config: {},
provider: 'noop',
fallbackCertificate: null
fallbackCertificate: null,
tlsConfig: { provider: 'fallback' }
};
var token = null;
@@ -37,7 +38,7 @@ function setup(done) {
async.series([
server.start,
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),
function createAdmin(callback) {
superagent.post(SERVER_URL + '/api/v1/cloudron/activate')
src/routes/test/caas-test.js
+3 -2
View File
@@ -31,7 +31,8 @@ const DOMAIN_0 = {
zoneName: 'example-backups-test.com',
config: {},
provider: 'noop',
fallbackCertificate: null
fallbackCertificate: null,
tlsConfig: { provider: 'fallback' }
};
var token = null;
@@ -57,7 +58,7 @@ function setup(done) {
database._clear,
settingsdb.set.bind(null, settings.CAAS_CONFIG_KEY, JSON.stringify({ boxId: 'BOX_ID', token: 'ACCESS_TOKEN2' })),
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),
function createAdmin(callback) {
var scope1 = nock(config.apiServerOrigin()).get('/api/v1/boxes/BOX_ID/setup/verify?setupToken=somesetuptoken').reply(200, {});
src/routes/test/mail-test.js
+3 -2
View File
@@ -23,7 +23,8 @@ const DOMAIN_0 = {
zoneName: 'example-mail-test.com',
config: {},
provider: 'noop',
fallbackCertificate: null
fallbackCertificate: null,
tlsConfig: { provider: 'fallback' }
};
var USERNAME = 'superadmin', PASSWORD = 'Foobar?1337', EMAIL ='silly@me.com';
const GROUP_NAME = 'maillistgroup';
@@ -39,7 +40,7 @@ function setup(done) {
async.series([
server.start.bind(null),
database._clear.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),
function createAdmin(callback) {
superagent.post(SERVER_URL + '/api/v1/cloudron/activate')
src/routes/test/oauth2-test.js
+3 -2
View File
@@ -143,7 +143,8 @@ describe('OAuth2', function () {
zoneName: 'example.com',
config: {},
provider: 'manual',
fallbackCertificate: null
fallbackCertificate: null,
tlsConfig: { provider: 'fallback' }
};
var USER_0 = {
@@ -310,7 +311,7 @@ describe('OAuth2', function () {
async.series([
server.start,
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),
clientdb.add.bind(null, CLIENT_0.id, CLIENT_0.appId, CLIENT_0.type, CLIENT_0.clientSecret, CLIENT_0.redirectURI, CLIENT_0.scope),
clientdb.add.bind(null, CLIENT_1.id, CLIENT_1.appId, CLIENT_1.type, CLIENT_1.clientSecret, CLIENT_1.redirectURI, CLIENT_1.scope),
clientdb.add.bind(null, CLIENT_2.id, CLIENT_2.appId, CLIENT_2.type, CLIENT_2.clientSecret, CLIENT_2.redirectURI, CLIENT_2.scope),
src/routes/test/sysadmin-test.js
+3 -2
View File
@@ -34,7 +34,8 @@ const DOMAIN_0 = {
zoneName: 'example-sysadmin-test.com',
config: {},
provider: 'noop',
fallbackCertificate: null
fallbackCertificate: null,
tlsConfig: { provider: 'fallback' }
};
function setup(done) {
@@ -45,7 +46,7 @@ function setup(done) {
async.series([
server.start,
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),
function createAdmin(callback) {
superagent.post(SERVER_URL + '/api/v1/cloudron/activate')
src/routes/test/user-test.js
+3 -2
View File
@@ -25,7 +25,8 @@ const DOMAIN_0 = {
zoneName: 'example-user-test.com',
config: {},
provider: 'noop',
fallbackCertificate: null
fallbackCertificate: null,
tlsConfig: { provider: 'fallback' }
};
const USERNAME_0 = 'superaDmIn', PASSWORD = 'Foobar?1337', EMAIL_0 = 'silLY@me.com', EMAIL_0_NEW = 'stupID@me.com', DISPLAY_NAME_0_NEW = 'New Name';
@@ -42,7 +43,7 @@ function setup(done) {
server.start,
database._clear,
mailer._clearMailQueue,
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)
], function (error) {
expect(error).to.not.be.ok();