Skip to content

Commit

Permalink
Fixing problem with default value in hot fix 4.0.3 cdk version
Browse files Browse the repository at this point in the history
  • Loading branch information
@mawelCaballero
mawelCaballero committed Mar 24, 2022
1 parent d1ce1e0 commit f8a29af
Show file tree
Hide file tree
Showing 2 changed files with 72 additions and 34 deletions.
99 changes: 69 additions & 30 deletions projects/dxc-ngx-cdk/src/lib/dxc-select/dxc-select.component.spec.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,24 +63,38 @@ describe("DxcSelectComponent tests", () => {
onChange: {
emit: changeMock,
} as any,
value: "1"
value: "1",
},
imports: [DxcSelectModule],
excludeComponentDeclaration: true,
});
expect(dxcSelect.getByText("Select label"));
expect(dxcSelect.getByText("Helper Text"));
expect(() => dxcSelect.getByText("Choose an option")).toThrow();
fireEvent.click(dxcSelect.getByRole('combobox'));
expect((screen.getAllByText('label1')[1].getAttribute("aria-selected"))).toBe("true");
expect(dxcSelect.getByText("label1"));
fireEvent.click(dxcSelect.getByRole("combobox"));
expect(screen.getAllByText("label1")[1].getAttribute("aria-selected")).toBe(
"true"
);
fireEvent.click(screen.getByText("aida"));
expect(changeMock).toHaveBeenCalledWith({value: "10", error: null});
expect((screen.getAllByText('label1')[1].getAttribute("aria-selected"))).toBe("true");
expect((screen.getAllByText('aida')[0].getAttribute("aria-selected"))).toBe("false");
expect((screen.getAllByText('label2')[0].getAttribute("aria-selected"))).toBe("false");
expect((screen.getAllByText('label6')[0].getAttribute("aria-selected"))).toBe("false");
expect((screen.getAllByText('label9')[0].getAttribute("aria-selected"))).toBe("false");
expect((screen.getAllByText('pepe')[0].getAttribute("aria-selected"))).toBe("false");
expect(changeMock).toHaveBeenCalledWith({ value: "10", error: null });
expect(screen.getAllByText("label1")[1].getAttribute("aria-selected")).toBe(
"true"
);
expect(screen.getAllByText("aida")[0].getAttribute("aria-selected")).toBe(
"false"
);
expect(screen.getAllByText("label2")[0].getAttribute("aria-selected")).toBe(
"false"
);
expect(screen.getAllByText("label6")[0].getAttribute("aria-selected")).toBe(
"false"
);
expect(screen.getAllByText("label9")[0].getAttribute("aria-selected")).toBe(
"false"
);
expect(screen.getAllByText("pepe")[0].getAttribute("aria-selected")).toBe(
"false"
);
});

test("dxc-select single uncontrolled functionality", async () => {
Expand All @@ -107,27 +121,50 @@ describe("DxcSelectComponent tests", () => {
});
expect(dxcSelect.getByText("Select label"));
expect(dxcSelect.getByText("Helper Text"));
dxcSelect.getByText("Choose an option")
fireEvent.click(dxcSelect.getByRole('combobox'));
dxcSelect.getByText("Choose an option");
fireEvent.click(dxcSelect.getByRole("combobox"));
fireEvent.click(screen.getByText("aida"));
expect(changeMock).toHaveBeenCalledWith({value: "10", error: null});
expect((screen.getAllByText('aida')[1].getAttribute("aria-selected"))).toBe("true");
expect((screen.getAllByText('label1')[0].getAttribute("aria-selected"))).toBe("false");
expect((screen.getAllByText('label2')[0].getAttribute("aria-selected"))).toBe("false");
expect((screen.getAllByText('label6')[0].getAttribute("aria-selected"))).toBe("false");
expect((screen.getAllByText('label9')[0].getAttribute("aria-selected"))).toBe("false");
expect((screen.getAllByText('pepe')[0].getAttribute("aria-selected"))).toBe("false");
expect(changeMock).toHaveBeenCalledWith({ value: "10", error: null });
expect(screen.getAllByText("aida")[1].getAttribute("aria-selected")).toBe(
"true"
);
expect(screen.getAllByText("label1")[0].getAttribute("aria-selected")).toBe(
"false"
);
expect(screen.getAllByText("label2")[0].getAttribute("aria-selected")).toBe(
"false"
);
expect(screen.getAllByText("label6")[0].getAttribute("aria-selected")).toBe(
"false"
);
expect(screen.getAllByText("label9")[0].getAttribute("aria-selected")).toBe(
"false"
);
expect(screen.getAllByText("pepe")[0].getAttribute("aria-selected")).toBe(
"false"
);
fireEvent.click(screen.getByText("pepe"));
expect(changeMock).toHaveBeenCalledWith({value: "11", error: null});
expect((screen.getAllByText('pepe')[1].getAttribute("aria-selected"))).toBe("true");
expect((screen.getAllByText('label1')[0].getAttribute("aria-selected"))).toBe("false");
expect((screen.getAllByText('label2')[0].getAttribute("aria-selected"))).toBe("false");
expect((screen.getAllByText('label6')[0].getAttribute("aria-selected"))).toBe("false");
expect((screen.getAllByText('label9')[0].getAttribute("aria-selected"))).toBe("false");
expect((screen.getAllByText('aida')[0].getAttribute("aria-selected"))).toBe("false");
expect(changeMock).toHaveBeenCalledWith({ value: "11", error: null });
expect(screen.getAllByText("pepe")[1].getAttribute("aria-selected")).toBe(
"true"
);
expect(screen.getAllByText("label1")[0].getAttribute("aria-selected")).toBe(
"false"
);
expect(screen.getAllByText("label2")[0].getAttribute("aria-selected")).toBe(
"false"
);
expect(screen.getAllByText("label6")[0].getAttribute("aria-selected")).toBe(
"false"
);
expect(screen.getAllByText("label9")[0].getAttribute("aria-selected")).toBe(
"false"
);
expect(screen.getAllByText("aida")[0].getAttribute("aria-selected")).toBe(
"false"
);
});


test("should render optional error", async () => {
const array1: Option[] = [
{ label: "label1", value: "1" },
Expand Down Expand Up @@ -155,7 +192,9 @@ describe("DxcSelectComponent tests", () => {
expect(dxcSelect.getByText("Helper Text"));
fireEvent.click(dxcSelect.getByText("Choose an option"));
fireEvent.focusOut(dxcSelect.getByText("Choose an option"));
expect(onBlur).toHaveBeenCalledWith({value: "", error: "This field is required. Please, enter a value."});

expect(onBlur).toHaveBeenCalledWith({
value: "",
error: "This field is required. Please, enter a value.",
});
});
});
7 changes: 3 additions & 4 deletions projects/dxc-ngx-cdk/src/lib/dxc-select/dxc-select.component.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ export class DxcSelectComponent implements OnInit, ControlValueAccessor {

ngOnInit(): void {
this.optionalOption = { label: this.setPlaceholderOptional(), value: "" };
if (this.optional && !this.multiple) {
if (this.optional && !this.multiple && !(this.value || this.value === "")) {
this.service.setSelectedValues(this.optionalOption);
}
this.id = `select-${uuidv4()}`;
Expand All @@ -254,9 +254,8 @@ export class DxcSelectComponent implements OnInit, ControlValueAccessor {
}
} else {
if (this.optionGroupRef) {
const optionGroupElement = this.optionGroupRef?.toArray()[
value.group
];
const optionGroupElement =
this.optionGroupRef?.toArray()[value.group];
optionGroupElement &&
this.scrollByIndex(optionGroupElement, value.option + 1);
}
Expand Down

0 comments on commit f8a29af

Please sign in to comment.