From 7845fbc8ba444813a611b841fd603390c20a7270 Mon Sep 17 00:00:00 2001 From: McKayla Washburn Date: Wed, 2 Apr 2025 23:23:06 +0000 Subject: [PATCH] chore: skip flakey e2e tests --- site/e2e/tests/externalAuth.spec.ts | 284 ++++++++++++++------------- site/e2e/tests/outdatedAgent.spec.ts | 2 +- 2 files changed, 145 insertions(+), 141 deletions(-) diff --git a/site/e2e/tests/externalAuth.spec.ts b/site/e2e/tests/externalAuth.spec.ts index be86c0757286b..ced2a7d89c95b 100644 --- a/site/e2e/tests/externalAuth.spec.ts +++ b/site/e2e/tests/externalAuth.spec.ts @@ -12,158 +12,162 @@ import { } from "../helpers"; import { beforeCoderTest, resetExternalAuthKey } from "../hooks"; -test.beforeAll(async ({ baseURL }) => { - const srv = await createServer(gitAuth.webPort); +test.describe.skip("externalAuth", () => { + test.beforeAll(async ({ baseURL }) => { + const srv = await createServer(gitAuth.webPort); - // The GitHub validate endpoint returns the currently authenticated user! - srv.use(gitAuth.validatePath, (req, res) => { - res.write(JSON.stringify(ghUser)); - res.end(); + // The GitHub validate endpoint returns the currently authenticated user! + srv.use(gitAuth.validatePath, (req, res) => { + res.write(JSON.stringify(ghUser)); + res.end(); + }); + srv.use(gitAuth.tokenPath, (req, res) => { + const r = (Math.random() + 1).toString(36).substring(7); + res.write(JSON.stringify({ access_token: r })); + res.end(); + }); + srv.use(gitAuth.authPath, (req, res) => { + res.redirect( + `${baseURL}/external-auth/${gitAuth.webProvider}/callback?code=1234&state=${req.query.state}`, + ); + }); }); - srv.use(gitAuth.tokenPath, (req, res) => { - const r = (Math.random() + 1).toString(36).substring(7); - res.write(JSON.stringify({ access_token: r })); - res.end(); - }); - srv.use(gitAuth.authPath, (req, res) => { - res.redirect( - `${baseURL}/external-auth/${gitAuth.webProvider}/callback?code=1234&state=${req.query.state}`, - ); + + test.beforeEach(async ({ context, page }) => { + beforeCoderTest(page); + await login(page); + await resetExternalAuthKey(context); }); -}); -test.beforeEach(async ({ context, page }) => { - beforeCoderTest(page); - await login(page); - await resetExternalAuthKey(context); -}); + // Ensures that a Git auth provider with the device flow functions and completes! + test("external auth device", async ({ page }) => { + const device: ExternalAuthDevice = { + device_code: "1234", + user_code: "1234-5678", + expires_in: 900, + interval: 1, + verification_uri: "", + }; -// Ensures that a Git auth provider with the device flow functions and completes! -test("external auth device", async ({ page }) => { - const device: ExternalAuthDevice = { - device_code: "1234", - user_code: "1234-5678", - expires_in: 900, - interval: 1, - verification_uri: "", - }; + // Start a server to mock the GitHub API. + const srv = await createServer(gitAuth.devicePort); + srv.use(gitAuth.validatePath, (req, res) => { + res.write(JSON.stringify(ghUser)); + res.end(); + }); + srv.use(gitAuth.codePath, (req, res) => { + res.write(JSON.stringify(device)); + res.end(); + }); + srv.use(gitAuth.installationsPath, (req, res) => { + res.write(JSON.stringify(ghInstall)); + res.end(); + }); - // Start a server to mock the GitHub API. - const srv = await createServer(gitAuth.devicePort); - srv.use(gitAuth.validatePath, (req, res) => { - res.write(JSON.stringify(ghUser)); - res.end(); - }); - srv.use(gitAuth.codePath, (req, res) => { - res.write(JSON.stringify(device)); - res.end(); - }); - srv.use(gitAuth.installationsPath, (req, res) => { - res.write(JSON.stringify(ghInstall)); - res.end(); - }); + const token = { + access_token: "", + error: "authorization_pending", + error_description: "", + }; + // First we send a result from the API that the token hasn't been + // authorized yet to ensure the UI reacts properly. + const sentPending = new Awaiter(); + srv.use(gitAuth.tokenPath, (req, res) => { + res.write(JSON.stringify(token)); + res.end(); + sentPending.done(); + }); - const token = { - access_token: "", - error: "authorization_pending", - error_description: "", - }; - // First we send a result from the API that the token hasn't been - // authorized yet to ensure the UI reacts properly. - const sentPending = new Awaiter(); - srv.use(gitAuth.tokenPath, (req, res) => { - res.write(JSON.stringify(token)); - res.end(); - sentPending.done(); + await page.goto(`/external-auth/${gitAuth.deviceProvider}`, { + waitUntil: "domcontentloaded", + }); + await page.getByText(device.user_code).isVisible(); + await sentPending.wait(); + // Update the token to be valid and ensure the UI updates! + token.error = ""; + token.access_token = "hello-world"; + await page.waitForSelector("text=1 organization authorized"); }); - await page.goto(`/external-auth/${gitAuth.deviceProvider}`, { - waitUntil: "domcontentloaded", + test("external auth web", async ({ page }) => { + await page.goto(`/external-auth/${gitAuth.webProvider}`, { + waitUntil: "domcontentloaded", + }); + // This endpoint doesn't have the installations URL set intentionally! + await page.waitForSelector("text=You've authenticated with GitHub!"); }); - await page.getByText(device.user_code).isVisible(); - await sentPending.wait(); - // Update the token to be valid and ensure the UI updates! - token.error = ""; - token.access_token = "hello-world"; - await page.waitForSelector("text=1 organization authorized"); -}); -test("external auth web", async ({ page }) => { - await page.goto(`/external-auth/${gitAuth.webProvider}`, { - waitUntil: "domcontentloaded", + test("successful external auth from workspace", async ({ page }) => { + const templateName = await createTemplate( + page, + echoResponsesWithExternalAuth([ + { id: gitAuth.webProvider, optional: false }, + ]), + ); + + await createWorkspace(page, templateName, { useExternalAuth: true }); }); - // This endpoint doesn't have the installations URL set intentionally! - await page.waitForSelector("text=You've authenticated with GitHub!"); -}); -test("successful external auth from workspace", async ({ page }) => { - const templateName = await createTemplate( - page, - echoResponsesWithExternalAuth([ - { id: gitAuth.webProvider, optional: false }, - ]), - ); + const ghUser: Endpoints["GET /user"]["response"]["data"] = { + login: "kylecarbs", + id: 7122116, + node_id: "MDQ6VXNlcjcxMjIxMTY=", + avatar_url: "https://avatars.githubusercontent.com/u/7122116?v=4", + gravatar_id: "", + url: "https://api.github.com/users/kylecarbs", + html_url: "https://github.com/kylecarbs", + followers_url: "https://api.github.com/users/kylecarbs/followers", + following_url: + "https://api.github.com/users/kylecarbs/following{/other_user}", + gists_url: "https://api.github.com/users/kylecarbs/gists{/gist_id}", + starred_url: + "https://api.github.com/users/kylecarbs/starred{/owner}{/repo}", + subscriptions_url: "https://api.github.com/users/kylecarbs/subscriptions", + organizations_url: "https://api.github.com/users/kylecarbs/orgs", + repos_url: "https://api.github.com/users/kylecarbs/repos", + events_url: "https://api.github.com/users/kylecarbs/events{/privacy}", + received_events_url: + "https://api.github.com/users/kylecarbs/received_events", + type: "User", + site_admin: false, + name: "Kyle Carberry", + company: "@coder", + blog: "https://carberry.com", + location: "Austin, TX", + email: "kyle@carberry.com", + hireable: null, + bio: "hey there", + twitter_username: "kylecarbs", + public_repos: 52, + public_gists: 9, + followers: 208, + following: 31, + created_at: "2014-04-01T02:24:41Z", + updated_at: "2023-06-26T13:03:09Z", + }; - await createWorkspace(page, templateName, { useExternalAuth: true }); + const ghInstall: Endpoints["GET /user/installations"]["response"]["data"] = { + installations: [ + { + id: 1, + access_tokens_url: "", + account: ghUser, + app_id: 1, + app_slug: "coder", + created_at: "2014-04-01T02:24:41Z", + events: [], + html_url: "", + permissions: {}, + repositories_url: "", + repository_selection: "all", + single_file_name: "", + suspended_at: null, + suspended_by: null, + target_id: 1, + target_type: "", + updated_at: "2023-06-26T13:03:09Z", + }, + ], + total_count: 1, + }; }); - -const ghUser: Endpoints["GET /user"]["response"]["data"] = { - login: "kylecarbs", - id: 7122116, - node_id: "MDQ6VXNlcjcxMjIxMTY=", - avatar_url: "https://avatars.githubusercontent.com/u/7122116?v=4", - gravatar_id: "", - url: "https://api.github.com/users/kylecarbs", - html_url: "https://github.com/kylecarbs", - followers_url: "https://api.github.com/users/kylecarbs/followers", - following_url: - "https://api.github.com/users/kylecarbs/following{/other_user}", - gists_url: "https://api.github.com/users/kylecarbs/gists{/gist_id}", - starred_url: "https://api.github.com/users/kylecarbs/starred{/owner}{/repo}", - subscriptions_url: "https://api.github.com/users/kylecarbs/subscriptions", - organizations_url: "https://api.github.com/users/kylecarbs/orgs", - repos_url: "https://api.github.com/users/kylecarbs/repos", - events_url: "https://api.github.com/users/kylecarbs/events{/privacy}", - received_events_url: "https://api.github.com/users/kylecarbs/received_events", - type: "User", - site_admin: false, - name: "Kyle Carberry", - company: "@coder", - blog: "https://carberry.com", - location: "Austin, TX", - email: "kyle@carberry.com", - hireable: null, - bio: "hey there", - twitter_username: "kylecarbs", - public_repos: 52, - public_gists: 9, - followers: 208, - following: 31, - created_at: "2014-04-01T02:24:41Z", - updated_at: "2023-06-26T13:03:09Z", -}; - -const ghInstall: Endpoints["GET /user/installations"]["response"]["data"] = { - installations: [ - { - id: 1, - access_tokens_url: "", - account: ghUser, - app_id: 1, - app_slug: "coder", - created_at: "2014-04-01T02:24:41Z", - events: [], - html_url: "", - permissions: {}, - repositories_url: "", - repository_selection: "all", - single_file_name: "", - suspended_at: null, - suspended_by: null, - target_id: 1, - target_type: "", - updated_at: "2023-06-26T13:03:09Z", - }, - ], - total_count: 1, -}; diff --git a/site/e2e/tests/outdatedAgent.spec.ts b/site/e2e/tests/outdatedAgent.spec.ts index 2a0bfea396eef..46696b36edeab 100644 --- a/site/e2e/tests/outdatedAgent.spec.ts +++ b/site/e2e/tests/outdatedAgent.spec.ts @@ -20,7 +20,7 @@ test.beforeEach(async ({ page }) => { await login(page); }); -test(`ssh with agent ${agentVersion}`, async ({ page }) => { +test.skip(`ssh with agent ${agentVersion}`, async ({ page }) => { test.setTimeout(60_000); const token = randomUUID();