Merge pull request #5 from TestArmada/mocha

add support for mocha
TestArmada · Apr 25, 2017 · f5cdd58 · f5cdd58
2 parents ae0367f + a671059
commit f5cdd58
Show file tree

Hide file tree

Showing 8 changed files with 178 additions and 141 deletions.
diff --git a/README.md b/README.md
@@ -23,7 +23,7 @@ Please follow the steps
  ]
  ```
 
- 3. `./node_modules/.bin/magellan ----help` to see if you can see the following content printed out
+ 3. `./node_modules/.bin/magellan --help` to see if you can see the following content printed out
  ```
   Executor-specific (testarmada-magellan-local-executor)
    --local_browser=browsername          Run tests in chrome, firefox, etc (default: phantomjs).

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "testarmada-magellan-local-executor",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "test executor for magellan test to run in local selenium env",
   "main": "index.js",
   "scripts": {
@@ -34,6 +34,7 @@
     "babel-preset-es2015": "^6.18.0",
     "cli-color": "^1.1.0",
     "lodash": "^4.17.4",
+    "testarmada-logger": "^1.1.1",
     "yargs": "^6.6.0"
   },
   "devDependencies": {

diff --git a/src/help.js b/src/help.js
@@ -1,4 +1,10 @@
 export default {
+  "local_mocha": {
+    "visible": true,
+    "type": "boolean",
+    "description": "Run test via magellan-mocha-plugin "
+    + "(exclusive with list_browser and list_browsers)"
+  },
   "local_browser": {
     "visible": true,
     "type": "string",

diff --git a/src/logger.js b/src/logger.js
diff --git a/src/profile.js b/src/profile.js
@@ -1,7 +1,8 @@
 import path from "path";
 import _ from "lodash";
 import { argv } from "yargs";
-import logger from "./logger";
+import logger from "testarmada-logger";
+logger.prefix = "Local Executor";
 
 export default {
   getNightwatchConfig: (profile) => {
@@ -19,93 +20,113 @@ export default {
     if (argvMock) {
       runArgv = argvMock;
     }
+    if (runArgv.local_mocha
+      || opts.settings.testFramework.name
+      && opts.settings.testFramework.name === "testarmada-magellan-mocha-plugin") {
+      // do nothing for mocha
+      return new Promise((resolve) => resolve([{ executor: "local", id: "mocha" }]));
+    } else {
+      const configPath = opts.settings.testFramework.settings.nightwatchConfigFilePath;
+
+      /*eslint-disable global-require*/
+      const nightwatchConfig = require(path.resolve(configPath));
+      const browsers = nightwatchConfig.test_settings;
+
+      return new Promise((resolve) => {
+        if (runArgv.local_browser) {
+          const localBrowser = runArgv.local_browser;
+          if (browsers[localBrowser]) {
+            const b = browsers[localBrowser];
 
-    const configPath = opts.settings.testFramework.settings.nightwatchConfigFilePath;
-
-    /*eslint-disable global-require*/
-    const nightwatchConfig = require(path.resolve(configPath));
-    const browsers = nightwatchConfig.test_settings;
-
-    return new Promise((resolve) => {
-      if (runArgv.local_browser) {
-        const localBrowser = runArgv.local_browser;
-        if (browsers[localBrowser]) {
-          const b = browsers[localBrowser];
-
-          b.executor = "local";
-          b.nightwatchEnv = localBrowser;
-          b.id = localBrowser;
+            b.executor = "local";
+            b.nightwatchEnv = localBrowser;
+            b.id = localBrowser;
 
-          logger.debug(`detected profile: ${ JSON.stringify(b)}`);
+            logger.debug(`detected profile: ${JSON.stringify(b)}`);
 
-          resolve([b]);
-        }
-      } else if (runArgv.local_browsers) {
-        const tempBrowsers = runArgv.local_browsers.split(",");
-        const returnBrowsers = [];
+            resolve([b]);
+          }
+        } else if (runArgv.local_browsers) {
+          const tempBrowsers = runArgv.local_browsers.split(",");
+          const returnBrowsers = [];
 
-        _.forEach(tempBrowsers, (browser) => {
-          if (browsers[browser]) {
-            const b = browsers[browser];
+          _.forEach(tempBrowsers, (browser) => {
+            if (browsers[browser]) {
+              const b = browsers[browser];
 
-            b.executor = "local";
-            b.nightwatchEnv = browser;
-            b.id = browser;
+              b.executor = "local";
+              b.nightwatchEnv = browser;
+              b.id = browser;
 
-            returnBrowsers.push(b);
-          }
-        });
+              returnBrowsers.push(b);
+            }
+          });
 
-        logger.debug(`detected profiles: ${ JSON.stringify(returnBrowsers)}`);
+          logger.debug(`detected profiles: ${JSON.stringify(returnBrowsers)}`);
 
-        resolve(returnBrowsers);
-      } else {
-        resolve();
-      }
-    });
+          resolve(returnBrowsers);
+        } else {
+          resolve();
+        }
+      });
+    }
   },
 
   /*eslint-disable global-require*/
   getCapabilities: (profile, opts) => {
-    const configPath = opts.settings.testFramework.settings.nightwatchConfigFilePath;
-    const nightwatchConfig = require(path.resolve(configPath));
-    const browsers = nightwatchConfig.test_settings;
-
-    return new Promise((resolve, reject) => {
-      if (browsers[profile]) {
-        const b = browsers[profile];
-
-        b.executor = "local";
-        b.nightwatchEnv = profile;
-        b.id = profile;
-
-        resolve(b);
-      } else {
-        reject(`profile: ${ profile } isn't found`);
-      }
-    });
+    if (argv.local_mocha
+      || opts.settings.testFramework.name
+      && opts.settings.testFramework.name === "testarmada-magellan-mocha-plugin") {
+      // do nothing for mocha
+      return new Promise((resolve) => resolve({ executor: "local", id: "mocha" }));
+    } else {
+      const configPath = opts.settings.testFramework.settings.nightwatchConfigFilePath;
+      const nightwatchConfig = require(path.resolve(configPath));
+      const browsers = nightwatchConfig.test_settings;
+
+      return new Promise((resolve, reject) => {
+        if (browsers[profile]) {
+          const b = browsers[profile];
+
+          b.executor = "local";
+          b.nightwatchEnv = profile;
+          b.id = profile;
+
+          resolve(b);
+        } else {
+          reject(`profile: ${profile} isn't found`);
+        }
+      });
+    }
   },
 
   /*eslint-disable global-require*/
   listBrowsers: (opts, callback) => {
-    const configPath = opts.settings.testFramework.settings.nightwatchConfigFilePath;
-    const nightwatchConfig = require(path.resolve(configPath));
-    const browsers = nightwatchConfig.test_settings;
-
-    const OMIT_BROWSERS = ["default", "sauce"];
-    const listedBrowsers = [];
-
-
-    _.forEach(browsers, (capabilities, browser) => {
-      if (OMIT_BROWSERS.indexOf(browser) < 0) {
-        logger.debug(`  browser:    ${ browser}`);
-        logger.debug(`  capabilities: ${ JSON.stringify(capabilities)}`);
-        listedBrowsers.push(browser);
-      }
-    });
+    if (argv.local_mocha
+      || opts.settings.testFramework.name
+      && opts.settings.testFramework.name === "testarmada-magellan-mocha-plugin") {
+      // do nothing for mocha
+      return callback();
+    } else {
+      const configPath = opts.settings.testFramework.settings.nightwatchConfigFilePath;
+      const nightwatchConfig = require(path.resolve(configPath));
+      const browsers = nightwatchConfig.test_settings;
+
+      const OMIT_BROWSERS = ["default", "sauce"];
+      const listedBrowsers = [];
+
+
+      _.forEach(browsers, (capabilities, browser) => {
+        if (OMIT_BROWSERS.indexOf(browser) < 0) {
+          logger.debug(`  browser:    ${browser}`);
+          logger.debug(`  capabilities: ${JSON.stringify(capabilities)}`);
+          listedBrowsers.push(browser);
+        }
+      });
 
-    logger.log(`Available browsers from file ${ configPath }: ${ listedBrowsers.join(",")}`);
+      logger.log(`Available browsers from file ${configPath}: ${listedBrowsers.join(",")}`);
 
-    callback();
+      return callback();
+    }
   }
 };
diff --git a/test/src/configuration.test.js b/test/src/configuration.test.js
@@ -3,16 +3,6 @@ import chai from "chai";
 import chaiAsPromise from "chai-as-promised";
 import _ from "lodash";
 
-import logger from "../../lib/logger";
-
-// eat console logs
-// logger.output = {
-//   log() { },
-//   error() { },
-//   debug() { },
-//   warn() { }
-// };
-
 chai.use(chaiAsPromise);
 
 const expect = chai.expect;

diff --git a/test/src/executor.test.js b/test/src/executor.test.js
@@ -3,16 +3,6 @@ import chai from "chai";
 import chaiAsPromise from "chai-as-promised";
 import _ from "lodash";
 
-import logger from "../../lib/logger";
-
-// eat console logs
-// logger.output = {
-//   log() { },
-//   error() { },
-//   debug() { },
-//   warn() { }
-// };
-
 chai.use(chaiAsPromise);
 
 const expect = chai.expect;
@@ -63,4 +53,7 @@ describe("Executor", () => {
     expect(r).to.equal(1);
   });
 
+  it("summerizeTest", (done) => {
+    executor.summerizeTest(null, null, () => done());
+  });
 });