activation: move registration into provision model code
This commit is contained in:
@@ -8,6 +8,7 @@ const apps = require('../../apps.js'),
|
||||
expect = require('expect.js'),
|
||||
fs = require('fs'),
|
||||
mailer = require('../../mailer.js'),
|
||||
nock = require('nock'),
|
||||
oidc = require('../../oidc.js'),
|
||||
safe = require('safetydance'),
|
||||
server = require('../../server.js'),
|
||||
@@ -135,12 +136,16 @@ async function setup() {
|
||||
await timers.setTimeout(2000);
|
||||
|
||||
// create owner
|
||||
const scope1 = nock(await appstore.getApiServerOrigin())
|
||||
.post('/api/v1/register_cloudron3', (body) => typeof body.domain === 'string' && typeof body.version === 'string')
|
||||
.reply(201, { id: 'cid', token: 'CLOUDRON_TOKEN' });
|
||||
response = await superagent.post(`${serverUrl}/api/v1/provision/activate`)
|
||||
.query({ setupToken: 'somesetuptoken' })
|
||||
.send({ username: owner.username, password: owner.password, email: owner.email });
|
||||
expect(response.status).to.eql(201);
|
||||
owner.token = response.body.token;
|
||||
owner.id = response.body.userId;
|
||||
expect(scope1.isDone()).to.be.ok();
|
||||
|
||||
// create an admin
|
||||
response = await superagent.post(`${serverUrl}/api/v1/users`)
|
||||
@@ -191,7 +196,6 @@ async function checkMails(number) {
|
||||
async function waitForTask(taskId) {
|
||||
debug(`Waiting for task: ${taskId}`);
|
||||
|
||||
// eslint-disable-next-line no-constant-condition
|
||||
for (let i = 0; i < 30; i++) {
|
||||
const result = await tasks.get(taskId);
|
||||
expect(result).to.not.be(null);
|
||||
|
||||
Reference in New Issue
Block a user