Fixup the tests

test/test.js

@@ -58,26 +58,34 @@ describe('Application life cycle test', function () {
     }
 
     function checkMailPlugin(done) {
-        browser.get('https://' + app.fqdn + '/admin/emailers/local');
-        browser.wait(until.elementLocated(by.id('host')), TEST_TIMEOUT).then(function () {
-            browser.findElement(by.id('host')).getAttribute('value').then(function (val) {
-                if (val !== 'mail') return done(new Error('Incorrect mail server value: ' + val));
-                done();
-            });
+        browser.get('https://' + app.fqdn + '/admin/emailers/local').then(function () {
+            return browser.wait(until.elementLocated(by.id('host')), TEST_TIMEOUT);
+        }).then(function () {
+            return browser.sleep(5000);
+        }).then(function () {
+            return browser.findElement(by.id('host')).getAttribute('value');
+        }).then(function (val) {
+            if (val !== 'mail') return done(new Error('Incorrect mail server value: ' + val));
+            done();
         });
     }
 
     function restartForum(done) {
         browser.get('https://' + app.fqdn + '/admin').then(function () {
+            return browser.sleep(3000);
+        }).then(function () {
             return browser.findElement(by.xpath('//button[text()="Restart"]')).click();
         }).then(function () {
             return browser.sleep(3000);
         }).then(function () {
             return browser.findElement(by.xpath('//button[text()="Confirm"]')).click();
         }).then(function () {
-            return browser.sleep(30000); // wait 30secs for reload
+            console.log('Waiting for forum to restart');
+            return browser.sleep(40000); // wait 30secs for reload
         }).then(function () {
             return browser.get('https://' + app.fqdn + '/admin');
+        }).then(function () {
+            return browser.sleep(3000);
         }).then(function () {
             return browser.findElement(by.xpath('//h1[text()="Dashboard"]'))
         }).then(function () { done(); });
@@ -119,8 +127,12 @@ describe('Application life cycle test', function () {
                 return browser.findElement(by.xpath('//input[@type="file"]')).sendKeys(path.resolve(__dirname, '../logo.png'));
             }).then(function () {
                 browser.sleep(3000);
-            }).then(function () {
+            }).then(function () { // upload it
                 return browser.findElement(by.id('fileUploadSubmitBtn')).click();
+            }).then(function () {
+                browser.sleep(3000);
+            }).then(function () {
+                return browser.findElement(by.xpath('//button[text()="Crop and upload"]')).click();
             }).then(function () {
                 browser.sleep(3000).then(function () { done(); });
             });
@@ -129,9 +141,10 @@ describe('Application life cycle test', function () {
 
     function checkImage(done) {
         browser.get('https://' + app.fqdn + '/user/admin');
-        browser.wait(until.elementLocated(by.xpath('//img[@src="/uploads/profile/1-profileimg.png"]')), TEST_TIMEOUT);
-        var img = browser.findElement(by.xpath('//img[@src="/uploads/profile/1-profileimg.png"]'));
-        browser.executeScript('return arguments[0].complete && arguments[0].naturalWidth', img).then(function (imageWidth) {
+        browser.wait(until.elementLocated(by.xpath('//img[@src="/assets/uploads/profile/1-profileavatar.png"]')), TEST_TIMEOUT).then(function () {
+            var img = browser.findElement(by.xpath('//img[@src="/assets/uploads/profile/1-profileavatar.png"]'));
+            return browser.executeScript('return arguments[0].complete && arguments[0].naturalWidth', img);
+        }).then(function (imageWidth) {
             done(imageWidth === 128 ? null : new Error('failed to load image'));
         });
     }