From 0d1d13ec6dc1bad344844c3759b016129ec9647a Mon Sep 17 00:00:00 2001 From: Core <64542347+coredev-uk@users.noreply.github.com> Date: Tue, 1 Feb 2022 12:08:52 +0000 Subject: [PATCH] swapped to playwrights image --- .circleci/config.yml | 4 +++- src/__tests__/base.test.ts | 5 +++-- tsconfig.json | 4 ++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a8c75a6b..f7469b28 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3,7 +3,9 @@ jobs: build: working_directory: ~/Cider docker: - - image: circleci/node:16 + - image: mcr.microsoft.com/playwright:focal + environment: + NODE_ENV: development steps: - checkout - run: diff --git a/src/__tests__/base.test.ts b/src/__tests__/base.test.ts index 2d0d7027..848f3be1 100644 --- a/src/__tests__/base.test.ts +++ b/src/__tests__/base.test.ts @@ -6,7 +6,8 @@ import * as fs from "fs"; test("Launch electron app", async () => { const paths = { - "main": join(__dirname, "../../build/main"), + "mainBuild": join(__dirname, "../../build/"), + "main": join(__dirname, "../main"), "root": join(__dirname, "../../"), } @@ -14,7 +15,7 @@ test("Launch electron app", async () => { console.log(fs.readdirSync(paths.main)) - const electronApp = await electron.launch({ args: [paths.main], cwd: paths.root }); + const electronApp = await electron.launch({ args: [paths.mainBuild] }); const appPath = await electronApp.evaluate(async ({ app }) => { // This runs in the main Electron process, parameter here is always diff --git a/tsconfig.json b/tsconfig.json index ab9a3a6c..ce990f01 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -18,6 +18,6 @@ ] }, "include": [ - "src/**/*" + "src/main/*" ] -} \ No newline at end of file +}