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

Make restoreConfigJson, oldConfigJson, updateConfigJson as task args

Browse Source
This commit is contained in:
Girish Ramakrishnan
2019-08-27 15:18:16 -07:00
parent f535b3de2f
commit bfe2f116a7
8 changed files with 75 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/test/apps-test.js
View File

@@ -97,7 +97,7 @@ describe('Apps', function () {
appStoreId: 'appStoreId-0',
location: 'some-location-0',
domain: DOMAIN_0.domain,
fqdn: 'some-location-0.' + DOMAIN_0.domain, // required for oldConfig
fqdn: 'some-location-0.' + DOMAIN_0.domain,
manifest: {
version: '0.1', dockerImage: 'docker/app0', healthCheckPath: '/', httpPort: 80, title: 'app0',
tcpPorts: {
@@ -123,7 +123,7 @@ describe('Apps', function () {
appStoreId: 'appStoreId-1',
location: 'some-location-1',
domain: DOMAIN_0.domain,
fqdn: 'some-location-1.' + DOMAIN_0.domain, // required for oldConfig
fqdn: 'some-location-1.' + DOMAIN_0.domain,
manifest: {
version: '0.1', dockerImage: 'docker/app1', healthCheckPath: '/', httpPort: 80, title: 'app1',
tcpPorts: {}
@@ -140,7 +140,7 @@ describe('Apps', function () {
appStoreId: 'appStoreId-2',
location: 'some-location-2',
domain: DOMAIN_1.domain,
fqdn: 'some-location-2.' + DOMAIN_1.domain, // required for oldConfig
fqdn: 'some-location-2.' + DOMAIN_1.domain,
manifest: {
version: '0.1', dockerImage: 'docker/app2', healthCheckPath: '/', httpPort: 80, title: 'app2',
tcpPorts: {}
@@ -375,11 +375,8 @@ describe('Apps', function () {
apps.getAll(function (error, apps) {
expect(apps[0].installationState).to.be(appdb.ISTATE_PENDING_CONFIGURE);
expect(apps[0].oldConfig).to.be(null);
expect(apps[1].installationState).to.be(appdb.ISTATE_PENDING_CONFIGURE); // erorred app can be reconfigured after restore
expect(apps[1].oldConfig).to.be(null);
expect(apps[2].installationState).to.be(appdb.ISTATE_PENDING_CONFIGURE);
expect(apps[2].oldConfig).to.be(null);
done();
});
@@ -402,10 +399,8 @@ describe('Apps', function () {
apps.getAll(function (error, result) {
expect(result[0].installationState).to.be(appdb.ISTATE_PENDING_RESTORE);
expect(result[0].oldConfig).to.eql(apps.getAppConfig(APP_0));
expect(result[1].installationState).to.be(appdb.ISTATE_PENDING_RESTORE);
expect(result[2].installationState).to.be(appdb.ISTATE_PENDING_RESTORE);
expect(result[2].oldConfig).to.eql(apps.getAppConfig(APP_2));
done();
});

8
src/test/database-test.js
View File

@@ -400,8 +400,6 @@ describe('database', function () {
health: null,
accessRestriction: null,
lastBackupId: null,
oldConfig: null,
newConfig: null,
memoryLimit: 4294967296,
sso: true,
debugMode: null,
@@ -979,9 +977,6 @@ describe('database', function () {
portBindings: { port: { hostPort: 5678, type: 'tcp' } },
health: null,
accessRestriction: null,
restoreConfig: null,
oldConfig: null,
updateConfig: null,
memoryLimit: 4294967296,
sso: true,
debugMode: null,
@@ -1013,9 +1008,6 @@ describe('database', function () {
portBindings: { },
health: null,
accessRestriction: { users: [ 'foobar' ] },
restoreConfig: null,
oldConfig: null,
updateConfig: null,
memoryLimit: 0,
sso: true,
debugMode: null,

2
src/test/ldap-test.js
View File

@@ -74,8 +74,6 @@ var APP_0 = {
portBindings: { port: 5678 },
health: null,
accessRestriction: null,
restoreConfig: null,
oldConfig: null,
memoryLimit: 4294967296,
mailboxName: 'some-location-0.app'
};