RUN-633: init check-in

Author: Wenjun Che

test/WD/Mocha/hello-openfin.js

@@ -16,26 +16,17 @@ var wd = require('wd');
 // enables chai assertion chaining
 chaiAsPromised.transferPromiseness = wd.transferPromiseness;
 
-var config = require("../../tests_config");
+var config = require("../../config");
 
 
-describe('Hello OpenFin App testing', function() {
-    var client, notificationButton, cpuInfoButton, cpuInfoExitButton;
+describe('Hello OpenFin App testing with WD', function() {
+    var client;
 
     this.timeout(config.testTimeout);
 
     before(function() {
-        client = wd.promiseChainRemote(url.parse("http://10.211.55.4:9515"));
-
-        //        client = wd.remote(url.parse(config.driverServerUrl));
-        return client.init({
-            browserName: 'chrome',
-            'chromeOptions': {
-                      args: [],
-                      extensions: [],
-                        debuggerAddress: 'localhost:9090'
-                    }
-        });
+        client = wd.promiseChainRemote(url.parse(config.remoteDriverUrl));
+        return client.init(config.desiredCapabilities);
     });
 
     after(function(done) {

test/WebDriverIO/Mocha/hello-openfin.js

@@ -12,29 +12,23 @@
 var should = require('chai').should(),
     webdriver = require('webdriverio'),
     assert = require("assert"),
-    config = require("../../tests_config");
+    config = require("../../config");
 
 
-describe('Hello OpenFin App testing', function() {
+describe('Hello OpenFin App testing with webdriver.io', function() {
     var client, notificationButton, cpuInfoButton, cpuInfoExitButton;
 
     this.timeout(config.testTimeout);
 
     before(function() {
         var driverOptions = {
-            desiredCapabilities: {
-                browserName: 'chrome',
-                'chromeOptions': {
-                          args: [],
-                          extensions: [],
-                            debuggerAddress: 'localhost:9090'
-                        }
-            },
-            host: '10.211.55.4',
-            port: 9515,
+            desiredCapabilities: config.desiredCapabilities,
+            host: config.remoteDriverHost,
+            port: config.remoteDriverPort,
             logLevel: 'debug'
         };
         client = webdriver.remote(driverOptions).init();
+        client.requestHandler.startPath = "";  // webdriverio defaults it to '/wd/hub';
     });
 
     after(function(done) {

test/WebDriverJs/Mocha/hello-openfin.js

@@ -8,23 +8,18 @@ var expect = require('chai').expect,
     until = require('selenium-webdriver').until,
     webdriver = require('selenium-webdriver'),
     chrome = require('selenium-webdriver/chrome'),
-    config = require("../../tests_config");
+    config = require("../../config");
 
 
-describe('Hello OpenFin App testing', function() {
+describe('Hello OpenFin App testing with selenium-webdriver', function() {
     var client, notificationButton, cpuInfoButton, cpuInfoExitButton;
 
     this.timeout(config.testTimeout);
 
     before(function() {
         var capabilities = webdriver.Capabilities.chrome();
-
-        capabilities.set('chromeOptions', {
-          args: [],
-          extensions: [],
-            debuggerAddress: 'localhost:9090'
-        });
-        client = new webdriver.Builder().usingServer("http://10.211.55.4:9515").withCapabilities(capabilities).build();
+        capabilities.set('chromeOptions', config.desiredCapabilities.chromeOptions);
+        client = new webdriver.Builder().usingServer(config.remoteDriverUrl).withCapabilities(capabilities).build();
     });
 
     after(function(done) {

test/config.js

@@ -4,20 +4,23 @@
 
 "use strict";
 
-module.exports = {
-    driverOptions: {   // used by webdriver.io
+module.exports = (function() {
+    var config = {
         desiredCapabilities: {
-            browserName: 'chrome'
+            browserName: 'chrome',
+            chromeOptions: {
+                args: [],
+                extensions: [],
+                debuggerAddress: 'localhost:9090'
+            }
         },
-        host: 'localhost',
-        port: 8818,
-        logLevel: 'info'
-    },
-    driverServerUrl: "http://localhost:8818/wd/hub",   // used by selenium-webdriver
-    username: "[email protected]",
-    password: "wenjun123",
-    messageToJid: "[email protected]",
-    chatAppUrl: 'http://chat.openf.in/newopenchat/index.html?adapter=http:%2F%2Fchat.openf.in%2Fnewstrophe%2Findex.html',
-    testTimeout: 10000
+        remoteDriverHost: "10.211.55.4",
+        remoteDriverPort: 9515,
+        testTimeout: 10000
+    };
+
+    config.remoteDriverUrl = "http://" + config.remoteDriverHost + ":" + config.remoteDriverPort;
+    return config;
+
+})();
 
-};