iamthefij/cloudron-e2e-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

use domain name in populateAddons and checkAddons (for alt domain)

Browse Source
This commit is contained in:
Girish Ramakrishnan 2016-04-26 10:11:03 -07:00
parent 21ec8797cc
commit 968432eaa7
7 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cloudron.js
View File

@ -411,8 +411,8 @@ Cloudron.prototype.checkDMARC = function (callback) {
});
};
Cloudron.prototype.populateAddons = function (location) {
var res = request.post('https://' + this.appFqdn(location) + '/populate_addons').end();
Cloudron.prototype.populateAddons = function (domain) {
var res = request.post('https://' + domain + '/populate_addons').end();
assert.strictEqual(res.statusCode, 200);
for (var addon in res.body) {
@ -420,12 +420,12 @@ Cloudron.prototype.populateAddons = function (location) {
}
};
Cloudron.prototype.checkAddons = function (location, owner) {
Cloudron.prototype.checkAddons = function (domain, owner) {
var lastError;
// try many times because the scheduler takes sometime to run
for (var i = 0; i < 100; i++) {
var res = request.post('https://' + this.appFqdn(location) + '/check_addons').query({ username: owner.username, password: owner.password }).end();
var res = request.post('https://' + domain + '/check_addons').query({ username: owner.username, password: owner.password }).end();
try {
assert.strictEqual(res.statusCode, 200);

4
test/alt-domain-test.js
View File

@ -64,11 +64,11 @@ describe('Custom domain test', function () {
});
it('can populate the addons', function () {
cloudron.populateAddons(location);
cloudron.populateAddons(cloudron.appFqdn(location));
});
it('can check the addons', function () {
cloudron.checkAddons(location, owner);
cloudron.checkAddons(cloudron.appFqdn(location), owner);
});
it('can setup cname for altlocation', function (done) {

4
test/app-flow-test.js
View File

@ -60,11 +60,11 @@ describe('Application flow test', function () {
});
it('can populate the addons', function () {
cloudron.populateAddons(location);
cloudron.populateAddons(cloudron.appFqdn(location));
});
it('can check the addons', function () {
cloudron.checkAddons(location, owner);
cloudron.checkAddons(cloudron.appFqdn(location), owner);
});
it('displays app graphs', function () {

4
test/cloudron-backup-test.js
View File

@ -62,11 +62,11 @@ describe('Cloudron backup testing', function () {
});
it('can populate the addons', function () {
cloudron.populateAddons(location);
cloudron.populateAddons(cloudron.appFqdn(location));
});
it('can check the addons', function () {
cloudron.checkAddons(location, owner);
cloudron.checkAddons(cloudron.appFqdn(location), owner);
});
it('can backup the box', function () {

4
test/cloudron-update-ams3-test.js
View File

@ -77,11 +77,11 @@ describe('Cloudron update testing', function () {
});
it('can populate the addons', function () {
cloudron.populateAddons(location);
cloudron.populateAddons(cloudron.appFqdn(location));
});
it('can check the addons', function () {
cloudron.checkAddons(location, owner);
cloudron.checkAddons(cloudron.appFqdn(location), owner);
});
it('can update the box', function () {

4
test/cloudron-update-sfo1-test.js
View File

@ -77,11 +77,11 @@ describe('Cloudron update testing', function () {
});
it('can populate the addons', function () {
cloudron.populateAddons(location);
cloudron.populateAddons(cloudron.appFqn(location));
});
it('can check the addons', function () {
cloudron.checkAddons(location, owner);
cloudron.checkAddons(cloudron.appFqdn(location), owner);
});
it('can update the box', function () {

4
test/custom-domain-test.js
View File

@ -111,11 +111,11 @@ describe('Custom domain test', function () {
});
it('can populate the addons', function () {
cloudron.populateAddons(location);
cloudron.populateAddons(cloudron.appFqdn(location));
});
it('can check the addons', function () {
cloudron.checkAddons(location, owner);
cloudron.checkAddons(cloudron.appFqdn(location), owner);
});
it('can backup the box', function () {