eventlog: async'ify
This commit is contained in:
@@ -5,16 +5,26 @@ const async = require('async'),
|
||||
database = require('../../database.js'),
|
||||
expect = require('expect.js'),
|
||||
server = require('../../server.js'),
|
||||
superagent = require('superagent');
|
||||
superagent = require('superagent'),
|
||||
tokendb = require('../../tokendb.js');
|
||||
|
||||
exports = module.exports = {
|
||||
setup,
|
||||
cleanup,
|
||||
|
||||
owner: {
|
||||
id: null,
|
||||
username: 'superadmin',
|
||||
password: 'Foobar?1337',
|
||||
email: 'silly@me.com',
|
||||
email: 'superadmin@cloudron.local',
|
||||
token: null
|
||||
},
|
||||
|
||||
user: {
|
||||
id: null,
|
||||
username: 'user',
|
||||
password: 'Foobar?1338',
|
||||
email: 'user@cloudron.local',
|
||||
token: null
|
||||
},
|
||||
|
||||
@@ -22,7 +32,7 @@ exports = module.exports = {
|
||||
};
|
||||
|
||||
function setup(done) {
|
||||
const owner = exports.owner, serverUrl = exports.serverUrl;
|
||||
const owner = exports.owner, serverUrl = exports.serverUrl, user = exports.user;
|
||||
|
||||
async.series([
|
||||
server.start.bind(null),
|
||||
@@ -38,10 +48,28 @@ function setup(done) {
|
||||
|
||||
// stash token for further use
|
||||
owner.token = result.body.token;
|
||||
owner.id = result.body.id;
|
||||
|
||||
callback();
|
||||
});
|
||||
},
|
||||
|
||||
function createUser(callback) {
|
||||
superagent.post(`${serverUrl}/api/v1/users`)
|
||||
.query({ access_token: owner.token })
|
||||
.send({ username: user.username, email: user.email })
|
||||
.end(function (error, result) {
|
||||
expect(error).to.not.be.ok();
|
||||
expect(result.statusCode).to.equal(201);
|
||||
|
||||
user.id = result.body.id;
|
||||
user.token = 'usertoken';
|
||||
|
||||
// HACK to get a token for second user (passwords are generated and the user should have gotten a password setup link...)
|
||||
tokendb.add({ id: 'tid-3', accessToken: user.token, identifier: user.id, clientId: 'test-client-id', expires: Date.now() + 10000, scope: 'unused', name: 'fromtest' }, callback);
|
||||
});
|
||||
}
|
||||
|
||||
], done);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user