From 5455fd3b7a663f0ea5877b9a241d905e2cee0ca8 Mon Sep 17 00:00:00 2001 From: toddtarsi Date: Sun, 10 Mar 2024 04:05:46 -0500 Subject: [PATCH] v4.0.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Finally getting there. Most parts of the code are stable now. The IDE still needs stabilization so that is just in beta. We will be getting certificates soon Exciting times 🎉 --- packages/browser-info/package.json | 2 +- .../code-export-csharp-commons/package.json | 6 +- .../code-export-csharp-nunit/package.json | 6 +- .../code-export-csharp-xunit/package.json | 8 +- packages/code-export-java-junit/package.json | 6 +- .../code-export-javascript-mocha/package.json | 6 +- .../code-export-python-pytest/package.json | 6 +- packages/code-export-ruby-rspec/package.json | 6 +- packages/get-driver/package.json | 2 +- packages/selenium-ide/package.json | 28 +++--- .../main/session/controllers/Driver/index.ts | 4 +- packages/side-api/package.json | 12 +-- packages/side-code-export/package.json | 6 +- packages/side-commons/package.json | 2 +- packages/side-example-suite/package.json | 8 +- packages/side-model/package.json | 2 +- packages/side-runner/package.json | 6 +- packages/side-runner/src/run.ts | 6 +- packages/side-runtime/package.json | 12 +-- .../__snapshots__/playback.spec.ts.snap | 24 ++--- .../src/playback-tree/command-node.ts | 44 ++++++--- packages/side-runtime/src/webdriver.ts | 4 +- packages/side-testkit/package.json | 2 +- packages/webdriver-testkit/package.json | 6 +- pnpm-lock.yaml | 92 +++++++++---------- 25 files changed, 160 insertions(+), 146 deletions(-) diff --git a/packages/browser-info/package.json b/packages/browser-info/package.json index 6a98a0770..c0a510c54 100644 --- a/packages/browser-info/package.json +++ b/packages/browser-info/package.json @@ -1,6 +1,6 @@ { "name": "@seleniumhq/browser-info", - "version": "4.0.0", + "version": "4.0.1", "private": false, "description": "Get information about installed browsers", "author": "Tomer ", diff --git a/packages/code-export-csharp-commons/package.json b/packages/code-export-csharp-commons/package.json index bce9c64d9..317e6d6d0 100644 --- a/packages/code-export-csharp-commons/package.json +++ b/packages/code-export-csharp-commons/package.json @@ -1,6 +1,6 @@ { "name": "@seleniumhq/code-export-csharp-commons", - "version": "4.0.0-alpha.6", + "version": "4.0.1", "private": false, "description": "Commons for exporting Selenium IDE project contents to C#", "repository": "https://github.com/SeleniumHQ/selenium-ide", @@ -18,9 +18,9 @@ "watch": "tsc --watch" }, "dependencies": { - "side-code-export": "^4.0.0-alpha.17" + "side-code-export": "^4.0.0" }, "devDependencies": { - "@seleniumhq/side-model": "^4.0.0-alpha.5" + "@seleniumhq/side-model": "^4.0.1" } } diff --git a/packages/code-export-csharp-nunit/package.json b/packages/code-export-csharp-nunit/package.json index 1aa22c70f..08c8d09a2 100644 --- a/packages/code-export-csharp-nunit/package.json +++ b/packages/code-export-csharp-nunit/package.json @@ -1,6 +1,6 @@ { "name": "@seleniumhq/code-export-csharp-nunit", - "version": "4.0.0-alpha.6", + "version": "4.0.1", "private": false, "description": "Export Selenium IDE project contents to C# NUnit", "repository": "https://github.com/SeleniumHQ/selenium-ide", @@ -18,8 +18,8 @@ "main": "dist/index.js", "types": "dist/index.d.ts", "dependencies": { - "@seleniumhq/code-export-csharp-commons": "^4.0.0-alpha.5", - "side-code-export": "^4.0.0-alpha.17" + "@seleniumhq/code-export-csharp-commons": "^4.0.1", + "side-code-export": "^4.0.0" }, "gitHead": "f58e327e7616e23a3e926e4b80cf9952164e5744" } diff --git a/packages/code-export-csharp-xunit/package.json b/packages/code-export-csharp-xunit/package.json index 5fd75112d..42942536e 100644 --- a/packages/code-export-csharp-xunit/package.json +++ b/packages/code-export-csharp-xunit/package.json @@ -1,6 +1,6 @@ { "name": "@seleniumhq/code-export-csharp-xunit", - "version": "4.0.0-alpha.6", + "version": "4.0.1", "private": false, "description": "Export Selenium IDE project contents to C# XUnit", "repository": "https://github.com/SeleniumHQ/selenium-ide", @@ -18,11 +18,11 @@ "main": "dist/index.js", "types": "dist/index.d.ts", "dependencies": { - "@seleniumhq/code-export-csharp-commons": "^4.0.0-alpha.5", - "side-code-export": "^4.0.0-alpha.17" + "@seleniumhq/code-export-csharp-commons": "^4.0.1", + "side-code-export": "^4.0.0" }, "devDependencies": { - "@seleniumhq/side-model": "^4.0.0-alpha.5" + "@seleniumhq/side-model": "^4.0.1" }, "gitHead": "f58e327e7616e23a3e926e4b80cf9952164e5744" } diff --git a/packages/code-export-java-junit/package.json b/packages/code-export-java-junit/package.json index 16b04e9d1..12cd7a01b 100644 --- a/packages/code-export-java-junit/package.json +++ b/packages/code-export-java-junit/package.json @@ -1,6 +1,6 @@ { "name": "@seleniumhq/code-export-java-junit", - "version": "4.0.0-alpha.6", + "version": "4.0.1", "private": false, "description": "Export Selenium IDE project contents to Java JUnit", "repository": "https://github.com/SeleniumHQ/selenium-ide", @@ -17,10 +17,10 @@ }, "main": "dist/index.js", "dependencies": { - "side-code-export": "^4.0.0-alpha.17" + "side-code-export": "^4.0.0" }, "devDependencies": { - "@seleniumhq/side-model": "^4.0.0-alpha.5" + "@seleniumhq/side-model": "^4.0.1" }, "gitHead": "f58e327e7616e23a3e926e4b80cf9952164e5744" } diff --git a/packages/code-export-javascript-mocha/package.json b/packages/code-export-javascript-mocha/package.json index b8bc502a9..adf599764 100644 --- a/packages/code-export-javascript-mocha/package.json +++ b/packages/code-export-javascript-mocha/package.json @@ -1,6 +1,6 @@ { "name": "@seleniumhq/code-export-javascript-mocha", - "version": "4.0.0-alpha.8", + "version": "4.0.1", "private": false, "description": "Export Selenium IDE project contents to JavaScript Mocha", "repository": "https://github.com/SeleniumHQ/selenium-ide", @@ -17,10 +17,10 @@ }, "main": "dist/index.js", "dependencies": { - "side-code-export": "^4.0.0-alpha.17" + "side-code-export": "^4.0.0" }, "devDependencies": { - "@seleniumhq/side-model": "^4.0.0-alpha.5" + "@seleniumhq/side-model": "^4.0.1" }, "gitHead": "f58e327e7616e23a3e926e4b80cf9952164e5744" } diff --git a/packages/code-export-python-pytest/package.json b/packages/code-export-python-pytest/package.json index 53767cb8f..4301788d0 100644 --- a/packages/code-export-python-pytest/package.json +++ b/packages/code-export-python-pytest/package.json @@ -1,6 +1,6 @@ { "name": "@seleniumhq/code-export-python-pytest", - "version": "4.0.0-alpha.7", + "version": "4.0.1", "private": false, "description": "Export Selenium IDE project contents to Python pytest", "repository": "https://github.com/SeleniumHQ/selenium-ide", @@ -17,10 +17,10 @@ }, "main": "dist/index.js", "dependencies": { - "side-code-export": "^4.0.0-alpha.17" + "side-code-export": "^4.0.0" }, "devDependencies": { - "@seleniumhq/side-model": "^4.0.0-alpha.5" + "@seleniumhq/side-model": "^4.0.1" }, "gitHead": "f58e327e7616e23a3e926e4b80cf9952164e5744" } diff --git a/packages/code-export-ruby-rspec/package.json b/packages/code-export-ruby-rspec/package.json index 989b6964d..97d3b4a9b 100644 --- a/packages/code-export-ruby-rspec/package.json +++ b/packages/code-export-ruby-rspec/package.json @@ -1,6 +1,6 @@ { "name": "@seleniumhq/code-export-ruby-rspec", - "version": "4.0.0-alpha.6", + "version": "4.0.1", "private": false, "description": "Export Selenium IDE project contents to Ruby RSpec", "repository": "https://github.com/SeleniumHQ/selenium-ide", @@ -17,10 +17,10 @@ }, "main": "dist/index.js", "dependencies": { - "side-code-export": "^4.0.0-alpha.17" + "side-code-export": "^4.0.0" }, "devDependencies": { - "@seleniumhq/side-model": "^4.0.0-alpha.5" + "@seleniumhq/side-model": "^4.0.1" }, "gitHead": "f58e327e7616e23a3e926e4b80cf9952164e5744" } diff --git a/packages/get-driver/package.json b/packages/get-driver/package.json index 0ca1470e2..a9d9766b3 100644 --- a/packages/get-driver/package.json +++ b/packages/get-driver/package.json @@ -1,6 +1,6 @@ { "name": "@seleniumhq/get-driver", - "version": "4.0.0-alpha.3", + "version": "4.0.1", "private": false, "description": "Download browser drivers", "author": "Tomer ", diff --git a/packages/selenium-ide/package.json b/packages/selenium-ide/package.json index 15efcbcc1..e45ff99fe 100644 --- a/packages/selenium-ide/package.json +++ b/packages/selenium-ide/package.json @@ -1,6 +1,6 @@ { "name": "selenium-ide", - "version": "4.0.1-alpha.99", + "version": "4.0.1-beta.1", "private": false, "description": "Selenium IDE electron app", "author": "Todd ", @@ -114,17 +114,17 @@ "@fontsource/roboto": "^5.0.8", "@mui/icons-material": "^5.15.0", "@mui/material": "^5.15.0", - "@seleniumhq/code-export-csharp-nunit": "^4.0.0-alpha.6", - "@seleniumhq/code-export-csharp-xunit": "^4.0.0-alpha.6", - "@seleniumhq/code-export-java-junit": "^4.0.0-alpha.6", - "@seleniumhq/code-export-javascript-mocha": "^4.0.0-alpha.8", - "@seleniumhq/code-export-python-pytest": "^4.0.0-alpha.7", - "@seleniumhq/code-export-ruby-rspec": "^4.0.0-alpha.6", - "@seleniumhq/get-driver": "^4.0.0-alpha.3", - "@seleniumhq/side-api": "^4.0.0-alpha.49", - "@seleniumhq/side-commons": "^4.0.0-alpha.3", - "@seleniumhq/side-model": "^4.0.0-alpha.5", - "@seleniumhq/side-runtime": "^4.0.0-alpha.44", + "@seleniumhq/code-export-csharp-nunit": "^4.0.1", + "@seleniumhq/code-export-csharp-xunit": "^4.0.1", + "@seleniumhq/code-export-java-junit": "^4.0.1", + "@seleniumhq/code-export-javascript-mocha": "^4.0.1", + "@seleniumhq/code-export-python-pytest": "^4.0.1", + "@seleniumhq/code-export-ruby-rspec": "^4.0.1", + "@seleniumhq/get-driver": "^4.0.1", + "@seleniumhq/side-api": "^4.0.1", + "@seleniumhq/side-commons": "^4.0.1", + "@seleniumhq/side-model": "^4.0.1", + "@seleniumhq/side-runtime": "^4.0.1", "dnd-core": "^16.0.1", "electron-chromedriver": "^28.0.0", "electron-log": "^5.1.0", @@ -140,12 +140,12 @@ "react-resizable-panels": "^1.0.8", "scroll-into-view-if-needed": "^3.0.10", "selenium-webdriver": "^4.16.0", - "side-code-export": "^4.0.0-alpha.17", + "side-code-export": "^4.0.0", "v8-compile-cache": "^2.3.0" }, "devDependencies": { "@medv/finder": "^1.1.1", - "@seleniumhq/browser-info": "^4.0.0-alpha.2", + "@seleniumhq/browser-info": "^4.0.1", "@types/copy-webpack-plugin": "8.0.1", "@types/electron-devtools-installer": "^2.2.5", "@types/fs-extra": "^11.0.1", diff --git a/packages/selenium-ide/src/main/session/controllers/Driver/index.ts b/packages/selenium-ide/src/main/session/controllers/Driver/index.ts index 13247b12d..b1ef95b08 100644 --- a/packages/selenium-ide/src/main/session/controllers/Driver/index.ts +++ b/packages/selenium-ide/src/main/session/controllers/Driver/index.ts @@ -257,7 +257,7 @@ export default class DriverController extends BaseController { }) .usingServer(server) .forBrowser(browserName) - console.info('Building driver for ' + browser) + console.debug('Building driver for ' + browser) const driver = await retry( async () => { const result = await driverBuilder.build() @@ -267,7 +267,7 @@ export default class DriverController extends BaseController { 3, 100 ) - console.info('Built driver for ' + browser) + console.debug('Built driver for ' + browser) const useBidi = await this.session.store.get('browserInfo.useBidi') if (useBidi) { createBidiAPIBindings(this.session, driver) diff --git a/packages/side-api/package.json b/packages/side-api/package.json index b4c004d33..0df0eacac 100644 --- a/packages/side-api/package.json +++ b/packages/side-api/package.json @@ -1,6 +1,6 @@ { "name": "@seleniumhq/side-api", - "version": "4.0.0-alpha.49", + "version": "4.0.1", "private": false, "description": "Selenium IDE API command shapes and such", "author": "Todd Tarsi ", @@ -12,7 +12,7 @@ "watch": "tsc --watch" }, "engines": { - "node": "^16.0.0" + "node": ">16" }, "main": "dist/index.js", "types": "dist/index.d.ts", @@ -20,10 +20,10 @@ "dist" ], "dependencies": { - "@seleniumhq/browser-info": "^4.0.0-alpha.2", - "@seleniumhq/get-driver": "^4.0.0-alpha.3", - "@seleniumhq/side-model": "^4.0.0-alpha.5", - "@seleniumhq/side-runtime": "^4.0.0-alpha.43", + "@seleniumhq/browser-info": "^4.0.1", + "@seleniumhq/get-driver": "^4.0.1", + "@seleniumhq/side-model": "^4.0.1", + "@seleniumhq/side-runtime": "^4.0.1", "lodash": "^4.17.21" }, "devDependencies": { diff --git a/packages/side-code-export/package.json b/packages/side-code-export/package.json index 9a0cad178..d83f6d096 100644 --- a/packages/side-code-export/package.json +++ b/packages/side-code-export/package.json @@ -1,6 +1,6 @@ { "name": "side-code-export", - "version": "4.0.0-alpha.17", + "version": "4.0.1", "description": "Utils for code export from Selenium IDE", "repository": "https://github.com/SeleniumHQ/selenium-ide", "keywords": [ @@ -20,8 +20,8 @@ "main": "dist/index.js", "types": "dist/index.d.ts", "dependencies": { - "@seleniumhq/side-model": "^4.0.0-alpha.5", - "@seleniumhq/side-runtime": "^4.0.0-alpha.43", + "@seleniumhq/side-model": "^4.0.1", + "@seleniumhq/side-runtime": "^4.0.1", "commander": "^9.4.0" }, "gitHead": "f58e327e7616e23a3e926e4b80cf9952164e5744" diff --git a/packages/side-commons/package.json b/packages/side-commons/package.json index ef8bcb782..159f39e11 100644 --- a/packages/side-commons/package.json +++ b/packages/side-commons/package.json @@ -1,6 +1,6 @@ { "name": "@seleniumhq/side-commons", - "version": "4.0.0-alpha.3", + "version": "4.0.1", "private": false, "description": "Selenium IDE common utilities", "author": "Tomer ", diff --git a/packages/side-example-suite/package.json b/packages/side-example-suite/package.json index 451b09c70..4e2c4ec6a 100644 --- a/packages/side-example-suite/package.json +++ b/packages/side-example-suite/package.json @@ -1,6 +1,6 @@ { "name": "@seleniumhq/side-example-suite", - "version": "4.0.0-alpha.9", + "version": "4.0.1", "private": true, "description": "Selenium IDE example suite, with tests, plugin, and export format", "author": "Todd ", @@ -17,11 +17,11 @@ "watch": "tsc --watch" }, "dependencies": { - "side-code-export": "^4.0.0-alpha.17", - "@seleniumhq/code-export-python-pytest": "^4.0.0-alpha.6" + "side-code-export": "^4.0.0", + "@seleniumhq/code-export-python-pytest": "^4.0.1" }, "devDependencies": { - "@seleniumhq/side-api": "^4.0.0-alpha.46" + "@seleniumhq/side-api": "^4.0.1" }, "repository": { "type": "git", diff --git a/packages/side-model/package.json b/packages/side-model/package.json index 744d989a8..f8e83d96f 100644 --- a/packages/side-model/package.json +++ b/packages/side-model/package.json @@ -1,6 +1,6 @@ { "name": "@seleniumhq/side-model", - "version": "4.0.0-alpha.5", + "version": "4.0.1", "private": false, "description": "Selenium IDE shared models", "author": "Tomer ", diff --git a/packages/side-runner/package.json b/packages/side-runner/package.json index 005d2e674..710ba77b8 100644 --- a/packages/side-runner/package.json +++ b/packages/side-runner/package.json @@ -1,6 +1,6 @@ { "name": "selenium-side-runner", - "version": "4.0.0-alpha.71", + "version": "4.0.1", "private": false, "description": "Run Selenium IDE projects in cli", "repository": "https://github.com/SeleniumHQ/selenium-ide", @@ -23,8 +23,8 @@ ], "license": "Apache-2.0", "dependencies": { - "@seleniumhq/side-model": "^4.0.0-alpha.5", - "@seleniumhq/side-runtime": "^4.0.0-alpha.44", + "@seleniumhq/side-model": "^4.0.1", + "@seleniumhq/side-runtime": "^4.0.1", "commander": "^11.0.0", "glob": "^10.3.1", "jest": "^29.6.0", diff --git a/packages/side-runner/src/run.ts b/packages/side-runner/src/run.ts index e5c942928..0d50c846a 100644 --- a/packages/side-runner/src/run.ts +++ b/packages/side-runner/src/run.ts @@ -152,7 +152,7 @@ const buildRun = ({ configuration, logger }: HoistedThings): TestRunner => ({ if (state === 'finished') { return onComplete(null) } - logger.info( + logger.debug( 'Last command:', playback['state'].lastSentCommandState?.command ) @@ -168,7 +168,6 @@ const buildRun = ({ configuration, logger }: HoistedThings): TestRunner => ({ PlaybackEvents.COMMAND_STATE_CHANGED, ({ command, - message, state, }: PlaybackEventShapes['COMMAND_STATE_CHANGED']) => { const cmd = command @@ -176,9 +175,6 @@ const buildRun = ({ configuration, logger }: HoistedThings): TestRunner => ({ .filter((v) => !!v) .join('|') logger.debug(`${state} ${niceString}`) - if (message) { - logger.error(message) - } } ) try { diff --git a/packages/side-runtime/package.json b/packages/side-runtime/package.json index c32d1b4ec..81354c27d 100644 --- a/packages/side-runtime/package.json +++ b/packages/side-runtime/package.json @@ -1,6 +1,6 @@ { "name": "@seleniumhq/side-runtime", - "version": "4.0.0-alpha.44", + "version": "4.0.1", "private": false, "description": "Selenium IDE playback and execution", "author": "Tomer ", @@ -25,13 +25,13 @@ "url": "https://github.com/SeleniumHQ/selenium-ide/issues" }, "devDependencies": { - "@seleniumhq/get-driver": "^4.0.0-alpha.3", - "@seleniumhq/side-testkit": "^4.0.0-alpha.2", - "@seleniumhq/webdriver-testkit": "^4.0.0-alpha.4" + "@seleniumhq/get-driver": "^4.0.1", + "@seleniumhq/side-testkit": "^4.0.1", + "@seleniumhq/webdriver-testkit": "^4.0.1" }, "dependencies": { - "@seleniumhq/side-commons": "^4.0.0-alpha.3", - "@seleniumhq/side-model": "^4.0.0-alpha.5", + "@seleniumhq/side-commons": "^4.0.1", + "@seleniumhq/side-model": "^4.0.1", "@types/selenium-webdriver": "^4.1.21", "selenium-webdriver": "^4.16.0" }, diff --git a/packages/side-runtime/src/__tests__/__snapshots__/playback.spec.ts.snap b/packages/side-runtime/src/__tests__/__snapshots__/playback.spec.ts.snap index c0b1108fb..d9714d009 100644 --- a/packages/side-runtime/src/__tests__/__snapshots__/playback.spec.ts.snap +++ b/packages/side-runtime/src/__tests__/__snapshots__/playback.spec.ts.snap @@ -555,9 +555,9 @@ exports[`Playback pause on exceptions should pause for every type of error 1`] = "target": "", "value": "", }, - "error": [Error: Mock error in open], + "error": [Error: Mock error in open during open::], "id": "1", - "message": "Mock error in open", + "message": "Mock error in open during open::", "state": "errored", "testID": "1", }, @@ -606,9 +606,9 @@ exports[`Playback pause on exceptions should pause for every type of error 1`] = "target": "", "value": "", }, - "error": [Error: Mock error in verify], + "error": [Error: Mock error in verify during verify::], "id": "2", - "message": "Mock error in verify", + "message": "Mock error in verify during verify::", "state": "failed", "testID": "1", }, @@ -657,9 +657,9 @@ exports[`Playback pause on exceptions should pause for every type of error 1`] = "target": "", "value": "", }, - "error": [Error: Mock error in assert], + "error": [Error: Mock error in assert during assert::], "id": "3", - "message": "Mock error in assert", + "message": "Mock error in assert during assert::", "state": "failed", "testID": "1", }, @@ -713,9 +713,9 @@ exports[`Playback pause on exceptions should pause until the command is fixed 1` "target": "", "value": "", }, - "error": [Error: Mock open error], + "error": [Error: Mock open error during open::], "id": "1", - "message": "Mock open error", + "message": "Mock open error during open::", "state": "errored", "testID": "1", }, @@ -739,9 +739,9 @@ exports[`Playback pause on exceptions should pause until the command is fixed 1` "target": "", "value": "", }, - "error": [Error: Mock open error], + "error": [Error: Mock open error during open::], "id": "1", - "message": "Mock open error", + "message": "Mock open error during open::", "state": "errored", "testID": "1", }, @@ -765,9 +765,9 @@ exports[`Playback pause on exceptions should pause until the command is fixed 1` "target": "", "value": "", }, - "error": [Error: Mock open error], + "error": [Error: Mock open error during open::], "id": "1", - "message": "Mock open error", + "message": "Mock open error during open::", "state": "errored", "testID": "1", }, diff --git a/packages/side-runtime/src/playback-tree/command-node.ts b/packages/side-runtime/src/playback-tree/command-node.ts index 4629cdf08..7358e36ab 100644 --- a/packages/side-runtime/src/playback-tree/command-node.ts +++ b/packages/side-runtime/src/playback-tree/command-node.ts @@ -35,6 +35,17 @@ export interface CommandExecutionResult { value?: any } +export const getCommandDisplayString = ({ + comment, + command, + target, + value, +}: CommandShape) => { + const paramsString = [command, target, value].filter((p) => p).join(' ') + const commentString = comment ? `(${comment})` : '' + return `${paramsString} ${commentString}` +} + export class CommandNode { constructor( command: CommandShape, @@ -115,7 +126,7 @@ export class CommandNode { return } else { const { command } = this - const { target, value } = command + const { comment, target, value } = command const commandName = command.command const customCommand = commandExecutor.customCommands[commandName] const existingCommandName = commandExecutor.name(commandName) @@ -137,7 +148,17 @@ export class CommandNode { ] const ignoreRetry = !cmdList.includes(commandName) if (ignoreRetry) { - return executor() + try { + return await executor() + } catch (e) { + const err = e as Error + err.message = + err.message + + ` during${ + comment ? ` (${comment})` : '' + } ${commandName}:${target}:${value}` + throw err + } } return this.retryCommand( executor, @@ -156,19 +177,14 @@ export class CommandNode { ): Promise { return new Promise((res, rej) => { const timeLimit = timeout - Date.now() + const commandString = `during${ + this.command.comment ? ` (${this.command.comment})` : '' + } ${this.command.command}:${this.command.target}:${this.command.value}` if (timeLimit <= 0) { - return rej( - new Error( - `Operation timed out running command ${this.command.command}:${this.command.target}:${this.command.value}` - ) - ) + return rej(new Error(`Operation timed out ${commandString}`)) } const expirationTimer = setTimeout(() => { - rej( - new Error( - `Operation timed out running command ${this.command.command}:${this.command.target}:${this.command.value}` - ) - ) + rej(new Error(`Operation timed out ${commandString}`)) }, timeLimit) execute() .then((result) => { @@ -183,7 +199,9 @@ export class CommandNode { this.retryCommand(execute, timeout).then(res).catch(rej) ) } catch (e) { - rej(e) + const err = e as Error + err.message = err.message + ` ${commandString}` + rej(err) } }) }) diff --git a/packages/side-runtime/src/webdriver.ts b/packages/side-runtime/src/webdriver.ts index 15b425c22..1894419bd 100644 --- a/packages/side-runtime/src/webdriver.ts +++ b/packages/side-runtime/src/webdriver.ts @@ -168,7 +168,7 @@ export default class WebDriverExecutor { >): webdriver.ThenableWebDriver { const { browserName, ...capabilities } = this .capabilities as ExpandedCapabilities - logger.info('Building driver for ' + browserName) + debug && logger.info('Building driver for ' + browserName) debug && logger.info( 'Driver attributes:' + @@ -192,7 +192,7 @@ export default class WebDriverExecutor { .capabilities as ExpandedCapabilities try { const driver = await this.getDriverSync({ debug, logger }) - logger.info('Driver has been built for ' + browserName) + debug && logger.info('Driver has been built for ' + browserName) return driver } catch (e) { if (debug) { diff --git a/packages/side-testkit/package.json b/packages/side-testkit/package.json index 909bf3120..5f97aff85 100644 --- a/packages/side-testkit/package.json +++ b/packages/side-testkit/package.json @@ -1,6 +1,6 @@ { "name": "@seleniumhq/side-testkit", - "version": "4.0.0-alpha.2", + "version": "4.0.1", "private": false, "description": "Selenium IDE test stuff", "author": "Tomer ", diff --git a/packages/webdriver-testkit/package.json b/packages/webdriver-testkit/package.json index 7596e1ca0..26951a570 100644 --- a/packages/webdriver-testkit/package.json +++ b/packages/webdriver-testkit/package.json @@ -1,6 +1,6 @@ { "name": "@seleniumhq/webdriver-testkit", - "version": "4.0.0-alpha.4", + "version": "4.0.1", "private": true, "description": "Manage test driver installation", "author": "Tomer ", @@ -30,8 +30,8 @@ "selenium-webdriver": "^4.16.0" }, "dependencies": { - "@seleniumhq/browser-info": "^4.0.0-alpha.2", - "@seleniumhq/get-driver": "^4.0.0-alpha.3", + "@seleniumhq/browser-info": "^4.0.1", + "@seleniumhq/get-driver": "^4.0.1", "fs-extra": "^8.1.0" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index a4854709c..d86625678 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -131,73 +131,73 @@ importers: packages/code-export-csharp-commons: dependencies: side-code-export: - specifier: ^4.0.0-alpha.17 + specifier: ^4.0.0 version: link:../side-code-export devDependencies: '@seleniumhq/side-model': - specifier: ^4.0.0-alpha.5 + specifier: ^4.0.1 version: link:../side-model packages/code-export-csharp-nunit: dependencies: '@seleniumhq/code-export-csharp-commons': - specifier: ^4.0.0-alpha.5 + specifier: ^4.0.1 version: link:../code-export-csharp-commons side-code-export: - specifier: ^4.0.0-alpha.17 + specifier: ^4.0.0 version: link:../side-code-export packages/code-export-csharp-xunit: dependencies: '@seleniumhq/code-export-csharp-commons': - specifier: ^4.0.0-alpha.5 + specifier: ^4.0.1 version: link:../code-export-csharp-commons side-code-export: - specifier: ^4.0.0-alpha.17 + specifier: ^4.0.0 version: link:../side-code-export devDependencies: '@seleniumhq/side-model': - specifier: ^4.0.0-alpha.5 + specifier: ^4.0.1 version: link:../side-model packages/code-export-java-junit: dependencies: side-code-export: - specifier: ^4.0.0-alpha.17 + specifier: ^4.0.0 version: link:../side-code-export devDependencies: '@seleniumhq/side-model': - specifier: ^4.0.0-alpha.5 + specifier: ^4.0.1 version: link:../side-model packages/code-export-javascript-mocha: dependencies: side-code-export: - specifier: ^4.0.0-alpha.17 + specifier: ^4.0.0 version: link:../side-code-export devDependencies: '@seleniumhq/side-model': - specifier: ^4.0.0-alpha.5 + specifier: ^4.0.1 version: link:../side-model packages/code-export-python-pytest: dependencies: side-code-export: - specifier: ^4.0.0-alpha.17 + specifier: ^4.0.0 version: link:../side-code-export devDependencies: '@seleniumhq/side-model': - specifier: ^4.0.0-alpha.5 + specifier: ^4.0.1 version: link:../side-model packages/code-export-ruby-rspec: dependencies: side-code-export: - specifier: ^4.0.0-alpha.17 + specifier: ^4.0.0 version: link:../side-code-export devDependencies: '@seleniumhq/side-model': - specifier: ^4.0.0-alpha.5 + specifier: ^4.0.1 version: link:../side-model packages/get-driver: @@ -249,37 +249,37 @@ importers: specifier: ^5.15.0 version: 5.15.0(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(@types/react@18.2.15)(react-dom@18.2.0)(react@18.2.0) '@seleniumhq/code-export-csharp-nunit': - specifier: ^4.0.0-alpha.6 + specifier: ^4.0.1 version: link:../code-export-csharp-nunit '@seleniumhq/code-export-csharp-xunit': - specifier: ^4.0.0-alpha.6 + specifier: ^4.0.1 version: link:../code-export-csharp-xunit '@seleniumhq/code-export-java-junit': - specifier: ^4.0.0-alpha.6 + specifier: ^4.0.1 version: link:../code-export-java-junit '@seleniumhq/code-export-javascript-mocha': - specifier: ^4.0.0-alpha.8 + specifier: ^4.0.1 version: link:../code-export-javascript-mocha '@seleniumhq/code-export-python-pytest': - specifier: ^4.0.0-alpha.7 + specifier: ^4.0.1 version: link:../code-export-python-pytest '@seleniumhq/code-export-ruby-rspec': - specifier: ^4.0.0-alpha.6 + specifier: ^4.0.1 version: link:../code-export-ruby-rspec '@seleniumhq/get-driver': - specifier: ^4.0.0-alpha.3 + specifier: ^4.0.1 version: link:../get-driver '@seleniumhq/side-api': - specifier: ^4.0.0-alpha.49 + specifier: ^4.0.1 version: link:../side-api '@seleniumhq/side-commons': - specifier: ^4.0.0-alpha.3 + specifier: ^4.0.1 version: link:../side-commons '@seleniumhq/side-model': - specifier: ^4.0.0-alpha.5 + specifier: ^4.0.1 version: link:../side-model '@seleniumhq/side-runtime': - specifier: ^4.0.0-alpha.44 + specifier: ^4.0.1 version: link:../side-runtime dnd-core: specifier: ^16.0.1 @@ -327,7 +327,7 @@ importers: specifier: ^4.16.0 version: 4.16.0 side-code-export: - specifier: ^4.0.0-alpha.17 + specifier: ^4.0.0 version: link:../side-code-export v8-compile-cache: specifier: ^2.3.0 @@ -337,7 +337,7 @@ importers: specifier: ^1.1.1 version: 1.1.3 '@seleniumhq/browser-info': - specifier: ^4.0.0-alpha.2 + specifier: ^4.0.1 version: link:../browser-info '@types/copy-webpack-plugin': specifier: 8.0.1 @@ -421,16 +421,16 @@ importers: packages/side-api: dependencies: '@seleniumhq/browser-info': - specifier: ^4.0.0-alpha.2 + specifier: ^4.0.1 version: link:../browser-info '@seleniumhq/get-driver': - specifier: ^4.0.0-alpha.3 + specifier: ^4.0.1 version: link:../get-driver '@seleniumhq/side-model': - specifier: ^4.0.0-alpha.5 + specifier: ^4.0.1 version: link:../side-model '@seleniumhq/side-runtime': - specifier: ^4.0.0-alpha.43 + specifier: ^4.0.1 version: link:../side-runtime lodash: specifier: ^4.17.21 @@ -471,10 +471,10 @@ importers: packages/side-code-export: dependencies: '@seleniumhq/side-model': - specifier: ^4.0.0-alpha.5 + specifier: ^4.0.1 version: link:../side-model '@seleniumhq/side-runtime': - specifier: ^4.0.0-alpha.43 + specifier: ^4.0.1 version: link:../side-runtime commander: specifier: ^9.4.0 @@ -485,14 +485,14 @@ importers: packages/side-example-suite: dependencies: '@seleniumhq/code-export-python-pytest': - specifier: ^4.0.0-alpha.6 + specifier: ^4.0.1 version: link:../code-export-python-pytest side-code-export: - specifier: ^4.0.0-alpha.17 + specifier: ^4.0.0 version: link:../side-code-export devDependencies: '@seleniumhq/side-api': - specifier: ^4.0.0-alpha.46 + specifier: ^4.0.1 version: link:../side-api packages/side-migrate: @@ -522,10 +522,10 @@ importers: packages/side-runner: dependencies: '@seleniumhq/side-model': - specifier: ^4.0.0-alpha.5 + specifier: ^4.0.1 version: link:../side-model '@seleniumhq/side-runtime': - specifier: ^4.0.0-alpha.44 + specifier: ^4.0.1 version: link:../side-runtime commander: specifier: ^11.0.0 @@ -577,10 +577,10 @@ importers: packages/side-runtime: dependencies: '@seleniumhq/side-commons': - specifier: ^4.0.0-alpha.3 + specifier: ^4.0.1 version: link:../side-commons '@seleniumhq/side-model': - specifier: ^4.0.0-alpha.5 + specifier: ^4.0.1 version: link:../side-model '@types/selenium-webdriver': specifier: ^4.1.21 @@ -590,13 +590,13 @@ importers: version: 4.16.0 devDependencies: '@seleniumhq/get-driver': - specifier: ^4.0.0-alpha.3 + specifier: ^4.0.1 version: link:../get-driver '@seleniumhq/side-testkit': - specifier: ^4.0.0-alpha.2 + specifier: ^4.0.1 version: link:../side-testkit '@seleniumhq/webdriver-testkit': - specifier: ^4.0.0-alpha.4 + specifier: ^4.0.1 version: link:../webdriver-testkit packages/side-testkit: @@ -612,10 +612,10 @@ importers: packages/webdriver-testkit: dependencies: '@seleniumhq/browser-info': - specifier: ^4.0.0-alpha.2 + specifier: ^4.0.1 version: link:../browser-info '@seleniumhq/get-driver': - specifier: ^4.0.0-alpha.3 + specifier: ^4.0.1 version: link:../get-driver fs-extra: specifier: ^8.1.0