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

replace with custom superagent based on fetch API

Browse Source
This commit is contained in:
Girish Ramakrishnan
2025-02-14 17:26:54 +01:00
parent 68a08b1f62
commit 8e58349bfa
66 changed files with 1086 additions and 1031 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/routes/test/apps-test.js
+102 -102
View File
@@ -24,7 +24,7 @@ const apps = require('../../apps.js'),
safe = require('safetydance'),
server = require('../../server.js'),
settings = require('../../settings.js'),
superagent = require('superagent'),
superagent = require('../../superagent.js'),
tokens = require('../../tokens.js'),
url = require('url');
@@ -97,7 +97,7 @@ function waitForTask(taskId, callback) {
.end(function (error, result) {
process.stdout.write('.');
if (!result || result.statusCode !== 200) return retryCallback(null, new Error('Bad result'));
if (!result || result.status !== 200) return retryCallback(null, new Error('Bad result'));
if (result.body.active) return retryCallback(new Error('Still active'));
@@ -113,7 +113,7 @@ function waitForSetup(done) {
async.retry({ times: 5, interval: 4000 }, function (retryCallback) {
superagent.get(SERVER_URL + '/api/v1/cloudron/status')
.end(function (error, result) {
if (!result || result.statusCode !== 200) return retryCallback(new Error('Bad result'));
if (!result || result.status !== 200) return retryCallback(new Error('Bad result'));
if (!result.body.setup.active && result.body.setup.errorMessage === '' && result.body.adminFqdn) return retryCallback();
@@ -146,7 +146,7 @@ function startBox(done) {
.send({ domainConfig: DOMAIN_0 })
.end(function (error, result) {
expect(result).to.be.ok();
expect(result.statusCode).to.eql(200);
expect(result.status).to.eql(200);
waitForSetup(callback);
});
@@ -157,7 +157,7 @@ function startBox(done) {
.send({ username: USERNAME, password: PASSWORD, email: EMAIL })
.end(function (error, result) {
expect(result).to.be.ok();
expect(result.statusCode).to.eql(201);
expect(result.status).to.eql(201);
// stash for further use
token = result.body.token;
@@ -171,7 +171,7 @@ function startBox(done) {
.query({ access_token: token })
.send({ username: USERNAME_1, email: EMAIL_1, invite: false })
.end(async function (err, res) {
expect(res.statusCode).to.equal(201);
expect(res.status).to.equal(201);
user_1_id = res.body.id;
token_1 = hat(8 * 32);
@@ -236,7 +236,7 @@ xdescribe('App API', function () {
superagent.post(SERVER_URL + '/api/v1/apps')
.query({ access_token: token })
.end(function (err, res) {
expect(res.statusCode).to.equal(400);
expect(res.status).to.equal(400);
expect(res.body.message).to.eql('appStoreId or manifest is required');
done();
});
@@ -247,7 +247,7 @@ xdescribe('App API', function () {
.query({ access_token: token })
.send({ manifest: null })
.end(function (err, res) {
expect(res.statusCode).to.equal(400);
expect(res.status).to.equal(400);
expect(res.body.message).to.eql('appStoreId or manifest is required');
done();
});
@@ -258,7 +258,7 @@ xdescribe('App API', function () {
.query({ access_token: token })
.send({ manifest: 'epic' })
.end(function (err, res) {
expect(res.statusCode).to.equal(400);
expect(res.status).to.equal(400);
expect(res.body.message).to.eql('manifest must be an object');
done();
});
@@ -269,7 +269,7 @@ xdescribe('App API', function () {
.query({ access_token: token })
.send({ manifest: null, appStoreId: '' })
.end(function (err, res) {
expect(res.statusCode).to.equal(400);
expect(res.status).to.equal(400);
expect(res.body.message).to.eql('appStoreId or manifest is required');
done();
});
@@ -280,7 +280,7 @@ xdescribe('App API', function () {
.query({ access_token: token })
.send('garbage')
.end(function (err, res) {
expect(res.statusCode).to.equal(400);
expect(res.status).to.equal(400);
done();
});
});
@@ -290,7 +290,7 @@ xdescribe('App API', function () {
.query({ access_token: token })
.send({ manifest: APP_MANIFEST, subdomain: 'some', accessRestriction: null })
.end(function (err, res) {
expect(res.statusCode).to.equal(400);
expect(res.status).to.equal(400);
expect(res.body.message).to.eql('domain is required');
done();
});
@@ -301,7 +301,7 @@ xdescribe('App API', function () {
.query({ access_token: token })
.send({ manifest: APP_MANIFEST, subdomain: 'some', accessRestriction: null, domain: 'doesnotexist.com' })
.end(function (err, res) {
expect(res.statusCode).to.equal(400);
expect(res.status).to.equal(400);
expect(res.body.message).to.eql('No such domain');
done();
});
@@ -312,7 +312,7 @@ xdescribe('App API', function () {
.query({ access_token: token })
.send({ manifest: APP_MANIFEST, subdomain: 42, accessRestriction: null, domain: DOMAIN_0.domain })
.end(function (err, res) {
expect(res.statusCode).to.equal(400);
expect(res.status).to.equal(400);
expect(res.body.message).to.eql('subdomain is required');
done();
});
@@ -323,7 +323,7 @@ xdescribe('App API', function () {
.query({ access_token: token })
.send({ manifest: APP_MANIFEST, subdomain: 'my', accessRestriction: null, domain: DOMAIN_0.domain })
.end(function (err, res) {
expect(res.statusCode).to.equal(400);
expect(res.status).to.equal(400);
expect(res.body.message).to.contain('my is reserved');
done();
});
@@ -334,7 +334,7 @@ xdescribe('App API', function () {
.query({ access_token: token })
.send({ manifest: APP_MANIFEST, subdomain: constants.SMTP_SUBDOMAIN, accessRestriction: null, domain: DOMAIN_0.domain })
.end(function (err, res) {
expect(res.statusCode).to.equal(400);
expect(res.status).to.equal(400);
expect(res.body.message).to.contain(constants.SMTP_SUBDOMAIN + ' is reserved');
done();
});
@@ -345,7 +345,7 @@ xdescribe('App API', function () {
.query({ access_token: token })
.send({ manifest: APP_MANIFEST, subdomain: APP_SUBDOMAIN, portBindings: 23, accessRestriction: null, domain: DOMAIN_0.domain })
.end(function (err, res) {
expect(res.statusCode).to.equal(400);
expect(res.status).to.equal(400);
expect(res.body.message).to.contain('portBindings must be an object');
done();
});
@@ -356,7 +356,7 @@ xdescribe('App API', function () {
.query({ access_token: token })
.send({ manifest: APP_MANIFEST, subdomain: APP_SUBDOMAIN, portBindings: {}, domain: DOMAIN_0.domain })
.end(function (err, res) {
expect(res.statusCode).to.equal(400);
expect(res.status).to.equal(400);
expect(res.body.message).to.contain('accessRestriction is required');
done();
});
@@ -367,7 +367,7 @@ xdescribe('App API', function () {
.query({ access_token: token })
.send({ manifest: APP_MANIFEST, subdomain: APP_SUBDOMAIN, portBindings: {}, accessRestriction: '', domain: DOMAIN_0.domain })
.end(function (err, res) {
expect(res.statusCode).to.equal(400);
expect(res.status).to.equal(400);
expect(res.body.message).to.contain('accessRestriction is required');
done();
});
@@ -378,7 +378,7 @@ xdescribe('App API', function () {
.query({ access_token: token_1 })
.send({ manifest: APP_MANIFEST, subdomain: APP_SUBDOMAIN, portBindings: null, accessRestriction: null, domain: DOMAIN_0.domain })
.end(function (err, res) {
expect(res.statusCode).to.equal(403);
expect(res.status).to.equal(403);
done();
});
});
@@ -390,7 +390,7 @@ xdescribe('App API', function () {
.query({ access_token: token })
.send({ appStoreId: APP_STORE_ID, subdomain: APP_SUBDOMAIN, portBindings: null, domain: DOMAIN_0.domain, accessRestriction: { users: [ 'someuser' ], groups: [] } })
.end(function (err, res) {
expect(res.statusCode).to.equal(404);
expect(res.status).to.equal(404);
expect(fake.isDone()).to.be.ok();
done();
});
@@ -403,7 +403,7 @@ xdescribe('App API', function () {
.query({ access_token: token })
.send({ appStoreId: APP_STORE_ID, subdomain: APP_SUBDOMAIN, domain: DOMAIN_0.domain, portBindings: null, accessRestriction: null })
.end(function (err, res) {
expect(res.statusCode).to.equal(402);
expect(res.status).to.equal(402);
expect(fake1.isDone()).to.be.ok();
done();
});
@@ -419,7 +419,7 @@ xdescribe('App API', function () {
.query({ access_token: token })
.send({ appStoreId: APP_STORE_ID, subdomain: APP_SUBDOMAIN, domain: DOMAIN_0.domain, portBindings: { ECHO_SERVER_PORT: 7171 }, accessRestriction: { users: [ 'someuser' ], groups: [] } })
expect(res.statusCode).to.equal(202);
expect(res.status).to.equal(202);
expect(res.body.id).to.be.a('string');
APP_ID = res.body.id;
expect(fake1.isDone()).to.be.ok();
@@ -432,7 +432,7 @@ xdescribe('App API', function () {
.query({ access_token: token })
.send({ manifest: APP_MANIFEST, subdomain: APP_SUBDOMAIN, domain: DOMAIN_0.domain, portBindings: null, accessRestriction: null })
.end(function (err, res) {
expect(res.statusCode).to.equal(409);
expect(res.status).to.equal(409);
done();
});
});
@@ -443,7 +443,7 @@ xdescribe('App API', function () {
superagent.get(SERVER_URL + '/api/v1/apps/' + APP_ID)
.query({ access_token: token })
.end(function (err, res) {
expect(res.statusCode).to.equal(200);
expect(res.status).to.equal(200);
expect(res.body.id).to.eql(APP_ID);
expect(res.body.installationState).to.be.ok();
expect(res.body.mailboxName).to.be(APP_SUBDOMAIN + '.app');
@@ -456,7 +456,7 @@ xdescribe('App API', function () {
superagent.get(SERVER_URL + '/api/v1/apps/kubachi')
.query({ access_token: token })
.end(function (err, res) {
expect(res.statusCode).to.equal(404);
expect(res.status).to.equal(404);
done();
});
});
@@ -465,7 +465,7 @@ xdescribe('App API', function () {
superagent.get(SERVER_URL + '/api/v1/apps')
.query({ access_token: token })
.end(function (err, res) {
expect(res.statusCode).to.equal(200);
expect(res.status).to.equal(200);
expect(res.body.apps).to.be.an('array');
expect(res.body.apps[0].id).to.eql(APP_ID);
expect(res.body.apps[0].installationState).to.be.ok();
@@ -477,7 +477,7 @@ xdescribe('App API', function () {
superagent.get(SERVER_URL + '/api/v1/apps')
.query({ access_token: token_1 })
.end(function (err, res) {
expect(res.statusCode).to.equal(200);
expect(res.status).to.equal(200);
expect(res.body.apps).to.be.an('array');
expect(res.body.apps.length).to.equal(0);
done();
@@ -496,7 +496,7 @@ xdescribe('App API', function () {
superagent.get(SERVER_URL + '/api/v1/apps/' + APP_ID)
.query({ access_token: token })
.end(function (err, res) {
if (res.statusCode !== 200) return callback(new Error('Response error'));
if (res.status !== 200) return callback(new Error('Response error'));
if (res.body.installationState === apps.ISTATE_INSTALLED) { appResult = res.body; return callback(); }
if (res.body.installationState === apps.ISTATE_ERROR) return callback(new Error('Install error'));
@@ -570,7 +570,7 @@ xdescribe('App API', function () {
console.log(`talking to http://${appEntry.containerIp}:7777`);
superagent.get(`http://${appEntry.containerIp}:7777`).end(function (error, result) {
console.dir(error);
expect(result.statusCode).to.equal(200);
expect(result.status).to.equal(200);
done();
});
});
@@ -600,7 +600,7 @@ xdescribe('App API', function () {
superagent.get(SERVER_URL + '/api/v1/apps/' + APP_ID + '/logstream')
.query({ access_token: token, fromLine: 0 })
.end(function (err, res) {
expect(res.statusCode).to.be(400);
expect(res.status).to.be(400);
done();
});
});
@@ -637,7 +637,7 @@ xdescribe('App API', function () {
superagent.post(SERVER_URL + '/api/v1/apps/' + APP_ID + '/configure/label')
.query({ access_token: token })
.end(function (err, res) {
expect(res.statusCode).to.equal(400);
expect(res.status).to.equal(400);
done();
});
});
@@ -647,7 +647,7 @@ xdescribe('App API', function () {
.query({ access_token: token })
.send({ label: null })
.end(function (err, res) {
expect(res.statusCode).to.equal(400);
expect(res.status).to.equal(400);
done();
});
});
@@ -657,7 +657,7 @@ xdescribe('App API', function () {
.query({ access_token: token })
.send({ label: 'LABEL'})
.end(function (err, res) {
expect(res.statusCode).to.equal(200);
expect(res.status).to.equal(200);
done();
});
});
@@ -666,7 +666,7 @@ xdescribe('App API', function () {
superagent.get(SERVER_URL + '/api/v1/apps/' + APP_ID)
.query({ access_token: token })
.end(function (err, res) {
expect(res.statusCode).to.equal(200);
expect(res.status).to.equal(200);
expect(res.body.label).to.be('LABEL');
done();
});
@@ -677,7 +677,7 @@ xdescribe('App API', function () {
superagent.post(SERVER_URL + '/api/v1/apps/' + APP_ID + '/configure/tags')
.query({ access_token: token })
.end(function (err, res) {
expect(res.statusCode).to.equal(400);
expect(res.status).to.equal(400);
done();
});
});
@@ -687,7 +687,7 @@ xdescribe('App API', function () {
.query({ access_token: token })
.send({ tags: null })
.end(function (err, res) {
expect(res.statusCode).to.equal(400);
expect(res.status).to.equal(400);
done();
});
});
@@ -697,7 +697,7 @@ xdescribe('App API', function () {
.query({ access_token: token })
.send({ tags: ['tag1', '', 'tag2'] })
.end(function (err, res) {
expect(res.statusCode).to.equal(400);
expect(res.status).to.equal(400);
done();
});
});
@@ -707,7 +707,7 @@ xdescribe('App API', function () {
.query({ access_token: token })
.send({ tags: ['tag1', 123, 'tag2'] })
.end(function (err, res) {
expect(res.statusCode).to.equal(400);
expect(res.status).to.equal(400);
done();
});
});
@@ -717,7 +717,7 @@ xdescribe('App API', function () {
.query({ access_token: token })
.send({ tags: [ 'tag1', 'tag2' ] })
.end(function (err, res) {
expect(res.statusCode).to.equal(200);
expect(res.status).to.equal(200);
done();
});
});
@@ -726,7 +726,7 @@ xdescribe('App API', function () {
superagent.get(SERVER_URL + '/api/v1/apps/' + APP_ID)
.query({ access_token: token })
.end(function (err, res) {
expect(res.statusCode).to.equal(200);
expect(res.status).to.equal(200);
expect(res.body.tags).to.eql([ 'tag1', 'tag2' ]);
done();
});
@@ -736,7 +736,7 @@ xdescribe('App API', function () {
it('fails for no icon', function (done) {
superagent.post(SERVER_URL + '/api/v1/apps/' + APP_ID + '/configure/icon')
.end(function (err, res) {
expect(res.statusCode).to.equal(400);
expect(res.status).to.equal(400);
done();
});
});
@@ -745,7 +745,7 @@ xdescribe('App API', function () {
superagent.post(SERVER_URL + '/api/v1/apps/' + APP_ID + '/configure/icon')
.send({ icon: 'something non base64' })
.end(function (err, res) {
expect(res.statusCode).to.equal(400);
expect(res.status).to.equal(400);
done();
});
});
@@ -755,7 +755,7 @@ xdescribe('App API', function () {
.query({ access_token: token })
.send({ icon: 'iVBORw0KGgoAAAANSUhEUgAAAAEAAAABAQMAAAAl21bKAAAAA1BMVEX/TQBcNTh/AAAAAXRSTlPM0jRW/QAAAApJREFUeJxjYgAAAAYAAzY3fKgAAAAASUVORK5CYII=' })
.end(function (err, res) {
expect(res.statusCode).to.equal(200);
expect(res.status).to.equal(200);
done();
});
});
@@ -763,7 +763,7 @@ xdescribe('App API', function () {
it('did set the icon', function (done) {
superagent.get(SERVER_URL + '/api/v1/apps/' + APP_ID + '/icon')
.end(function (err, res) {
expect(res.statusCode).to.equal(200); // response is some PNG
expect(res.status).to.equal(200); // response is some PNG
done();
});
});
@@ -773,7 +773,7 @@ xdescribe('App API', function () {
.query({ access_token: token })
.send({ icon: null })
.end(function (err, res) {
expect(res.statusCode).to.equal(200);
expect(res.status).to.equal(200);
done();
});
});
@@ -784,7 +784,7 @@ xdescribe('App API', function () {
.query({ access_token: token })
.send({ enable: false })
.end(function (err, res) {
expect(res.statusCode).to.equal(200);
expect(res.status).to.equal(200);
done();
});
});
@@ -793,7 +793,7 @@ xdescribe('App API', function () {
superagent.get(SERVER_URL + '/api/v1/apps/' + APP_ID)
.query({ access_token: token })
.end(function (err, res) {
expect(res.statusCode).to.equal(200);
expect(res.status).to.equal(200);
expect(res.body.enableAutomaticUpdate).to.be(false);
done();
});
@@ -804,7 +804,7 @@ xdescribe('App API', function () {
.query({ access_token: token })
.send({ enable: false })
.end(function (err, res) {
expect(res.statusCode).to.equal(200);
expect(res.status).to.equal(200);
done();
});
});
@@ -813,7 +813,7 @@ xdescribe('App API', function () {
superagent.get(SERVER_URL + '/api/v1/apps/' + APP_ID)
.query({ access_token: token })
.end(function (err, res) {
expect(res.statusCode).to.equal(200);
expect(res.status).to.equal(200);
expect(res.body.enableBackup).to.be(false);
done();
});
@@ -825,7 +825,7 @@ xdescribe('App API', function () {
.query({ access_token: token })
.send({ accessRestriction: false })
.end(function (err, res) {
expect(res.statusCode).to.equal(400);
expect(res.status).to.equal(400);
done();
});
});
@@ -835,7 +835,7 @@ xdescribe('App API', function () {
.query({ access_token: token })
.send({ accessRestriction: null })
.end(function (err, res) {
expect(res.statusCode).to.equal(200);
expect(res.status).to.equal(200);
done();
});
});
@@ -845,7 +845,7 @@ xdescribe('App API', function () {
.query({ access_token: token })
.send({ accessRestriction: { users: [ 'someuserid' ], groups: [ 'somegroupid' ] } })
.end(function (err, res) {
expect(res.statusCode).to.equal(200);
expect(res.status).to.equal(200);
done();
});
});
@@ -856,7 +856,7 @@ xdescribe('App API', function () {
.query({ access_token: token })
.send({ upstreamUri: '' })
.end(function (err, res) {
expect(res.statusCode).to.equal(400);
expect(res.status).to.equal(400);
done();
});
});
@@ -866,7 +866,7 @@ xdescribe('App API', function () {
.query({ access_token: token })
.send({ upstreamUri: 'foobar:com' })
.end(function (err, res) {
expect(res.statusCode).to.equal(400);
expect(res.status).to.equal(400);
done();
});
});
@@ -876,7 +876,7 @@ xdescribe('App API', function () {
.query({ access_token: token })
.send({ upstreamUri: 'https://1.2.3.4:443' })
.end(function (err, res) {
expect(res.statusCode).to.equal(200);
expect(res.status).to.equal(200);
done();
});
});
@@ -887,7 +887,7 @@ xdescribe('App API', function () {
.query({ access_token: token })
.send({ subdomain: APP_SUBDOMAIN, domain: DOMAIN_0.domain, cert: CERT })
.end(function (err, res) {
expect(res.statusCode).to.equal(400);
expect(res.status).to.equal(400);
done();
});
});
@@ -897,7 +897,7 @@ xdescribe('App API', function () {
.query({ access_token: token })
.send({ subdomain: APP_SUBDOMAIN, domain: DOMAIN_0.domain, key: KEY })
.end(function (err, res) {
expect(res.statusCode).to.equal(400);
expect(res.status).to.equal(400);
done();
});
});
@@ -907,7 +907,7 @@ xdescribe('App API', function () {
.query({ access_token: token })
.send({ subdomain: APP_SUBDOMAIN, domain: DOMAIN_0.domain, cert: 'x' + CERT, key: KEY })
.end(function (err, res) {
expect(res.statusCode).to.equal(400);
expect(res.status).to.equal(400);
done();
});
});
@@ -917,7 +917,7 @@ xdescribe('App API', function () {
.query({ access_token: token })
.send({ subdomain: APP_SUBDOMAIN, domain: DOMAIN_0.domain, cert: CERT, key: KEY })
.end(function (err, res) {
expect(res.statusCode).to.equal(200);
expect(res.status).to.equal(200);
done();
});
});
@@ -927,7 +927,7 @@ xdescribe('App API', function () {
.query({ access_token: token })
.send({ subdomain: APP_SUBDOMAIN, domain: DOMAIN_0.domain, cert: null, key: null })
.end(function (err, res) {
expect(res.statusCode).to.equal(200);
expect(res.status).to.equal(200);
done();
});
});
@@ -938,7 +938,7 @@ xdescribe('App API', function () {
superagent.post(SERVER_URL + '/api/v1/apps/' + APP_ID + '/configure/memory_limit')
.query({ access_token: token })
.end(function (err, res) {
expect(res.statusCode).to.equal(400);
expect(res.status).to.equal(400);
done();
});
});
@@ -948,7 +948,7 @@ xdescribe('App API', function () {
.query({ access_token: token })
.send({ memoryLimit: -34 })
.end(function (err, res) {
expect(res.statusCode).to.equal(400);
expect(res.status).to.equal(400);
done();
});
});
@@ -958,7 +958,7 @@ xdescribe('App API', function () {
.query({ access_token: token })
.send({ memoryLimit: 512 * 1024 * 1024 })
.end(function (err, res) {
expect(res.statusCode).to.equal(202);
expect(res.status).to.equal(202);
taskId = res.body.taskId;
done();
});
@@ -987,7 +987,7 @@ xdescribe('App API', function () {
.query({ access_token: token })
.send({ robotsTxt: 34 })
.end(function (err, res) {
expect(res.statusCode).to.equal(400);
expect(res.status).to.equal(400);
done();
});
});
@@ -997,7 +997,7 @@ xdescribe('App API', function () {
.query({ access_token: token })
.send({ robotsTxt: 'any string is good', csp: null })
.end(function (err, res) {
expect(res.statusCode).to.equal(200);
expect(res.status).to.equal(200);
done();
});
});
@@ -1007,7 +1007,7 @@ xdescribe('App API', function () {
.query({ access_token: token })
.send({ robotsTxt: null, csp: null })
.end(function (err, res) {
expect(res.statusCode).to.equal(200);
expect(res.status).to.equal(200);
done();
});
});
@@ -1017,7 +1017,7 @@ xdescribe('App API', function () {
.query({ access_token: token })
.send({ robotsTxt: null, csp: 34 })
.end(function (err, res) {
expect(res.statusCode).to.equal(400);
expect(res.status).to.equal(400);
done();
});
});
@@ -1027,7 +1027,7 @@ xdescribe('App API', function () {
.query({ access_token: token })
.send({ robotsTxt: null, csp: 'frame-ancestors \'self\'' })
.end(function (err, res) {
expect(res.statusCode).to.equal(200);
expect(res.status).to.equal(200);
done();
});
});
@@ -1037,7 +1037,7 @@ xdescribe('App API', function () {
.query({ access_token: token })
.send({ robotsTxt: null, csp: null })
.end(function (err, res) {
expect(res.statusCode).to.equal(200);
expect(res.status).to.equal(200);
done();
});
});
@@ -1049,7 +1049,7 @@ xdescribe('App API', function () {
.query({ access_token: token })
.send({ subdomain: 'hellothre' })
.end(function (err, res) {
expect(res.statusCode).to.equal(400);
expect(res.status).to.equal(400);
done();
});
});
@@ -1059,7 +1059,7 @@ xdescribe('App API', function () {
.query({ access_token: token })
.send({ subdomain: 1234, domain: DOMAIN_0.domain })
.end(function (err, res) {
expect(res.statusCode).to.equal(400);
expect(res.status).to.equal(400);
done();
});
});
@@ -1069,7 +1069,7 @@ xdescribe('App API', function () {
.query({ access_token: token_1 })
.send({ subdomain: APP_SUBDOMAIN_NEW, domain: DOMAIN_0.domain, portBindings: { ECHO_SERVER_PORT: 7172 }, accessRestriction: null })
.end(function (err, res) {
expect(res.statusCode).to.equal(403);
expect(res.status).to.equal(403);
done();
});
});
@@ -1079,7 +1079,7 @@ xdescribe('App API', function () {
.query({ access_token: token })
.send({ subdomain: APP_SUBDOMAIN_NEW, domain: DOMAIN_0.domain, portBindings: { ECHO_SERVER_PORT: 7172 } })
.end(function (err, res) {
expect(res.statusCode).to.equal(202);
expect(res.status).to.equal(202);
taskId = res.body.taskId;
done();
});
@@ -1125,7 +1125,7 @@ xdescribe('App API', function () {
superagent.post(SERVER_URL + '/api/v1/apps/' + APP_ID + '/configure/debug_mode')
.query({ access_token: token })
.end(function (err, res) {
expect(res.statusCode).to.equal(400);
expect(res.status).to.equal(400);
done();
});
});
@@ -1135,7 +1135,7 @@ xdescribe('App API', function () {
.query({ access_token: token })
.send({ debugMode: 'sleep' })
.end(function (err, res) {
expect(res.statusCode).to.equal(400);
expect(res.status).to.equal(400);
done();
});
});
@@ -1145,7 +1145,7 @@ xdescribe('App API', function () {
.query({ access_token: token })
.send({ debugMode: { readonlyRootfs: false } })
.end(function (err, res) {
expect(res.statusCode).to.equal(202);
expect(res.status).to.equal(202);
taskId = res.body.taskId;
done();
});
@@ -1173,7 +1173,7 @@ xdescribe('App API', function () {
.query({ access_token: token })
.send({ debugMode: null })
.end(function (err, res) {
expect(res.statusCode).to.equal(202);
expect(res.status).to.equal(202);
taskId = res.body.taskId;
done();
});
@@ -1202,7 +1202,7 @@ xdescribe('App API', function () {
superagent.post(SERVER_URL + '/api/v1/apps/' + APP_ID + '/configure/env')
.query({ access_token: token })
.end(function (err, res) {
expect(res.statusCode).to.equal(400);
expect(res.status).to.equal(400);
done();
});
});
@@ -1212,7 +1212,7 @@ xdescribe('App API', function () {
.query({ access_token: token })
.send({ env: 'ok' })
.end(function (err, res) {
expect(res.statusCode).to.equal(400);
expect(res.status).to.equal(400);
done();
});
});
@@ -1222,7 +1222,7 @@ xdescribe('App API', function () {
.query({ access_token: token })
.send({ env: { 'OPM': 'SAITAMA' } })
.end(function (err, res) {
expect(res.statusCode).to.equal(202);
expect(res.status).to.equal(202);
taskId = res.body.taskId;
done();
});
@@ -1250,7 +1250,7 @@ xdescribe('App API', function () {
.query({ access_token: token })
.send({ env: {} })
.end(function (err, res) {
expect(res.statusCode).to.equal(202);
expect(res.status).to.equal(202);
taskId = res.body.taskId;
done();
});
@@ -1278,7 +1278,7 @@ xdescribe('App API', function () {
superagent.post(SERVER_URL + '/api/v1/apps/' + APP_ID + '/configure/mailbox')
.query({ access_token: token })
.end(function (err, res) {
expect(res.statusCode).to.equal(400);
expect(res.status).to.equal(400);
done();
});
});
@@ -1288,7 +1288,7 @@ xdescribe('App API', function () {
.query({ access_token: token })
.send({ mailbox: 'genos@cloudron.io' })
.end(function (err, res) {
expect(res.statusCode).to.equal(400);
expect(res.status).to.equal(400);
done();
});
});
@@ -1298,7 +1298,7 @@ xdescribe('App API', function () {
.query({ access_token: token })
.send({ mailboxName: 'genos', mailboxDomain: DOMAIN_0.domain })
.end(function (err, res) {
expect(res.statusCode).to.equal(202);
expect(res.status).to.equal(202);
taskId = res.body.taskId;
done();
});
@@ -1326,7 +1326,7 @@ xdescribe('App API', function () {
.query({ access_token: token })
.send({ mailboxName: null, mailboxDomain: DOMAIN_0.domain })
.end(function (err, res) {
expect(res.statusCode).to.equal(202);
expect(res.status).to.equal(202);
taskId = res.body.taskId;
done();
});
@@ -1354,7 +1354,7 @@ xdescribe('App API', function () {
superagent.post(SERVER_URL + '/api/v1/apps/' + APP_ID + '/configure/data_dir')
.query({ access_token: token })
.end(function (err, res) {
expect(res.statusCode).to.equal(400);
expect(res.status).to.equal(400);
done();
});
});
@@ -1364,7 +1364,7 @@ xdescribe('App API', function () {
.query({ access_token: token })
.send({ dataDir: 'what' })
.end(function (err, res) {
expect(res.statusCode).to.equal(400);
expect(res.status).to.equal(400);
done();
});
});
@@ -1377,7 +1377,7 @@ xdescribe('App API', function () {
.query({ access_token: token })
.send({ dataDir: dataDir })
.end(function (err, res) {
expect(res.statusCode).to.equal(202);
expect(res.status).to.equal(202);
taskId = res.body.taskId;
done();
});
@@ -1392,7 +1392,7 @@ xdescribe('App API', function () {
.query({ access_token: token })
.send({ dataDir: null })
.end(function (err, res) {
expect(res.statusCode).to.equal(202);
expect(res.status).to.equal(202);
taskId = res.body.taskId;
done();
});
@@ -1409,7 +1409,7 @@ xdescribe('App API', function () {
superagent.post(SERVER_URL + '/api/v1/apps/' + APP_ID + '/stop')
.query({ access_token: token_1 })
.end(function (err, res) {
expect(res.statusCode).to.equal(403);
expect(res.status).to.equal(403);
done();
});
});
@@ -1418,7 +1418,7 @@ xdescribe('App API', function () {
superagent.post(SERVER_URL + '/api/v1/apps/' + APP_ID + '/stop')
.query({ access_token: token })
.end(function (err, res) {
expect(res.statusCode).to.equal(202);
expect(res.status).to.equal(202);
taskId = res.body.taskId;
done();
});
@@ -1437,7 +1437,7 @@ xdescribe('App API', function () {
// wait for app status to be updated
superagent.get(SERVER_URL + '/api/v1/apps/' + APP_ID).query({ access_token: token }).end(function (error, result) {
if (error || result.statusCode !== 200 || result.body.runState !== 'stopped') return done(new Error('App is not in stopped state'));
if (error || result.status !== 200 || result.body.runState !== 'stopped') return done(new Error('App is not in stopped state'));
done();
});
@@ -1449,7 +1449,7 @@ xdescribe('App API', function () {
superagent.post(SERVER_URL + '/api/v1/apps/' + APP_ID + '/start')
.query({ access_token: token_1 })
.end(function (err, res) {
expect(res.statusCode).to.equal(403);
expect(res.status).to.equal(403);
done();
});
});
@@ -1458,7 +1458,7 @@ xdescribe('App API', function () {
superagent.post(SERVER_URL + '/api/v1/apps/' + APP_ID + '/start')
.query({ access_token: token })
.end(function (err, res) {
expect(res.statusCode).to.equal(202);
expect(res.status).to.equal(202);
taskId = res.body.taskId;
done();
});
@@ -1474,7 +1474,7 @@ xdescribe('App API', function () {
superagent.get('http://localhost:' + app.httpPort + APP_MANIFEST.healthCheckPath)
.end(function (err, res) {
if (res && res.statusCode === 200) return done();
if (res && res.status === 200) return done();
done(new Error('app is not running'));
});
});
@@ -1484,7 +1484,7 @@ xdescribe('App API', function () {
superagent.post(SERVER_URL + '/api/v1/apps/' + APP_ID + '/restart')
.query({ access_token: token })
.end(function (err, res) {
expect(res.statusCode).to.equal(202);
expect(res.status).to.equal(202);
taskId = res.body.taskId;
done();
});
@@ -1500,7 +1500,7 @@ xdescribe('App API', function () {
superagent.get('http://localhost:' + app.httpPort + APP_MANIFEST.healthCheckPath)
.end(function (err, res) {
if (res && res.statusCode === 200) return done();
if (res && res.status === 200) return done();
done(new Error('app is not running'));
});
});
@@ -1512,7 +1512,7 @@ xdescribe('App API', function () {
superagent.post(SERVER_URL + '/api/v1/apps/whatever/uninstall')
.query({ access_token: token })
.end(function (err, res) {
expect(res.statusCode).to.equal(404);
expect(res.status).to.equal(404);
done();
});
});
@@ -1521,7 +1521,7 @@ xdescribe('App API', function () {
superagent.post(SERVER_URL + '/api/v1/apps/' + APP_ID + '/uninstall')
.query({ access_token: token_1 })
.end(function (err, res) {
expect(res.statusCode).to.equal(403);
expect(res.status).to.equal(403);
done();
});
});
@@ -1533,7 +1533,7 @@ xdescribe('App API', function () {
superagent.post(SERVER_URL + '/api/v1/apps/' + APP_ID + '/uninstall')
.query({ access_token: token })
.end(function (err, res) {
expect(res.statusCode).to.equal(202);
expect(res.status).to.equal(202);
taskId = res.body.taskId;
expect(fake1.isDone()).to.be.ok();
expect(fake2.isDone()).to.be.ok();
@@ -1562,7 +1562,7 @@ xdescribe('App API', function () {
superagent.get(SERVER_URL + '/api/v1/apps/' + APP_ID)
.query({ access_token: token })
.end(function (err, res) {
if (res.statusCode === 404) return done(null);
if (res.status === 404) return done(null);
done(new Error('App is still there'));
});
});