Skip to content

Commit

Permalink
Merge branch 'main' of github.com:evergreen-ci/ui into dependabot/npm…
Browse files Browse the repository at this point in the history 
…_and_yarn/leafygreen-ui/segmented-control-8.2.11
  • Loading branch information
@SupaJoon
SupaJoon committed Apr 12, 2024
2 parents a3d6eec + 5eaae4d commit dd01cb4
Show file tree
Hide file tree
Showing 16 changed files with 142 additions and 157 deletions.
2 changes: 1 addition & 1 deletion apps/parsley/cypress/integration/project_filters.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,6 @@ describe("project filters", () => {
cy.visit(`${resmokeLogLink}?filters=100D%255Cd`);
cy.contains("View project filters").click();
cy.dataCy("project-filters-modal").should("be.visible");
cy.getInputByLabel("D\\d").should("be.disabled");
cy.getInputByLabel("D\\d").should("have.attr", "aria-disabled", "true");
});
});
2 changes: 1 addition & 1 deletion apps/parsley/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"@leafygreen-ui/badge": "8.0.2",
"@leafygreen-ui/button": "21.0.6",
"@leafygreen-ui/card": "10.0.5",
"@leafygreen-ui/checkbox": "12.0.20",
"@leafygreen-ui/checkbox": "13.0.0",
"@leafygreen-ui/confirmation-modal": "5.0.8",
"@leafygreen-ui/copyable": "8.0.6",
"@leafygreen-ui/emotion": "4.0.7",
Expand Down
2 changes: 1 addition & 1 deletion apps/parsley/src/components/ProjectFiltersModal/ProjectFiltersModal.test.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ describe("projectFiltersModal", () => {
});
const checkbox = screen.getAllByRole("checkbox")[0];
expect(checkbox).toBeChecked();
expect(checkbox).toBeDisabled();
expect(checkbox).toHaveAttribute("aria-disabled", "true");
});

it("disables submit button when no filters have been selected", async () => {
Expand Down
8 changes: 6 additions & 2 deletions apps/spruce/cypress/integration/projectSettings/not_defaulting_to_repo.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,12 @@ describe("Project Settings when not defaulting to repo", () => {
cy.dataCy("var-value-input").should("have.value", "{REDACTED}");
cy.dataCy("var-name-input").should("be.disabled");
cy.dataCy("var-value-input").should("be.disabled");
cy.dataCy("var-private-input").should("be.disabled");
cy.dataCy("var-admin-input").should("be.disabled");
cy.dataCy("var-private-input").should(
"have.attr",
"aria-disabled",
"true",
);
cy.dataCy("var-admin-input").should("have.attr", "aria-disabled", "true");
});

it("Typing a duplicate variable name will disable saving and show an error message", () => {
Expand Down
6 changes: 5 additions & 1 deletion apps/spruce/cypress/integration/version/unscheduled_patch/configure_patch.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -497,7 +497,11 @@ describe("Configure Patch Page", () => {

it("Should show one disabled task", () => {
cy.dataCy("alias-task-checkbox").should("have.length", 1);
cy.dataCy("alias-task-checkbox").should("have.attr", "disabled");
cy.dataCy("alias-task-checkbox").should(
"have.attr",
"aria-disabled",
"true",
);
cy.dataCy("alias-task-checkbox").should("not.be.checked");
});

Expand Down
2 changes: 1 addition & 1 deletion apps/spruce/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
"@leafygreen-ui/button": "21.0.6",
"@leafygreen-ui/callout": "9.0.18",
"@leafygreen-ui/card": "10.0.5",
"@leafygreen-ui/checkbox": "12.0.5",
"@leafygreen-ui/checkbox": "13.0.0",
"@leafygreen-ui/code": "14.2.18",
"@leafygreen-ui/combobox": "8.1.1",
"@leafygreen-ui/confirmation-modal": "5.0.9",
Expand Down
6 changes: 3 additions & 3 deletions apps/spruce/src/components/PageSizeSelector/__snapshots__/PageSizeSelector.stories.storyshot
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@ exports[`Snapshot Tests PageSizeSelector.stories Default 1`] = `
class="leafygreen-ui-1iyoj2o css-5krlfz-StyledSelect ekttol50"
>
<button
aria-controls="select-1-menu"
aria-describedby="select-1-description"
aria-controls="select-184-menu"
aria-describedby="select-184-description"
aria-disabled="false"
aria-expanded="false"
aria-invalid="false"
aria-labelledby="page-size-select"
class="lg-ui-button-0000 leafygreen-ui-1rmc7qb"
data-testid="leafygreen-ui-select-menubutton"
id="select-2"
id="select-185"
type="button"
value="10"
>
Expand Down
70 changes: 35 additions & 35 deletions apps/spruce/src/components/SpruceForm/__snapshots__/SpruceForm.stories.storyshot
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,22 +38,22 @@ exports[`Snapshot Tests SpruceForm.stories Example1 1`] = `
>
<label
class="leafygreen-ui-nf64md"
for="select-4"
id="select-3-label"
for="select-191"
id="select-190-label"
>
Project Cloning Method
</label>
</div>
<button
aria-controls="select-3-menu"
aria-describedby="select-3-description"
aria-controls="select-190-menu"
aria-describedby="select-190-description"
aria-disabled="false"
aria-expanded="false"
aria-invalid="false"
aria-labelledby="select-3-label"
aria-labelledby="select-190-label"
class="lg-ui-button-0000 leafygreen-ui-1bkgt4w"
data-testid="leafygreen-ui-select-menubutton"
id="select-4"
id="select-191"
type="button"
value="legacy-ssh"
>
Expand Down Expand Up @@ -284,13 +284,13 @@ exports[`Snapshot Tests SpruceForm.stories Example1 1`] = `
>
<label
class="leafygreen-ui-1fi5x3a"
for="textarea-2"
for="textarea-192"
>
Valid Projects
</label>
<textarea
class="leafygreen-ui-18em0fn"
id="textarea-2"
id="textarea-192"
rows="5"
title="Valid Projects"
/>
Expand Down Expand Up @@ -340,16 +340,16 @@ exports[`Snapshot Tests SpruceForm.stories Example2 1`] = `
>
<label
class="leafygreen-ui-75mjfl"
for="checkbox-1"
id="checkbox-1-label"
for="checkbox-193"
id="checkbox-193-label"
>
<input
aria-checked="false"
aria-disabled="false"
aria-label="checkbox"
aria-labelledby="checkbox-1-label"
aria-labelledby="checkbox-193-label"
class="lg-ui-input-0000 leafygreen-ui-1a1e5kp"
id="checkbox-1"
id="checkbox-193"
type="checkbox"
/>
<div
Expand Down Expand Up @@ -377,7 +377,7 @@ exports[`Snapshot Tests SpruceForm.stories Example2 1`] = `
class="lg-ui-ripple-0000 leafygreen-ui-6vh13p"
/>
<span
class="leafygreen-ui-1wmrjan"
class="leafygreen-ui-187di61"
>
Mark distro as a cluster (jobs are not run on this host, used for special purposes).
</span>
Expand All @@ -397,16 +397,16 @@ exports[`Snapshot Tests SpruceForm.stories Example2 1`] = `
>
<label
class="leafygreen-ui-75mjfl"
for="checkbox-2"
id="checkbox-2-label"
for="checkbox-194"
id="checkbox-194-label"
>
<input
aria-checked="false"
aria-disabled="false"
aria-label="checkbox"
aria-labelledby="checkbox-2-label"
aria-labelledby="checkbox-194-label"
class="lg-ui-input-0000 leafygreen-ui-1a1e5kp"
id="checkbox-2"
id="checkbox-194"
type="checkbox"
/>
<div
Expand Down Expand Up @@ -434,7 +434,7 @@ exports[`Snapshot Tests SpruceForm.stories Example2 1`] = `
class="lg-ui-ripple-0000 leafygreen-ui-6vh13p"
/>
<span
class="leafygreen-ui-1wmrjan"
class="leafygreen-ui-187di61"
>
Disable shallow clone for this distro.
</span>
Expand All @@ -454,16 +454,16 @@ exports[`Snapshot Tests SpruceForm.stories Example2 1`] = `
>
<label
class="leafygreen-ui-75mjfl"
for="checkbox-3"
id="checkbox-3-label"
for="checkbox-195"
id="checkbox-195-label"
>
<input
aria-checked="false"
aria-disabled="false"
aria-label="checkbox"
aria-labelledby="checkbox-3-label"
aria-labelledby="checkbox-195-label"
class="lg-ui-input-0000 leafygreen-ui-1a1e5kp"
id="checkbox-3"
id="checkbox-195"
type="checkbox"
/>
<div
Expand Down Expand Up @@ -491,7 +491,7 @@ exports[`Snapshot Tests SpruceForm.stories Example2 1`] = `
class="lg-ui-ripple-0000 leafygreen-ui-6vh13p"
/>
<span
class="leafygreen-ui-1wmrjan"
class="leafygreen-ui-187di61"
>
Disable queueing this distro. Tasks already in the task queue will be removed.
</span>
Expand All @@ -511,17 +511,17 @@ exports[`Snapshot Tests SpruceForm.stories Example2 1`] = `
>
<label
class="leafygreen-ui-75mjfl"
for="checkbox-4"
id="checkbox-4-label"
for="checkbox-196"
id="checkbox-196-label"
>
<input
aria-checked="true"
aria-disabled="false"
aria-label="checkbox"
aria-labelledby="checkbox-4-label"
aria-labelledby="checkbox-196-label"
checked=""
class="lg-ui-input-0000 leafygreen-ui-1a1e5kp"
id="checkbox-4"
id="checkbox-196"
type="checkbox"
/>
<div
Expand Down Expand Up @@ -549,7 +549,7 @@ exports[`Snapshot Tests SpruceForm.stories Example2 1`] = `
class="lg-ui-ripple-0000 leafygreen-ui-11wjzqe"
/>
<span
class="leafygreen-ui-1wmrjan"
class="leafygreen-ui-187di61"
>
Decommission hosts of this distro for this update
</span>
Expand Down Expand Up @@ -579,7 +579,7 @@ exports[`Snapshot Tests SpruceForm.stories Example2 1`] = `
>
<input
aria-checked="false"
aria-describedby="lg-3"
aria-describedby="lg-197"
aria-disabled="false"
class="lg-ui-radio-group-0002 leafygreen-ui-1iwed1m"
id="radio-group--0"
Expand All @@ -606,7 +606,7 @@ exports[`Snapshot Tests SpruceForm.stories Example2 1`] = `
>
<input
aria-checked="false"
aria-describedby="lg-4"
aria-describedby="lg-198"
aria-disabled="false"
class="lg-ui-radio-group-0002 leafygreen-ui-1iwed1m"
id="radio-group--1"
Expand Down Expand Up @@ -670,17 +670,17 @@ exports[`Snapshot Tests SpruceForm.stories Example3 1`] = `
>
<label
class="leafygreen-ui-75mjfl"
for="checkbox-5"
id="checkbox-5-label"
for="checkbox-199"
id="checkbox-199-label"
>
<input
aria-checked="true"
aria-disabled="false"
aria-label="checkbox"
aria-labelledby="checkbox-5-label"
aria-labelledby="checkbox-199-label"
checked=""
class="lg-ui-input-0000 leafygreen-ui-1a1e5kp"
id="checkbox-5"
id="checkbox-199"
type="checkbox"
/>
<div
Expand Down Expand Up @@ -708,7 +708,7 @@ exports[`Snapshot Tests SpruceForm.stories Example3 1`] = `
class="lg-ui-ripple-0000 leafygreen-ui-11wjzqe"
/>
<span
class="leafygreen-ui-1wmrjan"
class="leafygreen-ui-187di61"
>
This is the only visible page element
</span>
Expand Down
6 changes: 3 additions & 3 deletions apps/spruce/src/components/Table/TableControl/__snapshots__/TableControl.stories.storyshot
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,16 +128,16 @@ exports[`Snapshot Tests TableControl.stories Default 1`] = `
class="leafygreen-ui-1iyoj2o css-5krlfz-StyledSelect ekttol50"
>
<button
aria-controls="select-5-menu"
aria-describedby="select-5-description"
aria-controls="select-200-menu"
aria-describedby="select-200-description"
aria-disabled="false"
aria-expanded="false"
aria-invalid="false"
aria-labelledby="page-size-select"
class="lg-ui-button-0000 leafygreen-ui-1rmc7qb"
data-cy="tasks-table-page-size-selector"
data-testid="leafygreen-ui-select-menubutton"
id="select-6"
id="select-201"
type="button"
value="10"
>
Expand Down
Loading

0 comments on commit dd01cb4

Please sign in to comment.