@bucky24/jsbehave 0.12.5 → 0.12.7

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@bucky24/jsbehave",
-    "version": "0.12.5",
+    "version": "0.12.7",
     "description": "A module that allows BDD testing for browser based testing in Selenium.",
     "main": "src/index.js",
     "scripts": {

package/src/index.js

@@ -41,15 +41,26 @@ const variables = {
     "screenshotDirectory": ".",
 };
 
-const allTests = {};
-const allActions = {};
-const beforeAll = [];
-const beforeEach = [];
-const afterAll = [];
-const afterEach = [];
+let allTests = {};
+let allActions = {};
+let beforeAll = [];
+let beforeEach = [];
+let afterAll = [];
+let afterEach = [];
 let customSelectors = {};
 let customOperations = {};
 
+function reset() {
+    allTests = {};
+    allActions = {};
+    beforeAll = [];
+    beforeEach = [];
+    afterAll = [];
+    afterEach = [];
+    customSelectors = {};
+    customOperations = {};
+}
+
 function getVariable(name) {
     if (name === 'clipboard') {
         return clipboardy.readSync();
@@ -401,6 +412,7 @@ async function compareContent([ selector, text ]) {
 
 function doSetVariable([ key, input ]) {
     const finalInput = getText(input);
+    console.log(`Setting variable ${key} to ${finalInput}`);
     setVariable(key, finalInput);
 }
 
@@ -432,7 +444,12 @@ async function clickElementWithOffset([ selector, x, y ]) {
 
 async function takeScreenshot(test) {
     const activeBrowser = getVariable("jsbehave.active_driver");
-    const image = await driver().takeScreenshot();
+    const activeDriver = await driver();
+    if (!activeDriver) {
+        // don't throw, we get here when an error happens so we're already handling a problem
+        console.error(`Unable to take screenshot - driver does not exist`);
+    }
+    const image = activeDriver.takeScreenshot();
     const useTest = test.replace(/ /g, "_");
     let configPath = getVariable("screenshotDirectory");
     const fileName = `test_${useTest}_failure_${activeBrowser}.png`;
@@ -516,7 +533,8 @@ const operations = {
 };
 
 async function handleLines(lines) {
-    for (let line of lines) {
+    for (let i=0;i<lines.length;i++) {
+        const line = lines[i];
         if (line === "") {
             continue;
         }
@@ -554,7 +572,7 @@ async function handleLines(lines) {
                     const test = variables["jsbehave.activeBlock"];
                     if (test) {
                         console.log(`Test ${test} - FAILURE`);
-                        console.log(`Failure when running line "${line}" for "${operation}"`);
+                        console.log(`Failed on line ${i+1}: "${line}" for "${operation}"`);
                         console.log(error);
                         const screenshotOnFailure = getVariable("screenshotOnFailure") === 'true';
                         if (screenshotOnFailure) {
@@ -582,6 +600,9 @@ async function handleLines(lines) {
         const contents = fs.readFileSync(fileName, "utf-8");
         const lines = contents.split(EOL);
 
+        // reset the test framework
+        reset();
+
         console.log(`Processing ${fileName}`);
 
         // first pass, consolidate all the code into test blocks