Decompose watch.sh

novnc/ensure-novnc-container-up.sh

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+if docker container ls --format '{{.Names}}' | grep -q "pixel-novnc-1"; then
+  echo "The pixel-novnc-1 container is already running."
+else
+  docker compose up --no-deps --detach novnc
+fi

novnc/open-watch-url.sh

@@ -0,0 +1,10 @@
+#!/bin/sh
+
+URL="http://localhost:8088/vnc_lite.html?autoconnect=true"
+
+open "$URL" 2>/dev/null || {
+    printf "\n\033[0;32mThe 'open' command is not available\033[0m\n"
+    printf "\n\033[0;33mOpen the following URL in your web browser to watch BackstopJS do screen captures inside its docker container:\033[0m\n"
+    printf "\n\033[1;33m%s\033[0m\n\n" "$URL"
+    sleep 5
+}

pixel.js

@@ -165,6 +165,10 @@ async function processCommand( type, opts, runSilently = false ) {
 		const { stdout: stdout2 } = await simpleSpawn.exec( './reset-db.sh' );
 		console.log( stdout2 );
 
+		if (process.env.WATCH_MODE === '1') {
+			await simpleSpawn.spawn( './novnc/open-watch-url.sh' );
+		}
+
 		if ( opts.a11y ) {
 			return await runA11yRegressionTests( type, configFile, opts.logResults, opts );
 		} else {
@@ -226,9 +230,6 @@ function updateContext( group, type, activeBranch, description ) {
 async function prepareDockerEnvironment( opts ) {
 	await simpleSpawn.spawn( './build-base-regression-image.sh' );
 	await simpleSpawn.spawn( './start.sh' );
-	if (process.env.WATCH_MODE === '1') {
-		await simpleSpawn.spawn( './watch.sh' );
-	}
 	await simpleSpawn.spawn(
 		'docker',
 		[ 'compose', ...getComposeOpts( [ 'exec', ...( process.env.NONINTERACTIVE ? [ '-T' ] : [] ), 'mediawiki', '/src/main.js', JSON.stringify( opts ) ] ) ]

start.sh

@@ -1,4 +1,9 @@
 #!/bin/bash
 
 # Start docker containers
-docker compose --progress=plain --project-directory . -f ./docker-compose.yml up -d
+docker compose --progress=plain --project-directory . -f ./docker-compose.yml up -d
+
+# Start novnc container if needed
+if [ "${WATCH_MODE}" = "1" ]; then
+  ./novnc/ensure-novnc-container-up.sh
+fi