@bucky24/jsbehave 0.12.3 → 0.12.5

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,6 +1,6 @@
 {
     "name": "@bucky24/jsbehave",
-    "version": "0.12.3",
+    "version": "0.12.5",
     "description": "A module that allows BDD testing for browser based testing in Selenium.",
     "main": "src/index.js",
     "scripts": {

package/src/index.js

@@ -210,12 +210,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 +384,7 @@ async function compareContent([ selector, text ]) {
     if (text instanceof RegExp && text.test(html)) {
         return;
     }
-    if (html === text) {
+    if (html.includes(text)) {
         return;
     }
 
@@ -392,7 +392,7 @@ async function compareContent([ selector, text ]) {
     if (text instanceof RegExp && text.test(value)) {
         return;
     }
-    if (value === text) {
+    if (value.includes(text)) {
         return;
     }
 
@@ -458,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 (.+)\\]";
 
@@ -498,6 +512,7 @@ const operations = {
     [startActionRegex]: startBlock,
     "\\[endaction\\]": endBlock,
     "switch to window (.+)": windowSwitch,
+    "read content from element (.+) into variable (.+)": readContentToVariable,
 };
 
 async function handleLines(lines) {