Remove Review app “port detection” checks for Jest

Port detection has now been fixed in `jest-dev-server`: argos-ci/jest-puppeteer#518

config/jest/browser/close.mjs

@@ -1,13 +1,8 @@
 import { teardown } from 'jest-environment-puppeteer'
 
-import serverStop from '../server/stop.mjs'
-
 /**
  * Close browser
  */
-export default async function browserClose () {
-  await Promise.all([
-    serverStop(), // Stop web server
-    teardown() // Close browser
-  ])
+export default async function browserOpen () {
+  await teardown() // Close browser, stop server
 }

config/jest/browser/open.mjs

@@ -1,8 +1,6 @@
 import { setup } from 'jest-environment-puppeteer'
 import { downloadBrowser } from 'puppeteer/lib/esm/puppeteer/node/install.js'
 
-import serverStart from '../server/start.mjs'
-
 /**
  * Open browser
  *
@@ -20,6 +18,5 @@ export default async function browserOpen (jestConfig) {
   }
 
   await downloadBrowser() // Download browser
-  await serverStart() // Wait for web server
-  await setup(jestConfig) // Open browser
+  await setup(jestConfig) // Open browser, start server
 }

config/jest/server/start.mjs

@@ -1,42 +1,10 @@
-import { getServers, setup } from 'jest-dev-server'
-import waitOn from 'wait-on'
+import { setup } from 'jest-dev-server'
 
-import config from '../../index.js'
-
-import serverStop from './stop.mjs'
-
-const PORT = process.env.PORT || config.ports.test
+import config from '../../../jest-dev-server.config.js'
 
 /**
  * Start web server
  */
 export default async function serverStart () {
-  const servers = await getServers()
-
-  // Server start timeout
-  let timeout = 1000
-
-  // Server stopping?
-  if (servers.some(({ signalCode }) => signalCode === 'SIGTERM')) {
-    await serverStop() // Wait for server to stop
-    timeout = 0 // No need to wait for start
-  }
-
-  // Wait until ready check
-  const ready = ({ timeout = 30000 } = {}) => waitOn({
-    resources: [`tcp:${PORT}`],
-    timeout
-  })
-
-  // Wait until ready (or start up)
-  try {
-    await ready({ timeout })
-  } catch (error) {
-    await setup({
-      // Ensure PORT works (on Windows) + SIGINT/SIGTERM signal events
-      command: `cross-env-shell PORT=${PORT} node app/start.js`,
-      port: PORT
-    })
-    await ready()
-  }
+  await setup(config)
 }

jest-dev-server.config.js

@@ -0,0 +1,12 @@
+const { ports } = require('./config/index.js')
+
+/**
+ * @type {import('jest-dev-server').JestDevServerOptions}
+ */
+module.exports = {
+  command: 'npm start --workspace app',
+  port: process.env.PORT || ports.test,
+
+  // Skip when already running
+  usedPortAction: 'ignore'
+}

jest-puppeteer.config.js

@@ -1,3 +1,5 @@
+const devServerOptions = require('./jest-dev-server.config.js')
+
 module.exports = {
   browserContext: 'incognito',
   browserPerWorker: true,
@@ -9,6 +11,8 @@ module.exports = {
   exitOnPageError: false,
 
   /**
+   * Puppeteer launch options
+   *
    * @type {import('puppeteer').PuppeteerLaunchOptions}
    */
   launch: {
@@ -27,5 +31,10 @@ module.exports = {
       '--no-startup-window'
     ],
     waitForInitialPage: false
-  }
+  },
+
+  /**
+   * Development server options
+   */
+  server: devServerOptions
 }

package.json

@@ -45,7 +45,6 @@
     "@babel/core": "^7.20.12",
     "@babel/preset-env": "^7.20.2",
     "autoprefixer": "^9.8.8",
-    "cross-env": "^7.0.3",
     "cssnano": "^5.1.14",
     "cssnano-preset-default": "^5.2.13",
     "del": "^7.0.0",
@@ -108,8 +107,7 @@
     "standard": "^17.0.0",
     "stylelint": "^14.16.1",
     "stylelint-config-gds": "^0.2.0",
-    "stylelint-order": "^6.0.2",
-    "wait-on": "^7.0.1"
+    "stylelint-order": "^6.0.2"
   },
   "overrides": {
     "chokidar@^2": {