1
0
mirror of https://git.cloudron.io/cloudron/syncthing-app synced 2025-09-15 01:19:07 +00:00

Caching ldap auth and fixed tests

This commit is contained in:
Dennis Schwerdel
2017-05-23 15:08:50 +02:00
parent 04c3af14e2
commit b5aadcde74
4 changed files with 21 additions and 29 deletions

View File

@@ -63,10 +63,20 @@ describe('Application life cycle test', function () {
});
}
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() {
pageLoaded(function() {
callback();
});
}
@@ -94,16 +104,17 @@ describe('Application life cycle test', function () {
}
function removeFolder(callback) {
browser.get('https://' + username + ':' + password + '@' + app.fqdn);
pageLoaded(function() {
browser.findElement(by.css('#folders button')).click();
setTimeout(function() {
browser.findElement(by.css('#folder-0 button[ng-click*=editFolder]')).click();
setTimeout(function() {
browser.findElement(by.css('[ng-click*=deleteFolder]')).click().then(function() {
setTimeout(callback, 500); //This needs to run for some time
setTimeout(callback, 1000); //This needs to run for some time
});
}, 500); //No way to check for visibility of angular-js components
}, 500); //No way to check for visibility of angular-js components
}, 1000); //No way to check for visibility of angular-js components
}, 1000); //No way to check for visibility of angular-js components
});
}
@@ -147,7 +158,7 @@ describe('Application life cycle test', function () {
expect(app).to.be.an('object');
});
it('can load page', loadPage);
it('can load page', loadPageWait);
it('can add folder', addFolder);
it('can remove folder', removeFolder);