Stabilizations, testing buildout, etc

Author: toddtarsi

package.json

@@ -15,7 +15,7 @@
     "test:e2e": "jest --testMatch \"**/packages/**/__tests__/**/*.e2e.js\"",
     "lint": "yarn lint:scripts",
     "lint:scripts": "eslint --ignore-pattern node_modules --ignore-pattern third-party --ignore-pattern dist --ignore-pattern build --ignore-pattern json --ext .ts,.tsx --ext .js packages/",
-    "test:side-runner": "./node_modules/@seleniumhq/side-runner/dist/bin.js --timeout 200000 ./tests/examples/wait-for.side",
+    "test:side-runner": "./node_modules/@seleniumhq/side-runner/dist/bin.js ./tests/examples/*.side",
     "typecheck": "tsc --noEmit --composite false",
     "watch": "run-p watch:ts watch:webpack",
     "watch:webpack": "lerna run --parallel --stream --scope @seleniumhq/selenium-ide --loglevel verbose watch",
@@ -70,6 +70,6 @@
     "stylelint-config-standard": "^25.0.0",
     "stylelint-prettier": "^2.0.0",
     "ts-jest": "^27.1.3",
-    "typescript": "^4.6.2"
+    "typescript": "^4.8.3"
   }
 }

packages/selenium-ide/package.json

@@ -103,18 +103,11 @@
     "@mui/icons-material": "^5.5.0",
     "@mui/lab": "^5.0.0-alpha.72",
     "@mui/material": "^5.5.0",
-    "@seleniumhq/code-export-csharp-commons": "3.17.4",
-    "@seleniumhq/code-export-csharp-nunit": "3.17.4",
-    "@seleniumhq/code-export-csharp-xunit": "3.17.4",
-    "@seleniumhq/code-export-java-junit": "3.17.4",
-    "@seleniumhq/code-export-javascript-mocha": "3.17.4",
-    "@seleniumhq/code-export-python-pytest": "3.17.4",
-    "@seleniumhq/code-export-ruby-rspec": "3.17.4",
     "@seleniumhq/get-driver": "^4.0.0-alpha.1",
     "@seleniumhq/side-api": "^4.0.0-alpha.2",
     "@seleniumhq/side-model": "^4.0.0-alpha.1",
     "@seleniumhq/side-plugin-example": "^4.0.0-alpha.1",
-    "@seleniumhq/side-runtime": "^4.0.0-alpha.2",
+    "@seleniumhq/side-runtime": "^4.0.0-alpha.4",
     "electron-chromedriver": "16.0.0",
     "electron-log": "4.4.6",
     "electron-store": "^8.0.0",

packages/selenium-ide/src/main/index.ts

@@ -1,9 +1,16 @@
 import 'v8-compile-cache'
 import 'source-map-support/register'
 import { app } from 'electron'
+import log from 'electron-log'
 import store from './store'
 import createSession from './session'
 import installReactDevtools from './install-react-devtools'
+import { join } from 'path'
+
+// Configure log file
+const logFile = new Date().toISOString() + '.main.log'
+log.transports.file.resolvePath = () => join(app.getPath('logs'), logFile)
+Object.assign(console, log.functions);
 
 // Enable debugging - required for electron-chromedriver
 app.commandLine.appendSwitch('remote-debugging-port', '8315')

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

@@ -11,5 +11,6 @@ export default class BaseController {
   async onProjectLoaded() {}
   async onProjectUnloaded() {}
   isController = true
+  priority: number = 0
   session: Session
 }

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

@@ -23,9 +23,12 @@ export default class CommandsController extends BaseController {
       }),
       {}
     )
+    console.log(this.customCommands)
     this.session.state.state.commands = {
       ...Commands,
       ...serializeCustomCommands(this.customCommands),
     }
   }
+  // This needs to build after plugins
+  priority = 5
 }

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

@@ -79,6 +79,7 @@ export default class DriverController extends BaseController {
         setWindowSize: async (_executor, width, height) => {
           const window = this.session.windows.getLastPlaybackWindow()
           const pbWinCount = this.session.windows.playbackWindows.length
+          console.log(pbWinCount, window);
           const b = await window.getBounds()
           const calcNewX = b.x + Math.floor(b.width / 2) - Math.floor(width / 2)
           const calcNewY =

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

@@ -27,10 +27,11 @@ export default class PluginsController extends BaseController {
   async onProjectLoaded() {
     const projectPath = this.session.projects.filepath as string
     const pluginPaths = await this.list()
-    const plugins = loadPlugins(
-      __non_webpack_require__,
+    console.log('Plugin paths', pluginPaths)
+    const plugins = await loadPlugins(
       projectPath,
-      await this.session.projects.getActive()
+      pluginPaths,
+      __non_webpack_require__
     )
     plugins.forEach((plugin, index) => {
       const pluginPath = pluginPaths[index]
@@ -62,4 +63,6 @@ export default class PluginsController extends BaseController {
       ipcMain.off(key, handler)
     })
   }
+  // This needs to build before commands
+  priority = 3
 }

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

@@ -27,11 +27,12 @@ export default class ProjectsController {
       'onProjectLoaded' | 'onProjectUnloaded'
     >
   ): Promise<void> {
-    await Promise.all(
-      Object.values(this.session)
-        .filter((v) => v.isController)
-        .map((v) => v[hookName]())
-    )
+    const controllers = Object.values(this.session)
+      .filter((v) => v.isController)
+      .sort((a: BaseController, b: BaseController) => a.priority - b.priority)
+    for (let i = 0, ii = controllers.length; i !== ii; i++) {
+      await controllers[i][hookName]()
+    }
   }
 
   async onProjectLoaded(
@@ -49,9 +50,9 @@ export default class ProjectsController {
     if (!this.loaded) return true
     const confirm = await this.doSaveChangesConfirm()
     if (confirm) {
+      this.loaded = false
       await this.executeHook('onProjectUnloaded')
       delete this.filepath
-      this.loaded = false
     }
     return confirm
   }

packages/side-cli/src/index.tsx

@@ -29,28 +29,32 @@ import path from 'path'
 import React from 'react'
 import PlaybackComponent from './components/playback'
 
-let projectPath = process.argv[2]
-if (projectPath.startsWith('.')) {
-  projectPath = path.join(process.cwd(), projectPath)
-}
+const main = async () => {
+  let projectPath = process.argv[2]
+  if (projectPath.startsWith('.')) {
+    projectPath = path.join(process.cwd(), projectPath)
+  }
+
+  const project: ProjectShape = JSON.parse(
+    fs.readFileSync(projectPath).toString()
+  )
 
-const project: ProjectShape = JSON.parse(
-  fs.readFileSync(projectPath).toString()
-)
+  const plugins = await loadPlugins(projectPath, project.plugins)
+  const customCommands = getCustomCommands(plugins)
+  const executor = new WebDriverExecutor({
+    customCommands,
+  })
 
-const plugins = loadPlugins(require, projectPath, project)
-const customCommands = getCustomCommands(plugins)
-const executor = new WebDriverExecutor({
-  customCommands,
-})
+  const playback = new Playback({
+    baseUrl: project.url,
+    getTestByName: (name: string) =>
+      project.tests.find((t) => t.name === name) as TestShape,
+    logger: console,
+    executor,
+    variables: new Variables(),
+  })
 
-const playback = new Playback({
-  baseUrl: project.url,
-  getTestByName: (name: string) =>
-    project.tests.find((t) => t.name === name) as TestShape,
-  logger: console,
-  executor,
-  variables: new Variables(),
-})
+  render(<PlaybackComponent project={project} playback={playback} />)
+}
 
-render(<PlaybackComponent project={project} playback={playback} />)
+main()

packages/side-runner/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seleniumhq/side-runner",
-  "version": "4.0.0-alpha.13",
+  "version": "4.0.0-alpha.14",
   "description": "Run Selenium IDE projects in cli",
   "repository": "https://github.com/SeleniumHQ/selenium-ide",
   "scripts": {
@@ -24,7 +24,7 @@
   "private": false,
   "dependencies": {
     "@seleniumhq/side-model": "^4.0.0-alpha.1",
-    "@seleniumhq/side-runtime": "^4.0.0-alpha.3",
+    "@seleniumhq/side-runtime": "^4.0.0-alpha.4",
     "commander": "^9.4.0",
     "glob": "^7.2.0",
     "jest": "^27.5.1",