Fix up tests

test/test.js

@@ -37,11 +37,12 @@ describe('Application life cycle test', function () {
     var username = process.env.USERNAME;
     var password = process.env.PASSWORD;
     var TIMEOUT = parseInt(process.env.TIMEOUT, 10) || 5000;
-    var email, token;
+    var email = process.env.EMAIL, token;
 
     before(function (done) {
         if (!process.env.USERNAME) return done(new Error('USERNAME env var not set'));
         if (!process.env.PASSWORD) return done(new Error('PASSWORD env var not set'));
+        if (!process.env.EMAIL) return done(new Error('EMAIL env var not set'));
 
         var seleniumJar= require('selenium-server-standalone-jar');
         var SeleniumServer = require('selenium-webdriver/remote').SeleniumServer;
@@ -58,12 +59,12 @@ describe('Application life cycle test', function () {
         done();
     });
 
-    function waitForUrl(url, done) {
-        browser.wait(function () {
+    function waitForUrl(url) {
+        return browser.wait(function () {
             return browser.getCurrentUrl().then(function (currentUrl) {
                 return currentUrl === url;
             });
-        }, TIMEOUT).then(function () { done(); });
+        }, TIMEOUT);
     }
 
     function getAppInfo() {
@@ -128,11 +129,13 @@ return done();
         }).then(function () {
             return browser.findElement(by.xpath('//button[contains(text(), "Commit Changes")]')).click();
         }).then(function () {
-            waitForUrl('https://' + app.fqdn + '/' + username + '/' + reponame + '/src/branch/master/newfile', done);
+            return waitForUrl('https://' + app.fqdn + '/' + username + '/' + reponame + '/src/branch/master/newfile');
+        }).then(function () {
+            done();
         });
     }
 
-    function login(done) {
+    function login(username, password, done) {
         browser.get('https://' + app.fqdn + '/user/login').then(function () {
             return browser.findElement(by.id('user_name')).sendKeys(username);
         }).then(function () {
@@ -146,6 +149,18 @@ return done();
         });
     }
 
+    function adminLogin(done) {
+        login('root', 'changeme', done);
+    }
+
+    function logout(done) {
+        browser.get('https://' + app.fqdn + '/user/logout').then(function () {
+            return waitForUrl('https://' + app.fqdn + '/explore/repos');
+        }).then(function () {
+            done();
+        });
+    }
+
     function addPublicKey(done) {
         var publicKey = fs.readFileSync(__dirname + '/id_rsa.pub', 'utf8');
 
@@ -310,8 +325,11 @@ return done();
         });
     });
 
-    it('can login', login);
+    it('can admin login', adminLogin);
     it('can send mail', sendMail);
+    it('can logout', logout);
+
+    it('can login', login.bind(null, username, password));
     it('can set avatar', setAvatar);
     it('can get avatar', checkAvatar);
 
@@ -334,7 +352,7 @@ return done();
         done();
     });
 
-    it('can login', login);
+    it('can login', login.bind(null, username, password));
     it('displays correct clone url', checkCloneUrl);
     it('can clone the url', cloneRepo);
     it('file exists in repo', fileExists);
@@ -347,7 +365,7 @@ return done();
         execSync('cloudron restore --app ' + app.id, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
     });
 
-    it('can login', login);
+    it('can login', login.bind(null, username, password));
     it('can get avatar', checkAvatar);
     it('can clone the url', cloneRepo);
     it('file exists in repo', function () { expect(fs.existsSync(repodir + '/newfile')).to.be(true); });
@@ -365,7 +383,7 @@ return done();
         });
     });
 
-    it('can login', login);
+    it('can login', login.bind(null, username, password));
     it('can get avatar', checkAvatar);
     it('displays correct clone url', checkCloneUrl);
     it('can clone the url', cloneRepo);
@@ -387,7 +405,7 @@ return done();
         app = inspect.apps.filter(function (a) { return a.location === LOCATION; })[0];
         expect(app).to.be.an('object');
 
-        login(function (error) {
+        login(email, password, function (error) {
             if (error) return done(error);
 
             // ensure we don't hit NXDOMAIN in the mean time
@@ -398,13 +416,33 @@ return done();
         });
     });
 
+    // No SSO
+    it('install app (no sso)', function () {
+        execSync('cloudron install --new --wait --no-sso --location ' + LOCATION, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
+    });
+
+    it('can get app information', function () {
+        var inspect = JSON.parse(execSync('cloudron inspect'));
+
+        app = inspect.apps.filter(function (a) { return a.location === LOCATION; })[0];
+
+        expect(app).to.be.an('object');
+    });
+
+    it('can admin login (no sso)', adminLogin);
+    it('can logout', logout);
+
+    it('uninstall app (no sso)', function () {
+        execSync('cloudron uninstall --app ' + app.id, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
+    });
+
     // test update
     it('can install app', function () {
         execSync(`cloudron install --new --wait --appstore-id ${app.manifest.id} --location ${LOCATION} -p SSH_PORT=${SSH_PORT}`, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
     });
 
     it('can get app information', getAppInfo);
-    it('can login', login);
+    it('can login', login.bind(null, username, password));
     it('can set avatar', setAvatar);
     it('can get avatar', checkAvatar);
     it('can add public key', addPublicKey);
@@ -416,8 +454,11 @@ return done();
         execSync('cloudron install --wait --app ' + app.id, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
     });
 
-    it('can login', login);
-    it('can send mail', sendMail);
+    xit('can admin login', adminLogin);
+    xit('can send mail', sendMail);
+    xit('can logout', logout);
+
+    it('can login', login.bind(null, username, password));
     it('can get avatar', checkAvatar);
     it('can clone the url', cloneRepo);
     it('file exists in cloned repo', fileExists);