dnsConfig -> domainConfig
this prepares for the incoming settings.getDnsConfig()
This commit is contained in:
@@ -143,7 +143,7 @@ function startBox(done) {
|
||||
|
||||
function (callback) {
|
||||
superagent.post(SERVER_URL + '/api/v1/cloudron/setup')
|
||||
.send({ dnsConfig: DOMAIN_0 })
|
||||
.send({ domainConfig: DOMAIN_0 })
|
||||
.end(function (error, result) {
|
||||
expect(result).to.be.ok();
|
||||
expect(result.statusCode).to.eql(200);
|
||||
|
||||
@@ -59,7 +59,7 @@ async function setup() {
|
||||
|
||||
// setup
|
||||
let response = await superagent.post(`${serverUrl}/api/v1/cloudron/setup`)
|
||||
.send({ dnsConfig: { provider: 'noop', domain: exports.dashboardDomain, config: {}, tlsConfig: { provider: 'fallback' } } });
|
||||
.send({ domainConfig: { provider: 'noop', domain: exports.dashboardDomain, config: {}, tlsConfig: { provider: 'fallback' } } });
|
||||
expect(response.status).to.eql(200);
|
||||
|
||||
await delay(2000);
|
||||
|
||||
@@ -36,7 +36,7 @@ describe('Provision', function () {
|
||||
describe('DNS Setup', async function () {
|
||||
it('fails without provider', async function () {
|
||||
const response = await superagent.post(`${serverUrl}/api/v1/cloudron/setup`)
|
||||
.send({ dnsConfig: { domain: DOMAIN, config: {} } })
|
||||
.send({ domainConfig: { domain: DOMAIN, config: {} } })
|
||||
.ok(() => true);
|
||||
|
||||
expect(response.statusCode).to.eql(400);
|
||||
@@ -44,7 +44,7 @@ describe('Provision', function () {
|
||||
|
||||
it('fails with invalid provider', async function () {
|
||||
const response = await superagent.post(`${serverUrl}/api/v1/cloudron/setup`)
|
||||
.send({ dnsConfig: { provider: 'foobar', domain: DOMAIN, config: {} } })
|
||||
.send({ domainConfig: { provider: 'foobar', domain: DOMAIN, config: {} } })
|
||||
.ok(() => true);
|
||||
|
||||
expect(response.statusCode).to.eql(400);
|
||||
@@ -52,7 +52,7 @@ describe('Provision', function () {
|
||||
|
||||
it('fails with missing domain', async function () {
|
||||
const response = await superagent.post(`${serverUrl}/api/v1/cloudron/setup`)
|
||||
.send({ dnsConfig: { provider: 'noop', config: {} } })
|
||||
.send({ domainConfig: { provider: 'noop', config: {} } })
|
||||
.ok(() => true);
|
||||
|
||||
expect(response.statusCode).to.eql(400);
|
||||
@@ -60,7 +60,7 @@ describe('Provision', function () {
|
||||
|
||||
it('fails with invalid domain', async function () {
|
||||
const response = await superagent.post(`${serverUrl}/api/v1/cloudron/setup`)
|
||||
.send({ dnsConfig: { provider: 'noop', domain: '.foo', config: {} } })
|
||||
.send({ domainConfig: { provider: 'noop', domain: '.foo', config: {} } })
|
||||
.ok(() => true);
|
||||
|
||||
expect(response.statusCode).to.eql(400);
|
||||
@@ -68,7 +68,7 @@ describe('Provision', function () {
|
||||
|
||||
it('fails with invalid config', async function () {
|
||||
const response = await superagent.post(`${serverUrl}/api/v1/cloudron/setup`)
|
||||
.send({ dnsConfig: { provider: 'noop', domain: DOMAIN, config: 'not an object' } })
|
||||
.send({ domainConfig: { provider: 'noop', domain: DOMAIN, config: 'not an object' } })
|
||||
.ok(() => true);
|
||||
|
||||
expect(response.statusCode).to.eql(400);
|
||||
@@ -76,7 +76,7 @@ describe('Provision', function () {
|
||||
|
||||
it('fails with invalid zoneName', async function () {
|
||||
const response = await superagent.post(`${serverUrl}/api/v1/cloudron/setup`)
|
||||
.send({ dnsConfig: { provider: 'noop', domain: DOMAIN, config: {}, zoneName: 1337 } })
|
||||
.send({ domainConfig: { provider: 'noop', domain: DOMAIN, config: {}, zoneName: 1337 } })
|
||||
.ok(() => true);
|
||||
|
||||
expect(response.statusCode).to.eql(400);
|
||||
@@ -84,7 +84,7 @@ describe('Provision', function () {
|
||||
|
||||
it('fails with invalid tlsConfig', async function () {
|
||||
const response = await superagent.post(`${serverUrl}/api/v1/cloudron/setup`)
|
||||
.send({ dnsConfig: { provider: 'noop', domain: DOMAIN, config: {}, tlsConfig: 'foobar' } })
|
||||
.send({ domainConfig: { provider: 'noop', domain: DOMAIN, config: {}, tlsConfig: 'foobar' } })
|
||||
.ok(() => true);
|
||||
|
||||
expect(response.statusCode).to.eql(400);
|
||||
@@ -92,7 +92,7 @@ describe('Provision', function () {
|
||||
|
||||
it('fails with invalid tlsConfig provider', async function () {
|
||||
const response = await superagent.post(`${serverUrl}/api/v1/cloudron/setup`)
|
||||
.send({ dnsConfig: { provider: 'noop', domain: DOMAIN, config: {}, tlsConfig: { provider: 1337 } } })
|
||||
.send({ domainConfig: { provider: 'noop', domain: DOMAIN, config: {}, tlsConfig: { provider: 1337 } } })
|
||||
.ok(() => true);
|
||||
|
||||
expect(response.statusCode).to.eql(400);
|
||||
@@ -100,7 +100,7 @@ describe('Provision', function () {
|
||||
|
||||
it('succeeds', async function () {
|
||||
const response = await superagent.post(`${serverUrl}/api/v1/cloudron/setup`)
|
||||
.send({ dnsConfig: { provider: 'noop', domain: DOMAIN, adminFqdn: 'my.' + DOMAIN, config: {}, tlsConfig: { provider: 'fallback' } } })
|
||||
.send({ domainConfig: { provider: 'noop', domain: DOMAIN, adminFqdn: 'my.' + DOMAIN, config: {}, tlsConfig: { provider: 'fallback' } } })
|
||||
.ok(() => true);
|
||||
|
||||
expect(response.statusCode).to.eql(200);
|
||||
@@ -110,7 +110,7 @@ describe('Provision', function () {
|
||||
|
||||
it('twice succeeds', async function () {
|
||||
const response = await superagent.post(`${serverUrl}/api/v1/cloudron/setup`)
|
||||
.send({ dnsConfig: { provider: 'noop', domain: DOMAIN, adminFqdn: 'my.' + DOMAIN, config: {}, tlsConfig: { provider: 'fallback' } } })
|
||||
.send({ domainConfig: { provider: 'noop', domain: DOMAIN, adminFqdn: 'my.' + DOMAIN, config: {}, tlsConfig: { provider: 'fallback' } } })
|
||||
.ok(() => true);
|
||||
|
||||
expect(response.statusCode).to.eql(200);
|
||||
@@ -224,7 +224,7 @@ describe('Provision', function () {
|
||||
|
||||
it('after fails', async function () {
|
||||
const response = await superagent.post(`${serverUrl}/api/v1/cloudron/setup`)
|
||||
.send({ dnsConfig: { provider: 'noop', domain: DOMAIN, adminFqdn: 'my.' + DOMAIN, config: {}, tlsConfig: { provider: 'fallback' } } })
|
||||
.send({ domainConfig: { provider: 'noop', domain: DOMAIN, adminFqdn: 'my.' + DOMAIN, config: {}, tlsConfig: { provider: 'fallback' } } })
|
||||
.ok(() => true);
|
||||
|
||||
expect(response.statusCode).to.eql(409);
|
||||
|
||||
Reference in New Issue
Block a user