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

Rework the progress API to use the task progress

Browse Source
This commit is contained in:
Girish Ramakrishnan
2018-11-19 20:01:02 -08:00
parent 218739a6b5
commit 305a3c94d0
10 changed files with 18 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/test/backups-test.js
View File

@@ -18,7 +18,6 @@ var async = require('async'),
mkdirp = require('mkdirp'),
readdirp = require('readdirp'),
path = require('path'),
progress = require('../progress.js'),
rimraf = require('rimraf'),
settings = require('../settings.js'),
SettingsError = require('../settings.js').SettingsError,
@@ -309,7 +308,6 @@ describe('backups', function () {
after(function (done) {
rimraf.sync(gBackupConfig.backupFolder);
progress.clear(progress.BACKUP);
done();
});

49
src/test/server-test.js
View File

@@ -9,7 +9,6 @@
var config = require('../config.js'),
database = require('../database.js'),
expect = require('expect.js'),
progress = require('../progress.js'),
superagent = require('superagent'),
server = require('../server.js');
@@ -138,54 +137,6 @@ describe('Server', function () {
});
});
describe('progress', function () {
before(function (done) {
server.start(done);
});
after(function (done) {
server.stop(function () {
done();
});
});
it('succeeds with no progress', function (done) {
superagent.get(SERVER_URL + '/api/v1/cloudron/progress', function (error, result) {
expect(result.statusCode).to.equal(200);
expect(result.body.update).to.be(null);
expect(result.body.backup).to.be(null);
done();
});
});
it('succeeds with update progress', function (done) {
progress.set(progress.UPDATE, 13, 'This is some status string');
superagent.get(SERVER_URL + '/api/v1/cloudron/progress', function (error, result) {
expect(result.statusCode).to.equal(200);
expect(result.body.update).to.be.an('object');
expect(result.body.update.percent).to.be.a('number');
expect(result.body.update.percent).to.equal(13);
expect(result.body.update.message).to.be.a('string');
expect(result.body.update.message).to.equal('This is some status string');
expect(result.body.backup).to.be(null);
done();
});
});
it('succeeds with no progress after clearing the update', function (done) {
progress.clear(progress.UPDATE);
superagent.get(SERVER_URL + '/api/v1/cloudron/progress', function (error, result) {
expect(result.statusCode).to.equal(200);
expect(result.body.update).to.be(null);
expect(result.body.backup).to.be(null);
done();
});
});
});
describe('shutdown', function () {
before(function (done) {
server.start(done);