From 84521b28f3658740aff4c78045dd55ba7a7fce87 Mon Sep 17 00:00:00 2001 From: 49lf Date: Wed, 14 Aug 2024 16:23:29 -0400 Subject: [PATCH] Lee: Tests are broken because auth skip needs to happen --- e2e/playwright/projects.spec.ts | 30 ------------------------------ e2e/playwright/test-utils.ts | 10 +--------- package.json | 2 +- yarn.lock | 25 ++++++++++++------------- 4 files changed, 14 insertions(+), 53 deletions(-) diff --git a/e2e/playwright/projects.spec.ts b/e2e/playwright/projects.spec.ts index 26246c5c2..d1b04101c 100644 --- a/e2e/playwright/projects.spec.ts +++ b/e2e/playwright/projects.spec.ts @@ -10,10 +10,6 @@ test( 'CRUD projects', { tag: '@electron' }, async ({ browserName }, testInfo) => { - test.skip( - browserName === 'webkit', - 'Skip on Safari because `window.tearDown` does not work' - ) const { electronApp, page } = await setupElectron({ testInfo, folderSetupFn: async (dir) => { @@ -36,7 +32,6 @@ test( ) }, }) - await page.goto('http://localhost:3000/') await page.setViewportSize({ width: 1200, height: 500 }) page.on('console', console.log) @@ -209,10 +204,6 @@ test( 'pressing "delete" on home screen should do nothing', { tag: '@electron' }, async ({ browserName }, testInfo) => { - test.skip( - browserName === 'webkit', - 'Skip on Safari because `window.tearDown` does not work' - ) const { electronApp, page } = await setupElectron({ testInfo, folderSetupFn: async (dir) => { @@ -223,7 +214,6 @@ test( ) }, }) - await page.goto('http://localhost:3000/') await page.setViewportSize({ width: 1200, height: 500 }) page.on('console', console.log) @@ -246,10 +236,6 @@ test.fixme( 'File in the file pane should open with a single click', { tag: '@electron' }, async ({ browserName }, testInfo) => { - test.skip( - browserName === 'webkit', - 'Skip on Safari because `window.tearDown` does not work' - ) const { electronApp, page } = await setupElectron({ testInfo, folderSetupFn: async (dir) => { @@ -265,7 +251,6 @@ test.fixme( }, }) const u = await getUtils(page) - await page.goto('http://localhost:3000/') await page.setViewportSize({ width: 1200, height: 500 }) page.on('console', console.log) @@ -302,10 +287,6 @@ test( 'Can sort projects on home page', { tag: '@electron' }, async ({ browserName }, testInfo) => { - test.skip( - browserName === 'webkit', - 'Skip on Safari because `window.tearDown` does not work' - ) const { electronApp, page } = await setupElectron({ testInfo, folderSetupFn: async (dir) => { @@ -332,7 +313,6 @@ test( ) }, }) - await page.goto('http://localhost:3000/') await page.setViewportSize({ width: 1200, height: 500 }) const getAllProjects = () => page.getByTestId('project-link').all() @@ -424,13 +404,8 @@ test( 'When the project folder is empty, user can create new project and open it.', { tag: '@electron' }, async ({ browserName }, testInfo) => { - test.skip( - browserName === 'webkit', - 'Skip on Safari because `window.tearDown` does not work' - ) const { electronApp, page } = await setupElectron({ testInfo }) const u = await getUtils(page) - await page.goto('http://localhost:3000/') await page.setViewportSize({ width: 1200, height: 500 }) page.on('console', console.log) @@ -513,10 +488,6 @@ test( 'Check you can go home with two different methods, and that switching between projects does not harm the stream', { tag: '@electron' }, async ({ browserName }, testInfo) => { - test.skip( - browserName === 'webkit', - 'Skip on Safari because `window.tearDown` does not work' - ) const { electronApp, page } = await setupElectron({ testInfo, folderSetupFn: async (dir) => { @@ -537,7 +508,6 @@ test( }, }) const u = await getUtils(page) - await page.goto('http://localhost:3000/') await page.setViewportSize({ width: 1200, height: 500 }) page.on('console', console.log) diff --git a/e2e/playwright/test-utils.ts b/e2e/playwright/test-utils.ts index 224727664..053f7e276 100644 --- a/e2e/playwright/test-utils.ts +++ b/e2e/playwright/test-utils.ts @@ -635,12 +635,6 @@ export async function setup( page: Page, overrideDirectory?: string ) { - // wait for Vite preview server to be up - await waitOn({ - resources: ['tcp:3000'], - timeout: 5000, - }) - await context.addInitScript( async ({ token, @@ -694,9 +688,7 @@ export async function setupElectron({ await fsp.mkdir(projectDirName) - const electronApp = await electron.launch({ - args: ['.'], - }) + const electronApp = await electron.launch({ args: ['.', '--no-sandbox'] }) const context = electronApp.context() const page = await electronApp.firstWindow() context.on('console', console.log) diff --git a/package.json b/package.json index fab3522a0..920938dd4 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ "@fortawesome/react-fontawesome": "^0.2.0", "@headlessui/react": "^1.7.19", "@headlessui/tailwindcss": "^0.2.0", - "@kittycad/lib": "^0.0.70", + "@kittycad/lib": "2", "@lezer/highlight": "^1.2.0", "@lezer/lr": "^1.4.1", "@react-hook/resize-observer": "^2.0.1", diff --git a/yarn.lock b/yarn.lock index 4684ad106..65a9c3180 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1971,12 +1971,11 @@ "@jridgewell/resolve-uri" "^3.1.0" "@jridgewell/sourcemap-codec" "^1.4.14" -"@kittycad/lib@^0.0.76": - version "0.0.76" - resolved "https://registry.yarnpkg.com/@kittycad/lib/-/lib-0.0.76.tgz#d544a50c54547139d6dfa15730354313a51d0e49" - integrity sha512-14zzP7JS7J8xiwKltJqiszOCF9LdQeJK2nN58Xjiep+LOEVWtiLSGuILTameU2ryjA3aeQzPtNc1WJZ2JYRg2A== +"@kittycad/lib@2": + version "2.0.0" + resolved "https://registry.yarnpkg.com/@kittycad/lib/-/lib-2.0.0.tgz#c7808f47546f5b85371899b0b82989a4049d258d" + integrity sha512-iJCifdt7C+gHCH7xomNhynUmhy4rvM+J3Skxm3vxJR+zMWludm1bSCd+LgUpgk6kZOvkHJ755Y0gfMDYz1IVxw== dependencies: - node-fetch "3.3.2" openapi-types "^12.0.0" ts-node "^10.9.1" tslib "~2.4" @@ -6677,7 +6676,14 @@ node-domexception@^1.0.0: resolved "https://registry.yarnpkg.com/node-domexception/-/node-domexception-1.0.0.tgz#6888db46a1f71c0b76b3f7555016b63fe64766e5" integrity sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ== -node-fetch@3.3.2, node-fetch@^3.3.2: +node-fetch@^2.6.1, node-fetch@^2.6.12, node-fetch@^2.6.7: + version "2.7.0" + resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.7.0.tgz#d0f0fa6e3e2dc1d27efcd8ad99d550bda94d187d" + integrity sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A== + dependencies: + whatwg-url "^5.0.0" + +node-fetch@^3.3.2: version "3.3.2" resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-3.3.2.tgz#d1e889bacdf733b4ff3b2b243eb7a12866a0b78b" integrity sha512-dRB78srN/l6gqWulah9SrxeYnxeddIG30+GOqK/9OlLVyLg3HPnr6SqOWTWOXKRwC2eGYCkZ59NNuSgvSrpgOA== @@ -6686,13 +6692,6 @@ node-fetch@3.3.2, node-fetch@^3.3.2: fetch-blob "^3.1.4" formdata-polyfill "^4.0.10" -node-fetch@^2.6.1, node-fetch@^2.6.12, node-fetch@^2.6.7: - version "2.7.0" - resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.7.0.tgz#d0f0fa6e3e2dc1d27efcd8ad99d550bda94d187d" - integrity sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A== - dependencies: - whatwg-url "^5.0.0" - node-gyp@^9.0.0: version "9.4.1" resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-9.4.1.tgz#8a1023e0d6766ecb52764cc3a734b36ff275e185"