Skip to content

Commit c928e05

Browse files
Merge branch 'main' into mcb-mf
2 parents 9f50bbc + 878d8a3 commit c928e05

2 files changed

Lines changed: 5 additions & 8 deletions

File tree

packages/main/cypress/specs/MultiComboBox.cy.tsx

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -641,15 +641,15 @@ describe("General", () => {
641641
}));
642642
});
643643

644-
it.skip("Select All functionality + N-more integration", () => {
644+
it("Select All functionality + N-more integration", () => {
645645
cy.mount(
646646
<><MultiComboBox style="width: 100px" noValidation={true} showSelectAll={true}>
647647
<MultiComboBoxItem selected={true} text="Very Very Very Very long Item 1"></MultiComboBoxItem>
648648
<MultiComboBoxItem selected={true} text="Item 2"></MultiComboBoxItem>
649649
<MultiComboBoxItem selected={true} text="Item 3"></MultiComboBoxItem>
650650
<MultiComboBoxItem text="Item 4"></MultiComboBoxItem>
651651
<MultiComboBoxItem text="Item 5"></MultiComboBoxItem>
652-
</MultiComboBox><Button id="dummyButton"></Button></>
652+
</MultiComboBox><Button>Dummy Button</Button></>
653653
);
654654

655655
cy.get("[ui5-multi-combobox]")
@@ -676,15 +676,13 @@ describe("General", () => {
676676
.find(".ui5-mcb-select-all-checkbox")
677677
.should("not.have.attr", "checked");
678678

679-
cy.get("#dummyButton")
680-
.realClick();
679+
// focus the dummy button to close the popover
680+
cy.realPress("Tab");
681+
cy.realPress("Tab");
681682

682683
cy.get<ResponsivePopover>("@popover")
683684
.ui5ResponsivePopoverClosed();
684685

685-
cy.get("[ui5-multi-combobox]")
686-
.should("not.be.focused");
687-
688686
cy.get("[ui5-multi-combobox]")
689687
.shadow()
690688
.find("[ui5-tokenizer]")

packages/main/src/BreadcrumbsTemplate.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ export default function BreadcrumbsTemplate(this: Breadcrumbs) {
5252
<li class="ui5-breadcrumbs-current-location" onClick={this._onLabelPress}>
5353
<span
5454
id={`${this._id}-labelWrapper`}
55-
role="link"
5655
aria-current="page"
5756
aria-label={this._currentLocationAccName}
5857
>

0 commit comments

Comments
 (0)