Skip to content

Commit fe0cb58

Browse files
committed
Improve and fix selectors
1 parent 4ba56bb commit fe0cb58

File tree

2 files changed

+14
-14
lines changed

2 files changed

+14
-14
lines changed

site/e2e/helpers.ts

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ export const createWorkspace = async (
152152
const user = currentUser(page);
153153
await expectUrl(page).toHavePathName(`/@${user.username}/${name}`);
154154

155-
await page.waitForSelector("[data-testid='build-status'] >> text=Running", {
155+
await page.waitForSelector("text=Workspace status: Running", {
156156
state: "visible",
157157
});
158158
return name;
@@ -364,7 +364,7 @@ export const stopWorkspace = async (page: Page, workspaceName: string) => {
364364

365365
await page.getByTestId("workspace-stop-button").click();
366366

367-
await page.waitForSelector("*[data-testid='build-status'] >> text=Stopped", {
367+
await page.waitForSelector("text=Workspace status: Stopped", {
368368
state: "visible",
369369
});
370370
};
@@ -389,7 +389,7 @@ export const buildWorkspaceWithParameters = async (
389389
await page.getByTestId("confirm-button").click();
390390
}
391391

392-
await page.waitForSelector("*[data-testid='build-status'] >> text=Running", {
392+
await page.waitForSelector("text=Workspace status: Running", {
393393
state: "visible",
394394
});
395395
};
@@ -412,11 +412,12 @@ export const startAgent = async (
412412
export const downloadCoderVersion = async (
413413
version: string,
414414
): Promise<string> => {
415-
if (version.startsWith("v")) {
416-
version = version.slice(1);
415+
let versionNumber = version;
416+
if (versionNumber.startsWith("v")) {
417+
versionNumber = versionNumber.slice(1);
417418
}
418419

419-
const binaryName = `coder-e2e-${version}`;
420+
const binaryName = `coder-e2e-${versionNumber}`;
420421
const tempDir = "/tmp/coder-e2e-cache";
421422
// The install script adds `./bin` automatically to the path :shrug:
422423
const binaryPath = path.join(tempDir, "bin", binaryName);
@@ -438,7 +439,7 @@ export const downloadCoderVersion = async (
438439
path.join(__dirname, "../../install.sh"),
439440
[
440441
"--version",
441-
version,
442+
versionNumber,
442443
"--method",
443444
"standalone",
444445
"--prefix",
@@ -551,11 +552,8 @@ const emptyPlan = new TextEncoder().encode("{}");
551552
* converts it into an uploadable tar file.
552553
*/
553554
const createTemplateVersionTar = async (
554-
responses?: EchoProvisionerResponses,
555+
responses: EchoProvisionerResponses = {},
555556
): Promise<Buffer> => {
556-
if (!responses) {
557-
responses = {};
558-
}
559557
if (!responses.parse) {
560558
responses.parse = [
561559
{
@@ -1012,7 +1010,7 @@ export const updateWorkspace = async (
10121010
await fillParameters(page, richParameters, buildParameters);
10131011
await page.getByRole("button", { name: /update parameters/i }).click();
10141012

1015-
await page.waitForSelector("*[data-testid='build-status'] >> text=Running", {
1013+
await page.waitForSelector("text=Workspace status: Running", {
10161014
state: "visible",
10171015
});
10181016
};
@@ -1031,7 +1029,7 @@ export const updateWorkspaceParameters = async (
10311029
await fillParameters(page, richParameters, buildParameters);
10321030
await page.getByRole("button", { name: /submit and restart/i }).click();
10331031

1034-
await page.waitForSelector("*[data-testid='build-status'] >> text=Running", {
1032+
await page.waitForSelector("text=Workspace status: Running", {
10351033
state: "visible",
10361034
});
10371035
};

site/src/modules/workspaces/WorkspaceStatusIndicator/WorkspaceStatusIndicator.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,9 @@ export const WorkspaceStatusIndicator: FC<WorkspaceStatusIndicatorProps> = ({
4040
return (
4141
<StatusIndicator variant={variantByStatusType[type]}>
4242
<StatusIndicatorDot />
43-
{text}
43+
<span>
44+
<span className="sr-only">Workspace status:</span> {text}
45+
</span>
4446
{children}
4547
</StatusIndicator>
4648
);

0 commit comments

Comments
 (0)