@bucky24/jsbehave 0.12.2 → 0.12.4

package/README.md

@@ -69,6 +69,8 @@ Running `jsbehave` directly will locate all files that end in `.behave` and will
 
 `switch to window <index>` switches context to the window handle at the index (useful for popups)
 
+`read content from element <selector> into variable <variable name>` Takes the value or inner html from the element and stores it in the given variable
+
 ## Tests
 
 The operations `[test <name>]` and `[endtest]` indicate a test block.

package/package.json

@@ -1,14 +1,13 @@
 {
     "name": "@bucky24/jsbehave",
-    "version": "0.12.2",
+    "version": "0.12.4",
     "description": "A module that allows BDD testing for browser based testing in Selenium.",
     "main": "src/index.js",
     "scripts": {
         "test": "node src/index.js examples/basic_example.behave",
         "browserTest": "node src/index.js examples/browser_example.behave",
         "screenshotTest": "node src/index.js examples/screenshot_example.behave",
-        "actionTest": "node src/index.js examples/action_example.behave",
-        "publish": "npm publish --access=public"
+        "actionTest": "node src/index.js examples/action_example.behave"
     },
     "repository": {
         "type": "git",

package/src/index.js

@@ -379,13 +379,19 @@ function closeBrowserWithName([ name ]) {
 async function compareContent([ selector, text ]) {
     const sel = getSelector(selector);
     const elem = await driver().findElement(sel);
-    text = getText(text);
+    text = getText(text, true);
     const html = await elem.getAttribute('innerHTML');
+    if (text instanceof RegExp && text.test(html)) {
+        return;
+    }
     if (html === text) {
         return;
     }
 
     const value = await elem.getAttribute('value');
+    if (text instanceof RegExp && text.test(value)) {
+        return;
+    }
     if (value === text) {
         return;
     }
@@ -452,6 +458,20 @@ async function windowSwitch(index) {
     await driver().switchTo().window(handles[index]);
 }
 
+async function readContentToVariable([selector, varName]) {
+    const sel = getSelector(selector);
+
+    const elem = await driver().findElement(sel);
+    const value = await elem.getAttribute('value');
+    if (value) {
+        setVariable(varName, value);
+        return;
+    }
+    const html = await elem.getAttribute('innerHTML');
+    
+    setVariable(varName, html);
+}
+
 const startTestRegex = "\\[test (.+)\\]";
 const startActionRegex = "\\[action (.+)\\]";
 
@@ -492,6 +512,7 @@ const operations = {
     [startActionRegex]: startBlock,
     "\\[endaction\\]": endBlock,
     "switch to window (.+)": windowSwitch,
+    "read content from element (.+) into variable (.+)": readContentToVariable,
 };
 
 async function handleLines(lines) {