500+ tests zomg

Author: toddtarsi

.github/workflows/release-ide.yml renamed to .github/workflows/release-ide-binaries.yml

@@ -41,7 +41,7 @@ jobs:
         run: pnpm -r i
         env:
           NODE_ENV: "production"
-      - name: Publish non IDE packages to npm
-        run: pnpm -r publish --no-git-checks --filter=!packages/selenium-ide --access public
+      - name: Publish packages to npm
+        run: pnpm -r publish --no-git-checks --access public
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

.github/workflows/release-npm.yml

@@ -33,5 +33,7 @@ jobs:
         run: pnpm -r i
       - name: Build side-runner and selenium-ide
         run: pnpm run build
-      - name: Test the side-runner
+      - name: Run the tests
+        run: npm run test:setup
+      - name: Run the project examples as tests
         run: npm run test:side-runner:ci

.github/workflows/test.yml

@@ -4,6 +4,7 @@ module.exports = {
       tsConfig: 'tsconfig.base.json',
     },
   },
+  projects: ['<rootDir>/packages/*/jest.config.js'],
   testEnvironment: 'jsdom',
   testEnvironmentOptions: {
     url: 'http://localhost/index.html',
@@ -12,7 +13,7 @@ module.exports = {
     '^.+\\.(css|scss)$': 'identity-obj-proxy',
   },
   setupFilesAfterEnv: ['./scripts/jest/test.config.js'],
-  testMatch: ['**/packages/**/__test?(s)__/**/*.spec.[jt]s?(x)'],
+  testMatch: ['**/__test?(s)__/**/*.spec.[jt]s?(x)'],
   testPathIgnorePatterns: ['/node_modules/'],
   transform: {
     '^.+\\.jsx?$': 'babel-jest',

jest.config.js

@@ -4,26 +4,28 @@
   "license": "Apache-2.0",
   "private": true,
   "scripts": {
-    "start:test-site": "http-server -p 8080 ./tests/static",
+    "start:test-site": "http-server -p 8080 ./packages/side-testkit/fixtures/static",
     "build": "run-s build:ts build:ide",
-    "build:electron": "pnpm run --stream --filter @seleniumhq/selenium-ide build:electron",
-    "build:ide": "pnpm run --stream --filter @seleniumhq/selenium-ide build:webpack",
+    "build:electron": "pnpm run --stream --filter selenium-ide build:electron",
+    "build:ide": "pnpm run --stream --filter selenium-ide build:webpack",
     "build:js": "pnpm run --stream --filter @seleniumhq/code-export-* build",
     "build:ts": "tsc --build --verbose",
     "clean:deps": "rimraf packages/*/node_modules node_modules",
     "clean": "rimraf packages/*/build packages/*/dist packages/*/node_modules packages/*/tsconfig.tsbuildinfo node_modules",
     "clean:nuke": "git clean -fdx",
+    "pretest": "cd packages/webdriver-testkit && npm run download-drivers",
     "start": "cd packages/selenium-ide && npm start",
-    "test": "jest",
-    "test:e2e": "jest --testMatch \"**/packages/**/__tests__/**/*.e2e.js\"",
+    "test:jest:core": "jest",
+    "test": "npm run test:jest && npm run test:side-runner:ci",
+    "test:jest": "npm-run-bg -s 'http-server -p 8080 ./packages/side-testkit/fixtures/static::Available on::8080' 'npm run test:jest:core'",
     "lint": "pnpm run 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:ide": "npm-run-bg -s 'http-server -p 8080 ./tests/static::Available on::8080' 'node ./packages/selenium-ide/scripts/ide-runner.js -t 15000 ./tests/examples/*.side'",
-    "test:side-runner": "npm-run-bg -s 'http-server -p 8080 ./tests/static::Available on::8080' 'node ./packages/side-runner/dist/bin.js -t 15000 ./tests/examples/*.side'",
-    "test:side-runner:ci": "npm-run-bg -s 'http-server -p 8080 ./tests/static::Available on::8080' 'node ./packages/side-runner/dist/bin.js -c \"goog:chromeOptions.args=[headless,no-sandbox] browserName=chrome\" -t 15000 ./tests/examples/*.side'",
+    "test:ide": "npm-run-bg -s 'http-server -p 8080 ./packages/side-testkit/fixtures/static::Available on::8080' 'node ./packages/selenium-ide/scripts/ide-runner.js -t 15000 ./tests/examples/*.side'",
+    "test:side-runner": "npm-run-bg -s 'http-server -p 8080 ./packages/side-testkit/fixtures/static::Available on::8080' 'node ./packages/side-runner/dist/bin.js -t 15000 ./tests/examples/*.side'",
+    "test:side-runner:ci": "npm-run-bg -s 'http-server -p 8080 ./packages/side-testkit/fixtures/static::Available on::8080' 'node ./packages/side-runner/dist/bin.js -c \"goog:chromeOptions.args=[headless,no-sandbox] browserName=chrome\" -t 15000 ./tests/examples/*.side'",
     "typecheck": "tsc --noEmit --composite false",
     "watch": "run-p watch:ts watch:webpack",
-    "watch:webpack": "pnpm run --stream --filter @seleniumhq/selenium-ide watch",
+    "watch:webpack": "pnpm run --stream --filter selenium-ide watch",
     "watch:js": "pnpm run --stream --filter @seleniumhq/code-export-* --loglevel verbose watch",
     "watch:ts": "tsc --build --verbose --watch"
   },

package.json

@@ -1,16 +1,10 @@
 module.exports = {
-  testEnvironment: 'jsdom',
   testEnvironmentOptions: {
     url: 'http://localhost/index.html',
   },
-  moduleNameMapper: {
-    '^.+\\.(css|scss)$': 'identity-obj-proxy',
-  },
-  setupFilesAfterEnv: ['./scripts/jest/test.config.js'],
   testMatch: ['**/packages/**/__test?(s)__/**/*.spec.[jt]s?(x)'],
-  testPathIgnorePatterns: ['/node_modules/'],
+  testPathIgnorePatterns: ['/node_modules/', '/dist/'],
   transform: {
-    '^.+\\.jsx?$': 'babel-jest',
-    '^.+\\.tsx?$': 'ts-jest',
+    '^.+\\.ts?$': 'ts-jest',
   },
 }

packages/browser-info/jest.config.js

@@ -16,15 +16,17 @@
 // under the License.
 
 jest.mock('os')
-jest.mock('../src/sh')
+jest.mock('../sh')
 import * as os from 'os'
-import { Chrome } from '../src/chrome'
-import { sh, makeError } from '../src/sh'
+import { Chrome } from '../chrome'
+import { sh, makeError } from '../sh'
 
 const { getBrowserInfo, ChromeChannel } = Chrome
 const mockSh = sh as unknown as jest.Mock<any, any>
 const mockPlatform = os.platform as unknown as jest.Mock<any, any>
 
+type Success = Chrome.BrowserInfo | Chrome.BrowserInfo[]
+
 describe('chrome browser info', () => {
   describe('macOS', () => {
     beforeAll(() => {
@@ -39,10 +41,10 @@ describe('chrome browser info', () => {
       mockSh.mockReturnValueOnce(
         Promise.resolve({ stdout: 'Google Chrome 76.0.3809.132\n', stderr: '' })
       )
-      expect(await getBrowserInfo(ChromeChannel.stable)).toEqual({
+      expect(await getBrowserInfo(ChromeChannel.stable)).toEqual<Success>({
         binary: '/Applications/Google Chrome.app/Contents/MacOS/Google Chrome',
         version: '76.0.3809.132',
-        channel: 'stable',
+        channel: ChromeChannel.stable,
       })
     })
     it('should fail to get chrome info when its not installed', async () => {
@@ -51,7 +53,9 @@ describe('chrome browser info', () => {
       try {
         await getBrowserInfo(ChromeChannel.stable)
       } catch (err) {
-        expect(err.message).toBe('Unable to find Chrome installation')
+        expect((err as Error).message).toBe(
+          'Unable to find Chrome installation'
+        )
       }
     })
     it('should get all chrome info', async () => {
@@ -73,24 +77,24 @@ describe('chrome browser info', () => {
           })
         }
       })
-      expect(await getBrowserInfo()).toEqual([
+      expect(await getBrowserInfo()).toEqual<Success>([
         {
           binary:
             '/Applications/Google Chrome.app/Contents/MacOS/Google Chrome',
           version: '76.0.3809.132',
-          channel: 'stable',
+          channel: ChromeChannel.stable,
         },
         {
           binary:
             '/Applications/Google Chrome Beta.app/Contents/MacOS/Google Chrome',
           version: '75.0.3770.75',
-          channel: 'beta',
+          channel: ChromeChannel.beta,
         },
         {
           binary:
             '/Applications/Google Chrome Canary.app/Contents/MacOS/Google Chrome Canary',
           version: '79.0.3915.0',
-          channel: 'canary',
+          channel: ChromeChannel.canary,
         },
       ])
       mockSh.mockReset()
@@ -111,18 +115,18 @@ describe('chrome browser info', () => {
           })
         }
       })
-      expect(await getBrowserInfo()).toEqual([
+      expect(await getBrowserInfo()).toEqual<Success>([
         {
           binary:
             '/Applications/Google Chrome.app/Contents/MacOS/Google Chrome',
           version: '76.0.3809.132',
-          channel: 'stable',
+          channel: ChromeChannel.stable,
         },
         {
           binary:
             '/Applications/Google Chrome Canary.app/Contents/MacOS/Google Chrome Canary',
           version: '79.0.3915.0',
-          channel: 'canary',
+          channel: ChromeChannel.canary,
         },
       ])
       mockSh.mockReset()
@@ -153,15 +157,17 @@ describe('chrome browser info', () => {
       try {
         await getBrowserInfo(ChromeChannel.stable)
       } catch (err) {
-        expect(err.message).toBe('Unable to find Chrome installation')
+        expect((err as Error).message).toBe(
+          'Unable to find Chrome installation'
+        )
       }
     })
     it('should fail to get canary chrome channel since it is not available on linux', async () => {
       expect.assertions(1)
       try {
         await getBrowserInfo(ChromeChannel.canary)
       } catch (err) {
-        expect(err.message).toBe('Unsupported channel canary')
+        expect((err as Error).message).toBe('Unsupported channel canary')
       }
     })
     it('should get all chrome info', async () => {
@@ -203,11 +209,11 @@ describe('chrome browser info', () => {
           })
         }
       })
-      expect(await getBrowserInfo()).toEqual([
+      expect(await getBrowserInfo()).toEqual<Success>([
         {
           binary: '/usr/local/sbin/google-chrome',
           version: '76.0.3809.132',
-          channel: 'stable',
+          channel: ChromeChannel.stable,
         },
       ])
       mockSh.mockReset()

packages/browser-info/__tests__/chrome.spec.ts renamed to packages/browser-info/src/__tests__/chrome.spec.ts

@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-import * as index from '../src'
+import * as index from '../index'
 
 describe('browser-info', () => {
   it('should export all the required things', () => {

packages/browser-info/__tests__/index.spec.ts renamed to packages/browser-info/src/__tests__/index.spec.ts

@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-import { sh } from '../src/sh'
+import { ShellError, sh } from '../sh'
 
 describe('sh', () => {
   it('should run a process', async () => {
@@ -42,17 +42,19 @@ describe('sh', () => {
         'console.log(`out`);console.error(`err`);process.exit(1);',
       ])
     } catch (err) {
-      expect(err.stdout).toBe('out\n')
-      expect(err.stderr).toBe('err\n')
-      expect(err.code).toBe(1)
+      const error = err as ShellError
+      expect(error.stdout).toBe('out\n')
+      expect(error.stderr).toBe('err\n')
+      expect(error.code).toBe(1)
     }
   })
   it('should fail to start a process that does not exist', async () => {
     expect.assertions(1)
     try {
       await sh('command-that-does-not-exist')
     } catch (err) {
-      expect(err.code).toBe(1)
+      const error = err as ShellError
+      expect(error.code).toBe(1)
     }
   })
 })

packages/browser-info/__tests__/sh.spec.ts renamed to packages/browser-info/src/__tests__/sh.spec.ts

@@ -135,15 +135,15 @@ export namespace Chrome {
     }
   }
 
-  export interface BrowserInfo {
-    channel: ChromeChannel
-    binary: string
-    version: string
-  }
-
   export enum ChromeChannel {
     stable = 'stable',
     beta = 'beta',
     canary = 'canary',
   }
+
+  export interface BrowserInfo {
+    channel: ChromeChannel
+    binary: string
+    version: string
+  }
 }

packages/browser-info/src/chrome.ts

@@ -23,7 +23,7 @@ export async function sh(
   args: string[] = [],
   options?: object
 ): Promise<Output> {
-  let resolve: (value: Output) => void, reject: (reason: Error & Output) => void
+  let resolve: (value: Output) => void, reject: (reason: ShellError) => void
   const p = new Promise<Output>((res, rej) => {
     resolve = res
     reject = rej
@@ -64,19 +64,21 @@ export function makeError(
   stdout: string,
   stderr: string
 ) {
-  const err = new Error(message) as Error & Output & ErrorWithExitCode
+  const err = new Error(message) as ShellError
   err.stdout = stdout
   err.stderr = stderr
   err.code = code
 
   return err
 }
 
-interface Output {
+export interface Output {
   stdout: string
   stderr: string
 }
 
-interface ErrorWithExitCode {
+export interface ErrorWithExitCode {
   code: number
 }
+
+export interface ShellError extends Error, Output, ErrorWithExitCode {}

packages/browser-info/src/sh.ts

@@ -8,7 +8,6 @@
   },
    "include": ["src/**/*.ts"],
    "exclude": [
-     "**/__mocks__",
-     "**/__tests__"
+     "**/__mocks__"
    ]
 }

packages/browser-info/tsconfig.json

@@ -0,0 +1,10 @@
+module.exports = {
+  testEnvironmentOptions: {
+    url: 'http://localhost/index.html',
+  },
+  testMatch: ['**/packages/**/__test?(s)__/**/*.spec.[jt]s?(x)'],
+  testPathIgnorePatterns: ['/node_modules/', '/dist/'],
+  transform: {
+    '^.+\\.ts?$': 'ts-jest',
+  },
+}