merge domaindb.js into domains.js

This commit is contained in:
Girish Ramakrishnan
2021-08-13 17:22:28 -07:00
parent 74febcd30a
commit 5bcf1bc47b
40 changed files with 2233 additions and 2395 deletions

View File

@@ -12,7 +12,7 @@ const common = require('./common.js'),
paths = require('../paths.js'),
reverseProxy = require('../reverseproxy.js');
describe('Certificates', function () {
describe('Reverse Proxy', function () {
const { setup, cleanup, domain, auditSource, app } = common;
const domainCopy = Object.assign({}, domain);
@@ -141,10 +141,10 @@ describe('Certificates', function () {
});
describe('getApi - letsencrypt-prod', function () {
before(function (done) {
before(async function () {
domainCopy.tlsConfig = { provider: 'letsencrypt-prod' };
domains.update(domainCopy.domain, domainCopy, auditSource, done);
await domains.update(domainCopy.domain, domainCopy, auditSource);
});
it('returns prod acme in prod cloudron', async function () {
@@ -155,10 +155,10 @@ describe('Certificates', function () {
});
describe('getApi - letsencrypt-staging', function () {
before(function (done) {
before(async function () {
domainCopy.tlsConfig = { provider: 'letsencrypt-staging' };
domains.update(domainCopy.domain, domainCopy, auditSource, done);
await domains.update(domainCopy.domain, domainCopy, auditSource);
});
it('returns staging acme in prod cloudron', async function () {
@@ -169,10 +169,10 @@ describe('Certificates', function () {
});
describe('configureApp', function () {
before(function (done) {
before(async function () {
domainCopy.tlsConfig = { provider: 'fallback' };
domains.update(domainCopy.domain, domainCopy, auditSource, done);
await domains.update(domainCopy.domain, domainCopy, auditSource);
});
it('configure nginx correctly', function (done) {