chore: skip flakey e2e tests (#17235)

This commit is contained in:
ケイラ
2025-04-02 17:38:52 -06:00
committed by GitHub
parent ac7ea08873
commit 5979c3224d
2 changed files with 150 additions and 146 deletions
+149 -145
View File
@@ -12,158 +12,162 @@ import {
} from "../helpers"; } from "../helpers";
import { beforeCoderTest, resetExternalAuthKey } from "../hooks"; import { beforeCoderTest, resetExternalAuthKey } from "../hooks";
test.beforeAll(async ({ baseURL }) => { test.describe.skip("externalAuth", () => {
const srv = await createServer(gitAuth.webPort); test.beforeAll(async ({ baseURL }) => {
const srv = await createServer(gitAuth.webPort);
// The GitHub validate endpoint returns the currently authenticated user! // The GitHub validate endpoint returns the currently authenticated user!
srv.use(gitAuth.validatePath, (req, res) => { srv.use(gitAuth.validatePath, (req, res) => {
res.write(JSON.stringify(ghUser)); res.write(JSON.stringify(ghUser));
res.end(); 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); test.beforeEach(async ({ context, page }) => {
res.write(JSON.stringify({ access_token: r })); beforeCoderTest(page);
res.end(); await login(page);
await resetExternalAuthKey(context);
}); });
srv.use(gitAuth.authPath, (req, res) => {
res.redirect( // Ensures that a Git auth provider with the device flow functions and completes!
`${baseURL}/external-auth/${gitAuth.webProvider}/callback?code=1234&state=${req.query.state}`, 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();
});
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");
});
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!");
});
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 });
}); });
});
test.beforeEach(async ({ context, page }) => { const ghUser: Endpoints["GET /user"]["response"]["data"] = {
beforeCoderTest(page); login: "kylecarbs",
await login(page); id: 7122116,
await resetExternalAuthKey(context); node_id: "MDQ6VXNlcjcxMjIxMTY=",
}); avatar_url: "https://avatars.githubusercontent.com/u/7122116?v=4",
gravatar_id: "",
// Ensures that a Git auth provider with the device flow functions and completes! url: "https://api.github.com/users/kylecarbs",
test("external auth device", async ({ page }) => { html_url: "https://github.com/kylecarbs",
const device: ExternalAuthDevice = { followers_url: "https://api.github.com/users/kylecarbs/followers",
device_code: "1234", following_url:
user_code: "1234-5678", "https://api.github.com/users/kylecarbs/following{/other_user}",
expires_in: 900, gists_url: "https://api.github.com/users/kylecarbs/gists{/gist_id}",
interval: 1, starred_url:
verification_uri: "", "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",
}; };
// Start a server to mock the GitHub API. const ghInstall: Endpoints["GET /user/installations"]["response"]["data"] = {
const srv = await createServer(gitAuth.devicePort); installations: [
srv.use(gitAuth.validatePath, (req, res) => { {
res.write(JSON.stringify(ghUser)); id: 1,
res.end(); access_tokens_url: "",
}); account: ghUser,
srv.use(gitAuth.codePath, (req, res) => { app_id: 1,
res.write(JSON.stringify(device)); app_slug: "coder",
res.end(); created_at: "2014-04-01T02:24:41Z",
}); events: [],
srv.use(gitAuth.installationsPath, (req, res) => { html_url: "",
res.write(JSON.stringify(ghInstall)); permissions: {},
res.end(); repositories_url: "",
}); repository_selection: "all",
single_file_name: "",
const token = { suspended_at: null,
access_token: "", suspended_by: null,
error: "authorization_pending", target_id: 1,
error_description: "", target_type: "",
updated_at: "2023-06-26T13:03:09Z",
},
],
total_count: 1,
}; };
// 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");
}); });
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!");
});
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 });
});
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,
};
+1 -1
View File
@@ -20,7 +20,7 @@ test.beforeEach(async ({ page }) => {
await login(page); await login(page);
}); });
test(`ssh with agent ${agentVersion}`, async ({ page }) => { test.skip(`ssh with agent ${agentVersion}`, async ({ page }) => {
test.setTimeout(60_000); test.setTimeout(60_000);
const token = randomUUID(); const token = randomUUID();