@bucky24/jsbehave 0.12.1 → 0.12.3

package/README.md

@@ -53,7 +53,7 @@ Running `jsbehave` directly will locate all files that end in `.behave` and will
 
 `set active browser to <name>`
 
-`expect element <selector> to have contents <text>`
+`expect element <selector> to have content <text>`
 
 `set variable <variable name> to <text>`
 

package/package.json

@@ -1,14 +1,13 @@
 {
     "name": "@bucky24/jsbehave",
-    "version": "0.12.1",
+    "version": "0.12.3",
     "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",
-        "browserTest": "node src/index.js examples/browser_example",
-        "screenshotTest": "node src/index.js examples/screenshot_example",
-        "actionTest": "node src/index.js examples/action_example",
-        "publish": "npm publish --access=public"
+        "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"
     },
     "repository": {
         "type": "git",
@@ -31,8 +30,7 @@
     },
     "homepage": "https://github.com/Bucky24/jsbehave#readme",
     "dependencies": {
-        "clipboardy": "^2.3.0",
-        "selenium-webdriver": "4.3.1",
-        "uuid": "^8.3.2"
+        "clipboardy": "^5.3.1",
+        "selenium-webdriver": "4.41.0"
     }
 }

package/src/index.js

@@ -4,8 +4,9 @@ const {Builder, By, Key, until} = require('selenium-webdriver');
 const fs = require("fs");
 const { EOL } = require('os');
 const path = require("path");
-const clipboardy = require('clipboardy');
-const { v4: uuidv4 } = require('uuid');
+const { randomUUID } = require('crypto');
+let clipboardy;
+import('clipboardy').then((c) => clipboardy = c);
 
 let fileNames = [];
 if (process.argv.length > 2) {
@@ -143,7 +144,7 @@ function getText(string, allowRegex) {
         regexStr = regexStr.substr(0, regexStr.length-1)
         string = new RegExp(regexStr);
     } else if (string === "uuid") {
-        string = uuidv4();
+        string = randomUUID();
     }
 
     return string;
@@ -378,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;
     }