@bucky24/jsbehave 0.10.1 → 0.11.0

package/README.md

@@ -65,6 +65,8 @@ In order to use this, you must have the webdriver for your chosen browser access
 
 `run action <action name>` runs the given action
 
+`switch to window <index>` switches context to the window handle at the index (useful for popups)
+
 ## Tests
 
 The operations `[test <name>]` and `[endtest]` indicate a test block.
@@ -73,13 +75,22 @@ The operations `[test <name>]` and `[endtest]` indicate a test block.
 
 Text that is wrapped in double quotes is treated as text
 
-Text that is "return" (without quotes) sends the enter key to the element
-
 Text that starts with a $ will load a variable of the same name
 
 Text that starts with a `/` may be considered a regex by some commands
 
-Text that is "uuid" (without quotes) generates a new uuid-v4
+Special text elements:
+
+These should be entered without quotes or any other text.
+
+| Name | Description |
+| ---- | ----------- |
+| uuid | Generates a new uuid-v4 |
+| return | Sends enter key |
+| up | Sends up key |
+| down | Sends down key |
+| left | Sends left key |
+| right | Sends right key |
 
 ## Variables
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@bucky24/jsbehave",
-    "version": "0.10.1",
+    "version": "0.11.0",
     "description": "A module that allows BDD testing for browser based testing in Selenium.",
     "main": "src/index.js",
     "scripts": {
@@ -32,7 +32,7 @@
     "homepage": "https://github.com/Bucky24/jsbehave#readme",
     "dependencies": {
         "clipboardy": "^2.3.0",
-        "selenium-webdriver": "^4.0.0-alpha.7",
+        "selenium-webdriver": "4.3.1",
         "uuid": "^8.3.2"
     }
 }

package/src/index.js

@@ -110,6 +110,10 @@ function goToPage([ url ]) {
 
 const keyLookup = {
     "return": Key.RETURN,
+    "down": Key.DOWN,
+    "up": Key.UP,
+    "left": Key.LEFT,
+    "right": Key.RIGHT,
 };
 
 function getText(string, allowRegex) {
@@ -132,9 +136,9 @@ function getText(string, allowRegex) {
     return string;
 }
 
-function typeKeys([ string, selector ]) {
+async function typeKeys([ string, selector ]) {
     const sel = getSelector(selector);
-    const element = driver().findElement(sel);
+    const element = await driver().findElement(sel);
 
     string = getText(string);
     return element.sendKeys(string);
@@ -261,8 +265,10 @@ async function runAction(name, showTitle=false) {
     if (showTitle) {
         console.log("Running action '" + name + "'");
     }
+    const oldBlock = getVariable("jsbehave.activeBlock");
     const content = allActions[name];
     await handleLines(content);
+    variables["jsbehave.activeBlock"] = oldBlock;
 }
 
 async function runTestIfNotRun([ testName ]) {
@@ -278,7 +284,9 @@ async function runTestIfNotRun([ testName ]) {
 
 
 async function doRunTest([ testName ]) {
-    return runTest(testName, true);
+    const oldTest = getVariable("jsbehave.activeBlock");
+    await runTest(testName, true);
+    variables["jsbehave.activeBlock"] = oldTest;
 }
 
 async function doRunAction([ actionName ]) {
@@ -420,6 +428,16 @@ async function takeScreenshot(test) {
     return fullPath;
 }
 
+async function windowSwitch(index) {
+    index = parseInt(index, 10);
+    const handles = await driver().getAllWindowHandles();
+    if (handles.length < index) {
+        throw new Error(`Tried to switch to window ${index} but only have ${handles.length} windows`);
+    }
+    console.log('Switching window to window ' + index + ": " + handles[index]);
+    await driver().switchTo().window(handles[index]);
+}
+
 const startTestRegex = "\\[test (.+)\\]";
 const startActionRegex = "\\[action (.+)\\]";
 
@@ -459,6 +477,7 @@ const operations = {
     "run action (.+)": doRunAction,
     [startActionRegex]: startBlock,
     "\\[endaction\\]": endBlock,
+    "switch to window (.+)": windowSwitch,
 };
 
 async function handleLines(lines) {