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

Simply use settings.setBackupConfig

Browse Source
This commit is contained in:
Girish Ramakrishnan
2016-10-13 15:28:05 -07:00
parent 6e8eea6876
commit d460c36e14
6 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/routes/test/backups-test.js
+1 -2
View File
@@ -13,7 +13,6 @@ var appdb = require('../../appdb.js'),
superagent = require('superagent'),
server = require('../../server.js'),
settings = require('../../settings.js'),
settingsdb = require('../../settingsdb.js'),
nock = require('nock');
var SERVER_URL = 'http://localhost:' + config.get('port');
@@ -56,7 +55,7 @@ function setup(done) {
},
function createSettings(callback) {
settingsdb.set(settings.BACKUP_CONFIG_KEY, JSON.stringify({ provider: 'caas', token: 'BACKUP_TOKEN', bucket: 'Bucket', prefix: 'Prefix' }), callback);
settings.setBackupConfig({ provider: 'caas', token: 'BACKUP_TOKEN', bucket: 'Bucket', prefix: 'Prefix' }, callback);
}
], done);
}
src/routes/test/cloudron-test.js
+1 -2
View File
@@ -15,7 +15,6 @@ var async = require('async'),
superagent = require('superagent'),
server = require('../../server.js'),
settings = require('../../settings.js'),
settingsdb = require('../../settingsdb.js'),
shell = require('../../shell.js');
var SERVER_URL = 'http://localhost:' + config.get('port');
@@ -32,7 +31,7 @@ function setup(done) {
server.start(function (error) {
if (error) return done(error);
settingsdb.set(settings.BACKUP_CONFIG_KEY, JSON.stringify({ provider: 'caas', token: 'BACKUP_TOKEN', bucket: 'Bucket', prefix: 'Prefix' }), done);
settings.setBackupConfig({ provider: 'caas', token: 'BACKUP_TOKEN', bucket: 'Bucket', prefix: 'Prefix' }, done);
});
}
src/routes/test/settings-test.js
-1
View File
@@ -1,4 +1,3 @@
/* jslint node:true */
/* global it:false */
/* global describe:false */
/* global before:false */
src/routes/test/simpleauth-test.js
+2 -3
View File
@@ -16,8 +16,7 @@ var appdb = require('../../appdb.js'),
server = require('../../server.js'),
simpleauth = require('../../simpleauth.js'),
nock = require('nock'),
settings = require('../../settings.js'),
settingsdb = require('../../settingsdb.js');
settings = require('../../settings.js');
describe('SimpleAuth API', function () {
var SERVER_URL = 'http://localhost:' + config.get('port');
@@ -165,7 +164,7 @@ describe('SimpleAuth API', function () {
appdb.add.bind(null, APP_1.id, APP_1.appStoreId, APP_1.manifest, APP_1.location, APP_1.portBindings, APP_1),
appdb.add.bind(null, APP_2.id, APP_2.appStoreId, APP_2.manifest, APP_2.location, APP_2.portBindings, APP_2),
appdb.add.bind(null, APP_3.id, APP_3.appStoreId, APP_3.manifest, APP_3.location, APP_3.portBindings, APP_3),
settingsdb.set.bind(null, settings.BACKUP_CONFIG_KEY, JSON.stringify({ provider: 'caas', token: 'BACKUP_TOKEN', bucket: 'Bucket', prefix: 'Prefix' }))
settings.setBackupConfig.bind(null, { provider: 'caas', token: 'BACKUP_TOKEN', bucket: 'Bucket', prefix: 'Prefix' })
], done);
});
src/routes/test/sysadmin-test.js
+1 -2
View File
@@ -13,7 +13,6 @@ var appdb = require('../../appdb.js'),
superagent = require('superagent'),
server = require('../../server.js'),
settings = require('../../settings.js'),
settingsdb = require('../../settingsdb.js'),
nock = require('nock');
var SERVER_URL = 'http://localhost:' + config.get('port');
@@ -56,7 +55,7 @@ function setup(done) {
},
function createSettings(callback) {
settingsdb.set(settings.BACKUP_CONFIG_KEY, JSON.stringify({ provider: 'caas', token: 'BACKUP_TOKEN', bucket: 'Bucket', prefix: 'Prefix' }), callback);
settings.setBackupConfig({ provider: 'caas', token: 'BACKUP_TOKEN', bucket: 'Bucket', prefix: 'Prefix' }, callback);
}
], done);
}