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

Fixup the merge

Browse Source
This commit is contained in:
Johannes Zellner
2016-02-10 12:28:57 +01:00
parent 1cdb64e78d
commit 1b7265f866
7 changed files with 32 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/apps-test.js
+3 -2
View File
@@ -37,14 +37,15 @@ describe('Apps', function () {
portBindings: { PORT: 5678 },
healthy: null,
accessRestriction: null,
oauthProxy: false
oauthProxy: false,
memoryLimit: 0
};
before(function (done) {
async.series([
database.initialize,
database._clear,
appdb.add.bind(null, APP_0.id, APP_0.appStoreId, APP_0.manifest, APP_0.location, APP_0.portBindings, APP_0.accessRestriction, APP_0.oauthProxy)
appdb.add.bind(null, APP_0.id, APP_0.appStoreId, APP_0.manifest, APP_0.location, APP_0.portBindings, APP_0.accessRestriction, APP_0.oauthProxy, APP_0.memoryLimit)
], done);
});
src/test/apptask-test.js
+3 -2
View File
@@ -61,7 +61,8 @@ var APP = {
portBindings: null,
accessRestriction: null,
oauthProxy: false,
dnsRecordId: 'someDnsRecordId'
dnsRecordId: 'someDnsRecordId',
memoryLimit: 0
};
var awsHostedZones = {
@@ -84,7 +85,7 @@ describe('apptask', function () {
config.set('version', '0.5.0');
async.series([
database.initialize,
appdb.add.bind(null, APP.id, APP.appStoreId, APP.manifest, APP.location, APP.portBindings, APP.accessRestriction, APP.oauthProxy),
appdb.add.bind(null, APP.id, APP.appStoreId, APP.manifest, APP.location, APP.portBindings, APP.accessRestriction, APP.oauthProxy, APP.memoryLimit),
settings.setDnsConfig.bind(null, { provider: 'route53', accessKeyId: 'accessKeyId', secretAccessKey: 'secretAccessKey', endpoint: 'http://localhost:5353' }),
settings.setTlsConfig.bind(null, { provider: 'caas' })
], done);
src/test/updatechecker-test.js
+3 -2
View File
@@ -196,7 +196,8 @@ describe('updatechecker - checkAppUpdates', function () {
portBindings: { PORT: 5678 },
healthy: null,
accessRestriction: null,
oauthProxy: false
oauthProxy: false,
memoryLimit: 0
};
before(function (done) {
@@ -205,7 +206,7 @@ describe('updatechecker - checkAppUpdates', function () {
async.series([
database.initialize,
database._clear,
appdb.add.bind(null, APP_0.id, APP_0.appStoreId, APP_0.manifest, APP_0.location, APP_0.portBindings, APP_0.accessRestriction, APP_0.oauthProxy)
appdb.add.bind(null, APP_0.id, APP_0.appStoreId, APP_0.manifest, APP_0.location, APP_0.portBindings, APP_0.accessRestriction, APP_0.oauthProxy, APP_0.memoryLimit)
], done);
});