RUN-1044: updates for Runtime V44

Author: wenjunche

hello-openfin-installer.exe

@@ -52,7 +52,11 @@ describe('Hello OpenFin App testing with WD', function() {
             should.not.exist(err);
             client.title(function (err, result) {
                 should.not.exist(err);
-                callback(result);
+                if (err) {
+                    callback(undefined);                    
+                } else {
+                    callback(result);                    
+                }
             });
         });
     }
@@ -118,13 +122,17 @@ describe('Hello OpenFin App testing with WD', function() {
             should.not.exist(err);
             should.exist(version);
             version.should.equal(config.expectedRuntimeVersion);
-            done();
+            // without the sleep here, sometimes the next step does not go through for some reason
+            client.sleep(1000, function(err) {
+                done();
+            });
         });
     });
 
-    it("Click notification button", function() {
+    it("Click notification button", function(done) {
         should.exist(client);
         client.elementByCss("#desktop-notification").click();
+        done();
     });
 
     it("Click CPU Info button", function(done) {

test/WD/Mocha/hello-openfin.js

@@ -51,10 +51,12 @@ describe('Hello OpenFin App testing with webdriver.io', function() {
      */
     function switchWindow(windowHandle, callback) {
         client.switchTab(windowHandle, function(err) {
-            should.not.exist(err);
             client.title(function (err, result) {
-                should.not.exist(err);
-                callback(result.value);
+                if (err) {
+                    callback(undefined);
+                } else {
+                    callback(result.value);
+                }
             });
         });
     }
@@ -121,7 +123,10 @@ describe('Hello OpenFin App testing with webdriver.io', function() {
             should.not.exist(err);
             should.exist(result.value);
             result.value.should.equal(config.expectedRuntimeVersion);
-            done();
+            // without the sleep here, sometimes the next step does not go through for some reason
+            client.pause(1000, function() {
+                done();
+            });
         });
     });
 

test/WebDriverIO/Mocha/hello-openfin.js

@@ -46,7 +46,10 @@ describe('Hello OpenFin App testing with selenium-webdriver', function () {
             client.getTitle().then(function (title) {
                 callback(title);
             });
-        });
+        }).then(null, function(e) {
+                        // some windows get opened and closed during startup, so not really an error
+                        callback("no such window");
+                    });
     }
 
     /**
@@ -109,7 +112,10 @@ describe('Hello OpenFin App testing with selenium-webdriver', function () {
         executeAsyncJavascript("var callback = arguments[arguments.length - 1];" +
             "fin.desktop.System.getVersion(function(v) { callback(v); } );").then(function(v) {
             expect(v).to.equal(config.expectedRuntimeVersion);
-                done();
+                // without the sleep here, sometimes the next step does not go through for some reason
+                client.sleep(1000).then(function () {
+                    done();
+                });
             });
     });
 
@@ -126,7 +132,10 @@ describe('Hello OpenFin App testing with selenium-webdriver', function () {
         expect(client).to.exist;
         expect(notificationButton).to.exist;
         notificationButton.click().then(function () {
-            done();
+            // give time for notification to show up
+            client.sleep(2000).then(function () {
+                done();
+            });
         });
     });
 
@@ -143,7 +152,8 @@ describe('Hello OpenFin App testing with selenium-webdriver', function () {
         expect(client).to.exist;
         expect(cpuInfoButton).to.exist;
         cpuInfoButton.click().then(function () {
-            client.sleep(3000).then(function () {
+            // sleep here so CPU Info window stay shown for us to see
+            client.sleep(2000).then(function () {
                 done();
             });
         });
@@ -167,9 +177,7 @@ describe('Hello OpenFin App testing with selenium-webdriver', function () {
         expect(client).to.exist;
         expect(cpuInfoExitButton).to.exist;
         cpuInfoExitButton.click().then(function() {
-            client.sleep(3000).then(function() {
-                done();
-            });
+            done();
         });
     });
 

test/WebDriverJs/Mocha/hello-openfin.js

@@ -11,14 +11,14 @@ module.exports = (function () {
             chromeOptions: {
                 extensions: [],
                 debuggerAddress: 'localhost:9090',
-                binary: "OpenFinRVM.exe",
+                binary: "hello-openfin-installer.exe",
                 args: ['--config=https://demoappdirectory.openf.in/desktop/config/apps/OpenFin/HelloOpenFin/app.json']
             }
         },
         remoteDriverHost: "localhost",
         remoteDriverPort: 9515,
         testTimeout: 10000,
-        expectedRuntimeVersion: "3.0.1.5"
+        expectedRuntimeVersion: "5.44.7.17"
     };
 
     config.remoteDriverUrl = "http://" + config.remoteDriverHost + ":" + config.remoteDriverPort;

test/config.js

@@ -13,7 +13,7 @@ exports.config = {
 		chromeOptions: {
                 extensions: [],
                 debuggerAddress: 'localhost:9090',
-                binary: "../../OpenFinRVM.exe",
+                binary: "../../hello-openfin-installer.exe",
                 args: ['--config=http://test.openf.in/bus/protractor.json']
 		}
 	}, 

test/protractor/config.js

@@ -92,7 +92,7 @@ describe('OpenFin App testing with protractor', function() {
         expect(driver).toBeDefined();
         executeAsyncJavascript("var callback = arguments[arguments.length - 1];" +
             "fin.desktop.System.getVersion(function(v) { callback(v); } );").then(function(v) {
-            expect(v).toEqual("3.0.1.5");
+            expect(v).toEqual("5.44.7.17");
                 done();
             });
     });