From 1f5f41b53440fcac6f17b487918e12a0841ea2ca Mon Sep 17 00:00:00 2001
From: Chris Smith <1979423+chris13524@users.noreply.github.com>
Date: Wed, 6 Mar 2024 13:18:41 -0800
Subject: [PATCH] fix: various Playwright improvements (#2031)

---
 .../{ci_canary.yml => publish_canary.yml}          |  2 +-
 Dockerfile.canary                                  | 14 +++-----------
 apps/laboratory/package.json                       | 10 +++++-----
 3 files changed, 9 insertions(+), 17 deletions(-)
 rename .github/workflows/{ci_canary.yml => publish_canary.yml} (98%)

diff --git a/.github/workflows/ci_canary.yml b/.github/workflows/publish_canary.yml
similarity index 98%
rename from .github/workflows/ci_canary.yml
rename to .github/workflows/publish_canary.yml
index e56c6ff91d..da60c1c7e8 100644
--- a/.github/workflows/ci_canary.yml
+++ b/.github/workflows/publish_canary.yml
@@ -1,4 +1,4 @@
-name: ci_canary
+name: Publish Canary Image
 on:
   workflow_dispatch:
   push:
diff --git a/Dockerfile.canary b/Dockerfile.canary
index 3e3a2220ac..e5e4479f89 100644
--- a/Dockerfile.canary
+++ b/Dockerfile.canary
@@ -1,20 +1,12 @@
-FROM node:20-bookworm as base
+FROM node:20-bookworm
 
-
-WORKDIR /
-
-# RUN apk --update --no-cache \
-#     add g++ make python3
-
-FROM base as build
-
-WORKDIR /
+WORKDIR /src
 
 COPY ../ ./
 RUN npm ci
 RUN npm run build
 
-WORKDIR /apps/laboratory/
+WORKDIR ./apps/laboratory/
 
 RUN npm run playwright:install
 
diff --git a/apps/laboratory/package.json b/apps/laboratory/package.json
index e76854227a..d0c734d52a 100644
--- a/apps/laboratory/package.json
+++ b/apps/laboratory/package.json
@@ -7,11 +7,11 @@
     "build:laboratory": "next build",
     "lint": "eslint . --ext .js,.jsx,.ts,.tsx",
     "playwright:start": "npm run dev:laboratory",
-    "playwright:install": "npx playwright install --with-deps",
-    "playwright:test": "npx playwright test",
-    "playwright:test:wallet": "npx playwright test --grep 'connect-qr.spec.ts|wallet.spec.ts'",
-    "playwright:test:siwe": "npx playwright test --grep siwe.spec.ts",
-    "playwright:test:canary": "npx playwright test --retries=0 --grep canary.spec.ts --project='Desktop Chrome/wagmi'",
+    "playwright:install": "playwright install --with-deps",
+    "playwright:test": "playwright test",
+    "playwright:test:wallet": "playwright test --grep 'connect-qr.spec.ts|wallet.spec.ts'",
+    "playwright:test:siwe": "playwright test --grep siwe.spec.ts",
+    "playwright:test:canary": "playwright test --retries=0 --grep canary.spec.ts --project='Desktop Chrome/wagmi'",
     "playwright:debug": "npm run playwright:test -- --debug",
     "playwright:debug:wallet": "npm run playwright:test:wallet -- --debug",
     "playwright:debug:siwe": "npm run playwright:test:siwe -- --debug",