add timeouts to all explicit waits

Author: corevo

packages/selenium-side-runner/src/index.js

@@ -29,6 +29,8 @@ import Capabilities from "./capabilities";
 import Config from "./config";
 import metadata from "../package.json";
 
+const DEFAULT_TIMEOUT = 15000;
+
 process.title = metadata.name;
 
 program
@@ -40,6 +42,7 @@ program
   .option("-f, --filter [string]", "Filter test cases by name")
   .option("-w, --max-workers [number]", "Maximum amount of workers that will run your tests, defaults to number of cores")
   .option("--base-url [url]", "Override the base URL that was set in the IDE")
+  .option("--timeout [number | undefined]", `The maximimum amount of time, in milliseconds, to spend attempting to locate an element. (default: ${DEFAULT_TIMEOUT})`)
   .option("--configuration-file [filepath]", "Use specified YAML file for configuration. (default: .side.yml)")
   .option("--debug", "Print debug logs")
   .parse(process.argv);
@@ -70,6 +73,12 @@ try {
 
 configuration.server = program.server ? program.server : configuration.server;
 
+configuration.timeout = program.timeout ? +program.timeout
+  : configuration.timeout ? +configuration.timeout
+  : DEFAULT_TIMEOUT; // eslint-disable-line indent
+
+if (configuration.timeout === "undefined") configuration.timeout = undefined;
+
 if (program.capabilities) {
   try {
     Object.assign(configuration.capabilities, Capabilities.parseString(program.capabilities));

packages/selianize/__tests__/command.spec.js

@@ -10,54 +10,63 @@
       "comment": "",
       "command": "open",
       "target": "/check.html",
+      "targets": [],
       "value": ""
     }, {
       "id": "910b677a-24ba-4c90-879b-799347091085",
       "comment": "",
       "command": "check",
       "target": "id=f",
+      "targets": [],
       "value": ""
     }, {
       "id": "e050fea7-ff7f-4a6d-86db-b65e23c66a1f",
       "comment": "",
       "command": "assertChecked",
       "target": "id=f",
+      "targets": [],
       "value": ""
     }, {
       "id": "af271c97-e857-4d26-93dc-4306f65f326c",
       "comment": "",
       "command": "check",
       "target": "id=f",
+      "targets": [],
       "value": ""
     }, {
       "id": "7d568629-dddc-4e85-8463-175eba18a057",
       "comment": "Ensure no-op on checking already checked element",
       "command": "assertChecked",
       "target": "id=f",
+      "targets": [],
       "value": ""
     }, {
       "id": "ecc4ad19-5532-40fb-b33b-0afb0e8c9fe7",
       "comment": "",
       "command": "uncheck",
       "target": "id=f",
+      "targets": [],
       "value": ""
     }, {
       "id": "449d7cc6-bcfd-43e8-a45d-69578b6a1787",
       "comment": "",
       "command": "assertNotChecked",
       "target": "id=f",
+      "targets": [],
       "value": ""
     }, {
       "id": "0b7aeb69-49ae-4051-8e16-4df9bdb13e91",
       "comment": "",
       "command": "uncheck",
       "target": "id=f",
+      "targets": [],
       "value": ""
     }, {
       "id": "92a69862-748c-4f28-8335-789210000b24",
       "comment": "Ensure no-op on unchecking already unchecked element",
       "command": "assertNotChecked",
       "target": "id=f",
+      "targets": [],
       "value": ""
     }]
   }],
@@ -69,7 +78,7 @@
     "timeout": 300,
     "tests": ["6039c6d8-87e9-4fa1-b785-fdeb385b218d"]
   }],
-  "urls": ["https://en.wikipedia.org"],
+  "urls": ["https://en.wikipedia.org/"],
   "plugins": [],
   "version": "1.0",
   "code": {
@@ -80,7 +89,7 @@
     }],
     "tests": [{
       "name": "check-examples",
-      "code": "tests.check_examples = async function check_examples(driver, vars) {await driver.get(BASE_URL + \"/check.html\");await driver.wait(until.elementLocated(By.id(\"f\")));await driver.findElement(By.id(\"f\")).then(element => { element.isSelected().then(selected => {if(!selected) { element.click();}}); });await driver.wait(until.elementLocated(By.id(\"f\")));await expect(driver.findElement(By.id(\"f\"))).resolves.toBeChecked();await driver.wait(until.elementLocated(By.id(\"f\")));await driver.findElement(By.id(\"f\")).then(element => { element.isSelected().then(selected => {if(!selected) { element.click();}}); });await driver.wait(until.elementLocated(By.id(\"f\")));await expect(driver.findElement(By.id(\"f\"))).resolves.toBeChecked();await driver.wait(until.elementLocated(By.id(\"f\")));await driver.findElement(By.id(\"f\")).then(element => { element.isSelected().then(selected => {if(selected) { element.click();}}); });await driver.wait(until.elementLocated(By.id(\"f\")));await expect(driver.findElement(By.id(\"f\"))).resolves.not.toBeChecked();await driver.wait(until.elementLocated(By.id(\"f\")));await driver.findElement(By.id(\"f\")).then(element => { element.isSelected().then(selected => {if(selected) { element.click();}}); });await driver.wait(until.elementLocated(By.id(\"f\")));await expect(driver.findElement(By.id(\"f\"))).resolves.not.toBeChecked();}"
+      "code": "tests.check_examples = async function check_examples(driver, vars) {await driver.get(BASE_URL + \"/check.html\");await driver.wait(until.elementLocated(By.id(`f`)), configuration.timeout);await driver.findElement(By.id(`f`)).then(element => { element.isSelected().then(selected => {if(!selected) { element.click();}}); });await driver.wait(until.elementLocated(By.id(`f`)), configuration.timeout);await expect(driver.findElement(By.id(`f`))).resolves.toBeChecked();await driver.wait(until.elementLocated(By.id(`f`)), configuration.timeout);await driver.findElement(By.id(`f`)).then(element => { element.isSelected().then(selected => {if(!selected) { element.click();}}); });await driver.wait(until.elementLocated(By.id(`f`)), configuration.timeout);await expect(driver.findElement(By.id(`f`))).resolves.toBeChecked();await driver.wait(until.elementLocated(By.id(`f`)), configuration.timeout);await driver.findElement(By.id(`f`)).then(element => { element.isSelected().then(selected => {if(selected) { element.click();}}); });await driver.wait(until.elementLocated(By.id(`f`)), configuration.timeout);await expect(driver.findElement(By.id(`f`))).resolves.not.toBeChecked();await driver.wait(until.elementLocated(By.id(`f`)), configuration.timeout);await driver.findElement(By.id(`f`)).then(element => { element.isSelected().then(selected => {if(selected) { element.click();}}); });await driver.wait(until.elementLocated(By.id(`f`)), configuration.timeout);await expect(driver.findElement(By.id(`f`))).resolves.not.toBeChecked();}"
     }]
   },
   "dependencies": {}

packages/selianize/src/command.js

@@ -10,24 +10,28 @@
       "comment": "",
       "command": "open",
       "target": "/value.html",
+      "targets": [],
       "value": ""
     }, {
       "id": "e7140d2f-50a6-4a97-9f3e-7303d426b255",
       "comment": "",
       "command": "executeScript",
       "target": "return \"sync\"",
+      "targets": [],
       "value": "sync"
     }, {
       "id": "f1bb7ae5-d546-43d2-a910-489c39afb123",
       "comment": "",
       "command": "type",
       "target": "id=v",
+      "targets": [],
       "value": "${sync}"
     }, {
       "id": "cdbdf862-553c-4366-a183-671a1b95ab94",
       "comment": "",
       "command": "assertValue",
       "target": "id=v",
+      "targets": [],
       "value": "sync"
     }]
   }, {
@@ -38,24 +42,28 @@
       "comment": "",
       "command": "open",
       "target": "/value.html",
+      "targets": [],
       "value": ""
     }, {
       "id": "e804bce2-5c87-47df-9a06-9b69f531418b",
       "comment": "",
       "command": "executeAsyncScript",
       "target": "return new Promise((r) => {setTimeout(() => {r(\"async\")}, 500)})",
+      "targets": [],
       "value": "async"
     }, {
       "id": "2a32d3be-1bc4-4a1c-8141-05ae3caf512e",
       "comment": "",
       "command": "type",
       "target": "id=v",
+      "targets": [],
       "value": "${async}"
     }, {
       "id": "dca922a2-cbf8-43c3-bba5-bf1ad1c94144",
       "comment": "",
       "command": "assertValue",
       "target": "id=v",
+      "targets": [],
       "value": "async"
     }]
   }],
@@ -78,10 +86,10 @@
     }],
     "tests": [{
       "name": "execute script",
-      "code": "tests.execute_script = async function execute_script(driver, vars) {await driver.get(BASE_URL + \"/value.html\");vars[\"sync\"] = await driver.executeScript(`return \"sync\"`);await driver.wait(until.elementLocated(By.id(\"v\")));await driver.findElement(By.id(\"v\")).then(element => {element.clear().then(() => {element.sendKeys(`${vars.sync}`);});});await driver.wait(until.elementLocated(By.id(\"v\")));await expect(driver.findElement(By.id(\"v\"))).resolves.toHaveValue(\"sync\");}"
+      "code": "tests.execute_script = async function execute_script(driver, vars) {await driver.get(BASE_URL + \"/value.html\");vars[\"sync\"] = await driver.executeScript(`return \"sync\"`);await driver.wait(until.elementLocated(By.id(`v`)), configuration.timeout);await driver.findElement(By.id(`v`)).then(element => {element.clear().then(() => {element.sendKeys(`${vars.sync}`);});});await driver.wait(until.elementLocated(By.id(`v`)), configuration.timeout);await expect(driver.findElement(By.id(`v`))).resolves.toHaveValue(`sync`);}"
     }, {
       "name": "execute async script",
-      "code": "tests.execute_async_script = async function execute_async_script(driver, vars) {await driver.get(BASE_URL + \"/value.html\");vars[\"async\"] = await driver.executeAsyncScript(`var callback = arguments[arguments.length - 1];return new Promise((r) => {setTimeout(() => {r(\"async\")}, 500)}).then(callback).catch(callback);`);await driver.wait(until.elementLocated(By.id(\"v\")));await driver.findElement(By.id(\"v\")).then(element => {element.clear().then(() => {element.sendKeys(`${vars.async}`);});});await driver.wait(until.elementLocated(By.id(\"v\")));await expect(driver.findElement(By.id(\"v\"))).resolves.toHaveValue(\"async\");}"
+      "code": "tests.execute_async_script = async function execute_async_script(driver, vars) {await driver.get(BASE_URL + \"/value.html\");vars[\"async\"] = await driver.executeAsyncScript(`var callback = arguments[arguments.length - 1];return new Promise((r) => {setTimeout(() => {r(\"async\")}, 500)}).then(callback).catch(callback);`);await driver.wait(until.elementLocated(By.id(`v`)), configuration.timeout);await driver.findElement(By.id(`v`)).then(element => {element.clear().then(() => {element.sendKeys(`${vars.async}`);});});await driver.wait(until.elementLocated(By.id(`v`)), configuration.timeout);await expect(driver.findElement(By.id(`v`))).resolves.toHaveValue(`async`);}"
     }]
   },
   "dependencies": {}