jun 29 rc candidate

toddtarsi · toddtarsi · commit ca98d7012250 · 2024-06-29T18:45:25.000-05:00
fix recursion in code export
also remove fallback selectors since those cause issues
diff --git a/packages/browser-info/package.json b/packages/browser-info/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@seleniumhq/browser-info",
-  "version": "4.0.10",
+  "version": "4.0.11",
   "private": false,
   "description": "Get information about installed browsers",
   "author": "Tomer <tomer@corevo.io>",
diff --git 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.10",
+  "version": "4.0.11",
   "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.10"
+    "side-code-export": "^4.0.11"
   },
   "devDependencies": {
-    "@seleniumhq/side-model": "4.0.10"
+    "@seleniumhq/side-model": "4.0.11"
   }
 }
diff --git 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.10",
+  "version": "4.0.11",
   "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.10",
-    "side-code-export": "^4.0.10"
+    "@seleniumhq/code-export-csharp-commons": "4.0.11",
+    "side-code-export": "^4.0.11"
   },
   "gitHead": "f58e327e7616e23a3e926e4b80cf9952164e5744"
 }
diff --git 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.10",
+  "version": "4.0.11",
   "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.10",
-    "side-code-export": "^4.0.10"
+    "@seleniumhq/code-export-csharp-commons": "4.0.11",
+    "side-code-export": "^4.0.11"
   },
   "devDependencies": {
-    "@seleniumhq/side-model": "4.0.10"
+    "@seleniumhq/side-model": "4.0.11"
   },
   "gitHead": "f58e327e7616e23a3e926e4b80cf9952164e5744"
 }
diff --git 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.10",
+  "version": "4.0.11",
   "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.10"
+    "side-code-export": "^4.0.11"
   },
   "devDependencies": {
-    "@seleniumhq/side-model": "4.0.10"
+    "@seleniumhq/side-model": "4.0.11"
   },
   "gitHead": "f58e327e7616e23a3e926e4b80cf9952164e5744"
 }
diff --git 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.10",
+  "version": "4.0.11",
   "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.10"
+    "side-code-export": "^4.0.11"
   },
   "devDependencies": {
-    "@seleniumhq/side-model": "4.0.10"
+    "@seleniumhq/side-model": "4.0.11"
   },
   "gitHead": "f58e327e7616e23a3e926e4b80cf9952164e5744"
 }
diff --git 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.10",
+  "version": "4.0.11",
   "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.10"
+    "side-code-export": "^4.0.11"
   },
   "devDependencies": {
-    "@seleniumhq/side-model": "4.0.10"
+    "@seleniumhq/side-model": "4.0.11"
   },
   "gitHead": "f58e327e7616e23a3e926e4b80cf9952164e5744"
 }
diff --git 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.10",
+  "version": "4.0.11",
   "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.10"
+    "side-code-export": "^4.0.11"
   },
   "devDependencies": {
-    "@seleniumhq/side-model": "4.0.10"
+    "@seleniumhq/side-model": "4.0.11"
   },
   "gitHead": "f58e327e7616e23a3e926e4b80cf9952164e5744"
 }
diff --git a/packages/get-driver/package.json b/packages/get-driver/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@seleniumhq/get-driver",
-  "version": "4.0.10",
+  "version": "4.0.11",
   "private": false,
   "description": "Download browser drivers",
   "author": "Tomer <tomer@corevo.io>",
diff --git a/packages/selenium-ide/package.json b/packages/selenium-ide/package.json
@@ -1,6 +1,6 @@
 {
   "name": "selenium-ide",
-  "version": "4.0.1-beta.12",
+  "version": "4.0.1-beta.13",
   "private": false,
   "description": "Selenium IDE electron app",
   "author": "Todd <tarsitodd@gmail.com>",
@@ -118,17 +118,17 @@
     "@fontsource/roboto": "^5.0.8",
     "@mui/icons-material": "^5.15.13",
     "@mui/material": "^5.15.13",
-    "@seleniumhq/code-export-csharp-nunit": "4.0.10",
-    "@seleniumhq/code-export-csharp-xunit": "4.0.10",
-    "@seleniumhq/code-export-java-junit": "4.0.10",
-    "@seleniumhq/code-export-javascript-mocha": "4.0.10",
-    "@seleniumhq/code-export-python-pytest": "4.0.10",
-    "@seleniumhq/code-export-ruby-rspec": "4.0.10",
-    "@seleniumhq/get-driver": "4.0.10",
-    "@seleniumhq/side-api": "4.0.10",
-    "@seleniumhq/side-commons": "4.0.10",
-    "@seleniumhq/side-model": "4.0.10",
-    "@seleniumhq/side-runtime": "4.0.10",
+    "@seleniumhq/code-export-csharp-nunit": "4.0.11",
+    "@seleniumhq/code-export-csharp-xunit": "4.0.11",
+    "@seleniumhq/code-export-java-junit": "4.0.11",
+    "@seleniumhq/code-export-javascript-mocha": "4.0.11",
+    "@seleniumhq/code-export-python-pytest": "4.0.11",
+    "@seleniumhq/code-export-ruby-rspec": "4.0.11",
+    "@seleniumhq/get-driver": "4.0.11",
+    "@seleniumhq/side-api": "4.0.11",
+    "@seleniumhq/side-commons": "4.0.11",
+    "@seleniumhq/side-model": "4.0.11",
+    "@seleniumhq/side-runtime": "4.0.11",
     "dnd-core": "^16.0.1",
     "electron-chromedriver": "^28.0.0",
     "electron-log": "^5.1.0",
@@ -145,12 +145,12 @@
     "react-resizable-panels": "^1.0.8",
     "scroll-into-view-if-needed": "^3.0.10",
     "selenium-webdriver": "^4.20.0",
-    "side-code-export": "^4.0.10",
+    "side-code-export": "^4.0.11",
     "v8-compile-cache": "^2.3.0"
   },
   "devDependencies": {
     "@medv/finder": "^1.1.1",
-    "@seleniumhq/browser-info": "4.0.10",
+    "@seleniumhq/browser-info": "4.0.11",
     "@types/copy-webpack-plugin": "8.0.1",
     "@types/electron-devtools-installer": "^2.2.5",
     "@types/fs-extra": "^11.0.1",
diff --git a/packages/side-api/package.json b/packages/side-api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@seleniumhq/side-api",
-  "version": "4.0.10",
+  "version": "4.0.11",
   "private": false,
   "description": "Selenium IDE API command shapes and such.",
   "author": "Todd Tarsi <tarsitodd@gmail.com>",
@@ -20,10 +20,10 @@
     "dist"
   ],
   "dependencies": {
-    "@seleniumhq/browser-info": "4.0.10",
-    "@seleniumhq/get-driver": "4.0.10",
-    "@seleniumhq/side-model": "4.0.10",
-    "@seleniumhq/side-runtime": "4.0.10",
+    "@seleniumhq/browser-info": "4.0.11",
+    "@seleniumhq/get-driver": "4.0.11",
+    "@seleniumhq/side-model": "4.0.11",
+    "@seleniumhq/side-runtime": "4.0.11",
     "lodash": "^4.17.21"
   },
   "devDependencies": {
diff --git 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.10",
+  "version": "4.0.11",
   "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.10",
-    "@seleniumhq/side-runtime": "4.0.10",
+    "@seleniumhq/side-model": "4.0.11",
+    "@seleniumhq/side-runtime": "4.0.11",
     "commander": "^9.4.0"
   },
   "gitHead": "f58e327e7616e23a3e926e4b80cf9952164e5744"
diff --git a/packages/side-code-export/src/bin.ts b/packages/side-code-export/src/bin.ts
@@ -80,13 +80,22 @@ export const main = async () => {
 
   const options = program.opts()
   const [formatPath, projectPath, outputDir] = program.args
+
+  let outputFormatPath = ''
+  const relativeFormatPath = path.join(process.cwd(), formatPath)
+  if (path.isAbsolute(formatPath)) {
+    outputFormatPath = formatPath
+  } else if (fs.existsSync(relativeFormatPath)) {
+    outputFormatPath = relativeFormatPath
+  } else {
+    outputFormatPath = require.resolve(formatPath)
+  }
+
   const configuration: Configuration = {
     baseUrl: '',
     debug: options.debug,
     filter: options.filter || '.*',
-    format: path.isAbsolute(formatPath)
-      ? formatPath
-      : path.join(process.cwd(), formatPath),
+    format: outputFormatPath,
     mode: options.mode || 'suite',
     outputDir: path.isAbsolute(outputDir)
       ? outputDir
diff --git a/packages/side-code-export/src/code-export/find.ts b/packages/side-code-export/src/code-export/find.ts
@@ -29,16 +29,25 @@ export function deduplicateReusedTestMethods(testMethods: TestShape[]) {
 
 export function findCommandThatOpensWindow(
   test: TestShape,
-  tests: TestShape[]
+  tests: TestShape[],
+  searchedTests: TestShape[] = []
 ): CommandShape | null {
+  searchedTests.push(test)
   for (const command of test.commands) {
     if (command.opensWindow) {
       return command
     }
     if (command.command === 'run') {
       const nestedTests = findReusedTestMethods(test, tests)
       for (const nestedTest in nestedTests) {
-        const cmd = findCommandThatOpensWindow(nestedTests[nestedTest], tests)
+        if (searchedTests.indexOf(nestedTests[nestedTest]) !== -1) {
+          continue
+        }
+        const cmd = findCommandThatOpensWindow(
+          nestedTests[nestedTest],
+          tests,
+          searchedTests
+        )
         if (cmd) {
           return cmd
         }
@@ -48,21 +57,25 @@ export function findCommandThatOpensWindow(
   return null
 }
 
-export function findReusedTestMethods(test: TestShape, tests: TestShape[]) {
-  let results: TestShape[] = []
+export function findReusedTestMethods(
+  test: TestShape,
+  tests: TestShape[],
+  results: TestShape[] = []
+) {
   for (const command of test.commands) {
     if (command.command === 'run') {
       const reusedTest = tests.find((test) => test.name === command.target)
-      if (reusedTest) {
+      const newTests = tests.filter((test) => results.indexOf(test) === -1)
+      if (reusedTest && results.indexOf(reusedTest) === -1) {
         results.push(reusedTest)
-        results = results.concat(findReusedTestMethods(reusedTest, tests))
+        findReusedTestMethods(reusedTest, newTests, results)
       } else {
         console.log(
           'Encountered a dynamic test declaration, including all tests as methods - will bloat code'
         )
-        results = results.concat(tests)
+        results.push(...newTests)
       }
     }
   }
-  return deduplicateReusedTestMethods(results)
+  return results
 }
diff --git a/packages/side-commons/package.json b/packages/side-commons/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@seleniumhq/side-commons",
-  "version": "4.0.10",
+  "version": "4.0.11",
   "private": false,
   "description": "Selenium IDE common utilities",
   "author": "Tomer <tomer@corevo.io>",
diff --git 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.10",
+  "version": "4.0.11",
   "private": true,
   "description": "Selenium IDE example suite, with tests, plugin, and export format",
   "author": "Todd <tarsitodd@gmail.com>",
@@ -17,11 +17,11 @@
     "watch": "tsc --watch"
   },
   "dependencies": {
-    "side-code-export": "^4.0.10",
-    "@seleniumhq/code-export-python-pytest": "4.0.10"
+    "side-code-export": "^4.0.11",
+    "@seleniumhq/code-export-python-pytest": "4.0.11"
   },
   "devDependencies": {
-    "@seleniumhq/side-api": "4.0.10"
+    "@seleniumhq/side-api": "4.0.11"
   },
   "repository": {
     "type": "git",
diff --git a/packages/side-migrate/package.json b/packages/side-migrate/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@seleniumhq/side-migrate",
-  "version": "4.0.10",
+  "version": "4.0.11",
   "private": false,
   "description": "Selenium IDE format migrations",
   "author": "Tomer <tomer@corevo.io>",
diff --git a/packages/side-model/package.json b/packages/side-model/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@seleniumhq/side-model",
-  "version": "4.0.10",
+  "version": "4.0.11",
   "private": false,
   "description": "Selenium IDE shared models",
   "author": "Tomer <tomer@corevo.io>",
diff --git a/packages/side-runner/package.json b/packages/side-runner/package.json
diff --git a/packages/side-runtime/package.json b/packages/side-runtime/package.json
diff --git a/packages/side-runtime/src/webdriver.ts b/packages/side-runtime/src/webdriver.ts
diff --git a/packages/side-testkit/package.json b/packages/side-testkit/package.json
diff --git a/packages/webdriver-testkit/package.json b/packages/webdriver-testkit/package.json

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@seleniumhq/browser-info",`
`3`		`- "version": "4.0.10",`
	`3`	`+ "version": "4.0.11",`
`4`	`4`	`"private": false,`
`5`	`5`	`"description": "Get information about installed browsers",`
`6`	`6`	`"author": "Tomer <[email protected]>",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@seleniumhq/code-export-csharp-commons",`
`3`		`- "version": "4.0.10",`
	`3`	`+ "version": "4.0.11",`
`4`	`4`	`"private": false,`
`5`	`5`	`"description": "Commons for exporting Selenium IDE project contents to C#",`
`6`	`6`	`"repository": "https://github.com/SeleniumHQ/selenium-ide",`
`@@ -18,9 +18,9 @@`
`18`	`18`	`"watch": "tsc --watch"`
`19`	`19`	`},`
`20`	`20`	`"dependencies": {`
`21`		`- "side-code-export": "^4.0.10"`
	`21`	`+ "side-code-export": "^4.0.11"`
`22`	`22`	`},`
`23`	`23`	`"devDependencies": {`
`24`		`- "@seleniumhq/side-model": "4.0.10"`
	`24`	`+ "@seleniumhq/side-model": "4.0.11"`
`25`	`25`	`}`
`26`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@seleniumhq/get-driver",`
`3`		`- "version": "4.0.10",`
	`3`	`+ "version": "4.0.11",`
`4`	`4`	`"private": false,`
`5`	`5`	`"description": "Download browser drivers",`
`6`	`6`	`"author": "Tomer <[email protected]>",`