Skip to content

Commit 2343098

Browse files
toddtarsitoddtarsi
committed
latest increment of everything
1 parent 429a1a0 commit 2343098

File tree

19 files changed

+200
-181
lines changed

19 files changed

+200
-181
lines changed

‎packages/code-export-csharp-commons/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@seleniumhq/code-export-csharp-commons",
3-
"version": "4.0.3",
3+
"version": "4.0.4",
44
"private": false,
55
"description": "Commons for exporting Selenium IDE project contents to C#",
66
"repository": "https://github.com/SeleniumHQ/selenium-ide",
@@ -18,9 +18,9 @@
1818
"watch": "tsc --watch"
1919
},
2020
"dependencies": {
21-
"side-code-export": "^4.0.4"
21+
"side-code-export": "^4.0.5"
2222
},
2323
"devDependencies": {
24-
"@seleniumhq/side-model": "^4.0.1"
24+
"@seleniumhq/side-model": "^4.0.2"
2525
}
2626
}

‎packages/code-export-csharp-nunit/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@seleniumhq/code-export-csharp-nunit",
3-
"version": "4.0.3",
3+
"version": "4.0.4",
44
"private": false,
55
"description": "Export Selenium IDE project contents to C# NUnit",
66
"repository": "https://github.com/SeleniumHQ/selenium-ide",
@@ -19,7 +19,7 @@
1919
"types": "dist/index.d.ts",
2020
"dependencies": {
2121
"@seleniumhq/code-export-csharp-commons": "^4.0.1",
22-
"side-code-export": "^4.0.4"
22+
"side-code-export": "^4.0.5"
2323
},
2424
"gitHead": "f58e327e7616e23a3e926e4b80cf9952164e5744"
2525
}

‎packages/code-export-csharp-xunit/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@seleniumhq/code-export-csharp-xunit",
3-
"version": "4.0.3",
3+
"version": "4.0.4",
44
"private": false,
55
"description": "Export Selenium IDE project contents to C# XUnit",
66
"repository": "https://github.com/SeleniumHQ/selenium-ide",
@@ -19,10 +19,10 @@
1919
"types": "dist/index.d.ts",
2020
"dependencies": {
2121
"@seleniumhq/code-export-csharp-commons": "^4.0.1",
22-
"side-code-export": "^4.0.4"
22+
"side-code-export": "^4.0.5"
2323
},
2424
"devDependencies": {
25-
"@seleniumhq/side-model": "^4.0.1"
25+
"@seleniumhq/side-model": "^4.0.2"
2626
},
2727
"gitHead": "f58e327e7616e23a3e926e4b80cf9952164e5744"
2828
}

‎packages/code-export-java-junit/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@seleniumhq/code-export-java-junit",
3-
"version": "4.0.3",
3+
"version": "4.0.4",
44
"private": false,
55
"description": "Export Selenium IDE project contents to Java JUnit",
66
"repository": "https://github.com/SeleniumHQ/selenium-ide",
@@ -17,10 +17,10 @@
1717
},
1818
"main": "dist/index.js",
1919
"dependencies": {
20-
"side-code-export": "^4.0.4"
20+
"side-code-export": "^4.0.5"
2121
},
2222
"devDependencies": {
23-
"@seleniumhq/side-model": "^4.0.1"
23+
"@seleniumhq/side-model": "^4.0.2"
2424
},
2525
"gitHead": "f58e327e7616e23a3e926e4b80cf9952164e5744"
2626
}

‎packages/code-export-javascript-mocha/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@seleniumhq/code-export-javascript-mocha",
3-
"version": "4.0.3",
3+
"version": "4.0.4",
44
"private": false,
55
"description": "Export Selenium IDE project contents to JavaScript Mocha",
66
"repository": "https://github.com/SeleniumHQ/selenium-ide",
@@ -17,10 +17,10 @@
1717
},
1818
"main": "dist/index.js",
1919
"dependencies": {
20-
"side-code-export": "^4.0.4"
20+
"side-code-export": "^4.0.5"
2121
},
2222
"devDependencies": {
23-
"@seleniumhq/side-model": "^4.0.1"
23+
"@seleniumhq/side-model": "^4.0.2"
2424
},
2525
"gitHead": "f58e327e7616e23a3e926e4b80cf9952164e5744"
2626
}

‎packages/code-export-python-pytest/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@seleniumhq/code-export-python-pytest",
3-
"version": "4.0.3",
3+
"version": "4.0.4",
44
"private": false,
55
"description": "Export Selenium IDE project contents to Python pytest",
66
"repository": "https://github.com/SeleniumHQ/selenium-ide",
@@ -17,10 +17,10 @@
1717
},
1818
"main": "dist/index.js",
1919
"dependencies": {
20-
"side-code-export": "^4.0.4"
20+
"side-code-export": "^4.0.5"
2121
},
2222
"devDependencies": {
23-
"@seleniumhq/side-model": "^4.0.1"
23+
"@seleniumhq/side-model": "^4.0.2"
2424
},
2525
"gitHead": "f58e327e7616e23a3e926e4b80cf9952164e5744"
2626
}

‎packages/code-export-ruby-rspec/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@seleniumhq/code-export-ruby-rspec",
3-
"version": "4.0.3",
3+
"version": "4.0.4",
44
"private": false,
55
"description": "Export Selenium IDE project contents to Ruby RSpec",
66
"repository": "https://github.com/SeleniumHQ/selenium-ide",
@@ -17,10 +17,10 @@
1717
},
1818
"main": "dist/index.js",
1919
"dependencies": {
20-
"side-code-export": "^4.0.4"
20+
"side-code-export": "^4.0.5"
2121
},
2222
"devDependencies": {
23-
"@seleniumhq/side-model": "^4.0.1"
23+
"@seleniumhq/side-model": "^4.0.2"
2424
},
2525
"gitHead": "f58e327e7616e23a3e926e4b80cf9952164e5744"
2626
}

‎packages/get-driver/package.json‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@seleniumhq/get-driver",
3-
"version": "4.0.1",
3+
"version": "4.0.2",
44
"private": false,
55
"description": "Download browser drivers",
66
"author": "Tomer <[email protected]>",
@@ -26,13 +26,12 @@
2626
"dependencies": {
2727
"fs-extra": "^8.1.0",
2828
"node-fetch": "^2.6.0",
29-
"tar": "^5.0.5",
29+
"tar": "^7.1.0",
3030
"unzipper": "^0.10.5"
3131
},
3232
"devDependencies": {
3333
"@types/fs-extra": "^8.0.0",
3434
"@types/node-fetch": "^2.5.2",
35-
"@types/tar": "^4.0.3",
3635
"@types/unzipper": "^0.10.0",
3736
"nock": "^11.6.0"
3837
}

‎packages/selenium-ide/package.json‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "selenium-ide",
3-
"version": "4.0.1-beta.9",
3+
"version": "4.0.1-beta.10",
44
"private": false,
55
"description": "Selenium IDE electron app",
66
"author": "Todd <[email protected]>",
@@ -117,17 +117,17 @@
117117
"@fontsource/roboto": "^5.0.8",
118118
"@mui/icons-material": "^5.15.13",
119119
"@mui/material": "^5.15.13",
120-
"@seleniumhq/code-export-csharp-nunit": "^4.0.3",
121-
"@seleniumhq/code-export-csharp-xunit": "^4.0.3",
122-
"@seleniumhq/code-export-java-junit": "^4.0.3",
123-
"@seleniumhq/code-export-javascript-mocha": "^4.0.3",
124-
"@seleniumhq/code-export-python-pytest": "^4.0.3",
125-
"@seleniumhq/code-export-ruby-rspec": "^4.0.3",
126-
"@seleniumhq/get-driver": "^4.0.1",
127-
"@seleniumhq/side-api": "^4.0.7",
120+
"@seleniumhq/code-export-csharp-nunit": "^4.0.4",
121+
"@seleniumhq/code-export-csharp-xunit": "^4.0.4",
122+
"@seleniumhq/code-export-java-junit": "^4.0.4",
123+
"@seleniumhq/code-export-javascript-mocha": "^4.0.4",
124+
"@seleniumhq/code-export-python-pytest": "^4.0.4",
125+
"@seleniumhq/code-export-ruby-rspec": "^4.0.4",
126+
"@seleniumhq/get-driver": "^4.0.2",
127+
"@seleniumhq/side-api": "^4.0.8",
128128
"@seleniumhq/side-commons": "^4.0.1",
129-
"@seleniumhq/side-model": "^4.0.1",
130-
"@seleniumhq/side-runtime": "^4.0.6",
129+
"@seleniumhq/side-model": "^4.0.2",
130+
"@seleniumhq/side-runtime": "^4.0.7",
131131
"dnd-core": "^16.0.1",
132132
"electron-chromedriver": "^28.0.0",
133133
"electron-log": "^5.1.0",
@@ -144,7 +144,7 @@
144144
"react-resizable-panels": "^1.0.8",
145145
"scroll-into-view-if-needed": "^3.0.10",
146146
"selenium-webdriver": "^4.16.0",
147-
"side-code-export": "^4.0.4",
147+
"side-code-export": "^4.0.5",
148148
"v8-compile-cache": "^2.3.0"
149149
},
150150
"devDependencies": {

‎packages/selenium-ide/src/main/session/controllers/System/index.ts‎

Lines changed: 21 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import langFileEn, {LanguageMap} from 'browser/I18N/en'
1+
import langFileEn, { LanguageMap } from 'browser/I18N/en'
22
import { dialog, ipcMain } from 'electron'
33
import { autoUpdater } from 'electron-updater'
44
import { writeFile } from 'fs/promises'
@@ -82,28 +82,32 @@ export default class SystemController extends BaseController {
8282
if (!isAutomated) {
8383
// Just don't do this until we have CSC unfortunately
8484
// this.checkForUpdates()
85-
const startupError = await this.session.driver.startProcess(
85+
const browser = this.session.store.get('browserInfo')
86+
let startupError = await this.session.driver.startProcess(
8687
this.session.store.get('browserInfo')
8788
)
8889
if (startupError) {
89-
console.warn(`
90-
Failed to locate non-electron driver on startup,
91-
Resetting to electron driver.
92-
`)
93-
await this.session.store.set('browserInfo', {
94-
browser: 'electron',
95-
useBidi: false,
96-
version: '',
97-
})
98-
const fallbackStartupError = await this.session.driver.startProcess(
99-
this.session.store.get('browserInfo')
100-
)
101-
if (fallbackStartupError) {
102-
await this.crash(
103-
`Unable to startup due to chromedriver error: ${fallbackStartupError}`
90+
const isElectronBrowser = browser.browser === 'electron'
91+
if (!isElectronBrowser) {
92+
console.warn(`
93+
Failed to locate non-electron driver on startup,
94+
Resetting to electron driver.
95+
`)
96+
await this.session.store.set('browserInfo', {
97+
browser: 'electron',
98+
useBidi: false,
99+
version: '',
100+
})
101+
startupError = await this.session.driver.startProcess(
102+
this.session.store.get('browserInfo')
104103
)
105104
}
106105
}
106+
if (startupError) {
107+
await this.crash(
108+
`Unable to startup due to chromedriver error: ${startupError}`
109+
)
110+
}
107111
}
108112
await this.session.projects.select(firstTime)
109113
await this.session.api.system.onLog.addListener(this.writeToLog)

0 commit comments

Comments
 (0)