Fixed tests

This commit is contained in:
Dennis Schwerdel 2017-05-23 21:45:05 +02:00
parent b5aadcde74
commit 13de61d86e
1 changed files with 24 additions and 36 deletions

View File

@ -51,61 +51,49 @@ describe('Application life cycle test', function () {
var SYNC_PORT = 22001;
var app;
function pageLoaded(callback) {
browser.wait(until.titleMatches(/[0-9a-f]{12} \| Syncthing/), TEST_TIMEOUT).then(callback);
function pageLoaded() {
return browser.wait(until.titleMatches(/[0-9a-f]{12} \| Syncthing/), TEST_TIMEOUT);
}
function visible(selector, callback) {
function visible(selector) {
return browser.wait(until.elementLocated(selector), TEST_TIMEOUT).then(function () {
browser.wait(until.elementIsVisible(browser.findElement(selector)), TEST_TIMEOUT).then(function () {
callback();
});
return browser.wait(until.elementIsVisible(browser.findElement(selector)), TEST_TIMEOUT);
});
}
function loadPageWait(callback) {
browser.manage().deleteAllCookies();
setTimeout(function() {
browser.get('https://' + username + ':' + password + '@' + app.fqdn);
pageLoaded(function() {
callback();
});
}, 60000); //Timeout since, reconfigure lacks health-check
}
function loadPage(callback) {
browser.manage().deleteAllCookies();
browser.get('https://' + username + ':' + password + '@' + app.fqdn);
pageLoaded(function() {
return pageLoaded().then(function() {
callback();
});
}
function addFolder(callback) {
pageLoaded(function() {
return pageLoaded().then(function() {
browser.findElement(by.css('[ng-click*=addFolder]')).click();
visible(by.id('folderPath'), function() {
browser.findElement(by.id('folderLabel')).sendKeys('test').then(function() {
browser.findElement(by.id('folderPath')).sendKeys('/app/data/test').then(function() {
//Clear and re-enter the folder to avoid race with auto-completion
browser.findElement(by.id('folderPath')).clear().then(function() {
browser.findElement(by.id('folderPath')).sendKeys('/app/data/test').then(function() {
browser.findElement(by.css('[ng-click*=saveFolder]')).click().then(function() {
browser.wait(until.elementLocated(by.css('#folders .panel-status span[ng-switch-when=unshared]')), TEST_TIMEOUT).then(function() {
callback();
});
});
});
});
});
});
return visible(by.id('folderPath')).then(function() {
return browser.findElement(by.id('folderLabel')).sendKeys('test');
}).then(function() {
return browser.findElement(by.id('folderPath')).sendKeys('/app/data/test');
}).then(function() {
//Clear and re-enter the folder to avoid race with auto-completion
return browser.findElement(by.id('folderPath')).clear();
}).then(function() {
return browser.findElement(by.id('folderPath')).sendKeys('/app/data/test');
}).then(function() {
return browser.findElement(by.css('[ng-click*=saveFolder]')).click();
}).then(function() {
return browser.wait(until.elementLocated(by.css('#folders .panel-status span[ng-switch-when=unshared]')), TEST_TIMEOUT);
}).then(function() {
callback();
});
});
}
function removeFolder(callback) {
browser.get('https://' + username + ':' + password + '@' + app.fqdn);
pageLoaded(function() {
return pageLoaded().then(function() {
browser.findElement(by.css('#folders button')).click();
setTimeout(function() {
browser.findElement(by.css('#folder-0 button[ng-click*=editFolder]')).click();
@ -152,13 +140,13 @@ describe('Application life cycle test', function () {
it('move to different location', function () {
browser.manage().deleteAllCookies();
execSync('cloudron configure --location ' + LOCATION + '2', { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
execSync('cloudron configure --wait --location ' + LOCATION + '2', { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
var inspect = JSON.parse(execSync('cloudron inspect'));
app = inspect.apps.filter(function (a) { return a.location === LOCATION + '2'; })[0];
expect(app).to.be.an('object');
});
it('can load page', loadPageWait);
it('can load page', loadPage);
it('can add folder', addFolder);
it('can remove folder', removeFolder);