Skip to content

Commit ba506fb

Browse files
toddtarsitoddtarsi
committed
fix code export and increment EVERYTHING
1 parent 295157f commit ba506fb

File tree

20 files changed

+146
-87
lines changed

20 files changed

+146
-87
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.0-alpha.1",
3+
"version": "4.0.0-alpha.2",
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.0-alpha.8"
21+
"side-code-export": "^4.0.0-alpha.9"
2222
},
2323
"devDependencies": {
24-
"@seleniumhq/side-model": "^4.0.0-alpha.3"
24+
"@seleniumhq/side-model": "^4.0.0-alpha.4"
2525
}
2626
}

‎packages/code-export-csharp-nunit/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-nunit",
3-
"version": "4.0.0-alpha.1",
3+
"version": "4.0.0-alpha.2",
44
"private": false,
55
"description": "Export Selenium IDE project contents to C# NUnit",
66
"repository": "https://github.com/SeleniumHQ/selenium-ide",
@@ -18,8 +18,8 @@
1818
"main": "dist/index.js",
1919
"types": "dist/index.d.ts",
2020
"dependencies": {
21-
"@seleniumhq/code-export-csharp-commons": "^4.0.0-alpha.1",
22-
"side-code-export": "^4.0.0-alpha.8"
21+
"@seleniumhq/code-export-csharp-commons": "^4.0.0-alpha.2",
22+
"side-code-export": "^4.0.0-alpha.9"
2323
},
2424
"gitHead": "f58e327e7616e23a3e926e4b80cf9952164e5744"
2525
}

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

Lines changed: 4 additions & 4 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.0-alpha.1",
3+
"version": "4.0.0-alpha.2",
44
"private": false,
55
"description": "Export Selenium IDE project contents to C# XUnit",
66
"repository": "https://github.com/SeleniumHQ/selenium-ide",
@@ -18,11 +18,11 @@
1818
"main": "dist/index.js",
1919
"types": "dist/index.d.ts",
2020
"dependencies": {
21-
"@seleniumhq/code-export-csharp-commons": "^4.0.0-alpha.1",
22-
"side-code-export": "^4.0.0-alpha.8"
21+
"@seleniumhq/code-export-csharp-commons": "^4.0.0-alpha.2",
22+
"side-code-export": "^4.0.0-alpha.9"
2323
},
2424
"devDependencies": {
25-
"@seleniumhq/side-model": "^4.0.0-alpha.3"
25+
"@seleniumhq/side-model": "^4.0.0-alpha.4"
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.0-alpha.1",
3+
"version": "4.0.0-alpha.2",
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.0-alpha.8"
20+
"side-code-export": "^4.0.0-alpha.9"
2121
},
2222
"devDependencies": {
23-
"@seleniumhq/side-model": "^4.0.0-alpha.3"
23+
"@seleniumhq/side-model": "^4.0.0-alpha.4"
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.0-alpha.2",
3+
"version": "4.0.0-alpha.3",
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.0-alpha.8"
20+
"side-code-export": "^4.0.0-alpha.9"
2121
},
2222
"devDependencies": {
23-
"@seleniumhq/side-model": "^4.0.0-alpha.3"
23+
"@seleniumhq/side-model": "^4.0.0-alpha.4"
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.0-alpha.2",
3+
"version": "4.0.0-alpha.3",
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.0-alpha.8"
20+
"side-code-export": "^4.0.0-alpha.9"
2121
},
2222
"devDependencies": {
23-
"@seleniumhq/side-model": "^4.0.0-alpha.3"
23+
"@seleniumhq/side-model": "^4.0.0-alpha.4"
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.0-alpha.1",
3+
"version": "4.0.0-alpha.2",
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.0-alpha.8"
20+
"side-code-export": "^4.0.0-alpha.9"
2121
},
2222
"devDependencies": {
23-
"@seleniumhq/side-model": "^4.0.0-alpha.3"
23+
"@seleniumhq/side-model": "^4.0.0-alpha.4"
2424
},
2525
"gitHead": "f58e327e7616e23a3e926e4b80cf9952164e5744"
2626
}

‎packages/selenium-ide/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -105,11 +105,11 @@
105105
"@seleniumhq/code-export-javascript-mocha": "^4.0.0-alpha.2",
106106
"@seleniumhq/code-export-python-pytest": "^4.0.0-alpha.2",
107107
"@seleniumhq/code-export-ruby-rspec": "^4.0.0-alpha.1",
108-
"side-code-export": "^4.0.0-alpha.8",
108+
"side-code-export": "^4.0.0-alpha.9",
109109
"@seleniumhq/get-driver": "^4.0.0-alpha.1",
110-
"@seleniumhq/side-api": "^4.0.0-alpha.22",
111-
"@seleniumhq/side-model": "^4.0.0-alpha.3",
112-
"@seleniumhq/side-runtime": "^4.0.0-alpha.23",
110+
"@seleniumhq/side-api": "^4.0.0-alpha.23",
111+
"@seleniumhq/side-model": "^4.0.0-alpha.4",
112+
"@seleniumhq/side-runtime": "^4.0.0-alpha.24",
113113
"dnd-core": "16.0.1",
114114
"electron-chromedriver": "^25.3.0",
115115
"electron-log": "^4.4.8",

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

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,7 @@ export default class DialogsController extends BaseController {
99
async open() {
1010
return await dialog.showOpenDialog({ properties: ['openFile'] })
1111
}
12-
async showMessageBox(
13-
message: string,
14-
buttons: string[]
15-
): Promise<number>
16-
{
12+
async showMessageBox(message: string, buttons: string[]): Promise<number> {
1713
const { response } = await dialog.showMessageBox({ message, buttons })
1814
return response
1915
}
@@ -27,7 +23,9 @@ export default class DialogsController extends BaseController {
2723
const confirmed = response === 1
2824
return confirmed
2925
}
30-
async openSave() {
31-
return await dialog.showSaveDialog({})
26+
async openSave(path?: string) {
27+
return await dialog.showSaveDialog({
28+
defaultPath: path,
29+
})
3230
}
3331
}

‎packages/selenium-ide/src/main/session/controllers/OutputFormats/index.tsx

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import JavaJunit from '@seleniumhq/code-export-java-junit'
44
import JavascriptMocha from '@seleniumhq/code-export-javascript-mocha'
55
import PythonPytest from '@seleniumhq/code-export-python-pytest'
66
import RubyRSpec from '@seleniumhq/code-export-ruby-rspec'
7+
import kebabCase from 'lodash/fp/kebabCase'
78
import { fileWriter, LanguageEmitter } from 'side-code-export'
89
import BaseController from '../Base'
910

@@ -44,10 +45,12 @@ export default class OutputFormatsController extends BaseController {
4445
) as LanguageEmitter)
4546
if (!format) throw new Error(`Format ${formatName} not found`)
4647
const project = await this.session.projects.getActive()
47-
const outputPath = await this.session.dialogs.openSave()
48+
const suiteName = project.suites.find((s) => s.id === suiteID)?.name!
49+
const outputPath = await this.session.dialogs.openSave(
50+
kebabCase(suiteName) + format.opts.fileExtension
51+
)
4852
if (outputPath.canceled) return
4953
const filepath = outputPath.filePath as string
50-
const suiteName = project.suites.find((s) => s.id === suiteID)?.name!
5154
const suiteCode = await fileWriter.emitSuite(format, project, suiteName)
5255

5356
return fileWriter.writeFile(
@@ -64,10 +67,12 @@ export default class OutputFormatsController extends BaseController {
6467
) as LanguageEmitter)
6568
if (!format) throw new Error(`Format ${formatName} not found`)
6669
const project = await this.session.projects.getActive()
67-
const outputPath = await this.session.dialogs.openSave()
70+
const testName = project.tests.find((t) => t.id === testID)!.name
71+
const outputPath = await this.session.dialogs.openSave(
72+
kebabCase(testName) + format.opts.fileExtension
73+
)
6874
if (outputPath.canceled) return
6975
const filepath = outputPath.filePath as string
70-
const testName = project.tests.find((t) => t.id === testID)!.name
7176
const testCode = await fileWriter.emitTest(format, project, testName)
7277

7378
return fileWriter.writeFile(

0 commit comments

Comments
 (0)