Merge pull request #49 from codeforequity-at/fix_binary

Fix binary

bin/testmybot.js

@@ -69,10 +69,10 @@ function handleOptions (argv) {
     debug.enable('testmybot*,botium*')
   }
   if (argv.convos) {
-    require('../src/convo').setConvoDir(argv.convos)
+    require('../src/globals').get().convodir = argv.convos
   }
   if (argv.config) {
-    require('../src/readconfig').setConfigFile(argv.config)
+    require('../src/globals').get().configfile = argv.config
   }
 }
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "testmybot",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "engines": {
     "node": ">=6.0"
   },
@@ -32,7 +32,7 @@
   "dependencies": {
     "async": "^2.1.5",
     "body-parser": "^1.18.2",
-    "botium-core": "1.1.7",
+    "botium-core": "1.1.9",
     "chai": "^4.1.2",
     "chalk": "^2.3.0",
     "clear": "0.0.1",

samples/xlsx/jasmine.js

@@ -0,0 +1,3 @@
+const bot = require('testmybot');
+
+bot.helper.jasmine().generateJUnit();

samples/xlsx/testmybot.json

@@ -12,8 +12,7 @@
       "SIMPLEREST_METHOD": "GET",
       "SIMPLEREST_HEADERS_TEMPLATE": "{ \"apiToken\": \"testapitoken\" }",
       "SIMPLEREST_CONTEXT_JSONPATH": "$",
-      "SIMPLEREST_RESPONSE_JSONPATH": "$.text.*",
-	  "SIMPLEREST_STRIP_HTML": true
+      "SIMPLEREST_RESPONSE_JSONPATH": "$.text.*"
     }
   }
 }

src/convo.js

@@ -4,12 +4,17 @@ const path = require('path')
 const mkdirp = require('mkdirp')
 const debug = require('debug')('testmybot-convo')
 
+const globals = require('./globals')
+
 const allowedSuffices = ['.convo.txt', '.xlsx']
 
 module.exports = class ConvoReader {
-  constructor (compiler, convodir = './spec/convo/') {
+  constructor (compiler, convodir) {
     this.compiler = compiler
     this.convodir = convodir
+    if (!this.convodir) {
+      this.convodir = globals.get().convodir
+    }
   }
 
   readConvos () {

src/globals.js

@@ -0,0 +1,12 @@
+const settings = {
+  convodir: './spec/convo/',
+  configfile: 'testmybot.json'
+}
+
+function get () {
+  return settings
+}
+
+module.exports = {
+  get
+}

src/readconfig.js

@@ -4,11 +4,13 @@ const fs = require('fs')
 const _ = require('lodash')
 const debug = require('debug')('testmybot-readconfig')
 
-let configfile = 'testmybot.json'
+const globals = require('./globals')
 
 module.exports = (configToSet) => {
   const resolvedConfig = {}
 
+  let configfile = globals.get().configfile
+
   try {
     const contents = fs.readFileSync(path.resolve(__dirname, '../testmybot.default.json'))
     const configJson = JSON.parse(contents)

src/testmybot.js

@@ -81,7 +81,6 @@ module.exports = class TestMyBot {
           })
           .catch((err) => {
             debug(convo.header.name + ' failed: ' + util.inspect(err))
-            failCb(err)
             testcaseDone(err)
           })
       })