@bucky24/jsbehave 0.12.4 → 0.12.6

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@bucky24/jsbehave",
-    "version": "0.12.4",
+    "version": "0.12.6",
     "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();
@@ -210,12 +221,12 @@ async function waitForText([ selector, text ]) {
     const sel = getSelector(selector);
     const elem = await driver().findElement(sel);
     text = getText(text);
-    if (elem.text === text) {
+    if (elem.text.includes(text)) {
         return;
     }
 
     const value = await elem.getAttribute("value")
-    if (value === text) {
+    if (value.includes(text)) {
         return;
     }
 
@@ -384,7 +395,7 @@ async function compareContent([ selector, text ]) {
     if (text instanceof RegExp && text.test(html)) {
         return;
     }
-    if (html === text) {
+    if (html.includes(text)) {
         return;
     }
 
@@ -392,7 +403,7 @@ async function compareContent([ selector, text ]) {
     if (text instanceof RegExp && text.test(value)) {
         return;
     }
-    if (value === text) {
+    if (value.includes(text)) {
         return;
     }
 
@@ -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);
 }
 
@@ -582,6 +594,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