Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 52 additions & 16 deletions packages/main/cypress/specs/Menu.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import "../../src/Menu.js";
import "../../src/MenuItem.js";
import type MenuItem from "../../src/MenuItem.js";

describe.skip("Menu interaction", () => {
describe("Menu interaction", () => {
it("Menu opens after button click", () => {
cy.mount(html`<ui5-button id="btnOpen">Open Menu</ui5-button>
<ui5-menu id="menu" opener="btnOpen">
Expand All @@ -27,13 +27,16 @@ describe.skip("Menu interaction", () => {

it("Menu icons appearance", () => {
cy.mount(html`<ui5-button id="btnOpen">Open Menu</ui5-button>
<ui5-menu open opener="btnOpen">
<ui5-menu opener="btnOpen">
<ui5-menu-item text="Item 1.0" icon="open-folder">
<ui5-menu-item text="1.1"></ui5-menu-item>
</ui5-menu-item>
<ui5-menu-item text="Item 2.0"></ui5-menu-item>
</ui5-menu>`);

cy.get("[ui5-menu]")
.ui5MenuOpen();

cy.get("[ui5-menu] > [ui5-menu-item]")
.as("items");

Expand All @@ -55,12 +58,15 @@ describe.skip("Menu interaction", () => {

it("Restore focus to previous element after close", () => {
cy.mount(html`<ui5-button id="btnOpen">Open Menu</ui5-button>
<ui5-menu open opener="btnOpen">
<ui5-menu opener="btnOpen">
<ui5-menu-item text="Item 1.0" icon="open-folder">
<ui5-menu-item text="1.1"></ui5-menu-item>
</ui5-menu-item>
</ui5-menu>`);

cy.get("[ui5-menu]")
.ui5MenuOpen();

cy.get("[ui5-menu]")
.ui5MenuOpened();

Expand All @@ -76,36 +82,42 @@ describe.skip("Menu interaction", () => {

it("Enable navigaion over disabled items", () => {
cy.mount(html`<ui5-button id="btnOpen">Open Menu</ui5-button>
<ui5-menu id="menu" opener="btnOpen" open>
<ui5-menu id="menu" opener="btnOpen">
<ui5-menu-item text="Item 1"></ui5-menu-item>
<ui5-menu-item text="Item 2" disabled></ui5-menu-item>
</ui5-menu>`);

cy.get("[ui5-menu]")
.ui5MenuOpen();

cy.get("[ui5-menu]")
.ui5MenuOpened();

cy.get("[ui5-menu] > [ui5-menu-item]")
.as("items");

cy.get("@items")
.eq(0)
.should("be.focused");
.eq(1)
.should("be.visible")
.ui5MenuItemClick();

cy.get("@items")
.eq(1)
.ui5MenuItemClick()
.should("be.focused")
.and("have.attr", "disabled");
});

it("Add endContent to a menu item", () => {
cy.mount(html`<ui5-button id="btnOpen">Open Menu</ui5-button>
<ui5-menu id="menu" opener="btnOpen" open>
<ui5-menu id="menu" opener="btnOpen">
<ui5-menu-item text="Item 1">
<ui5-button slot="endContent">endContent</ui5-button>
</ui5-menu-item>
</ui5-menu>`);

cy.get("[ui5-menu]")
.ui5MenuOpen();

cy.get("[ui5-menu]")
.as("menu")
.ui5MenuOpened();
Expand All @@ -129,12 +141,15 @@ describe.skip("Menu interaction", () => {

it("Menu and Menu items busy indication - with items", () => {
cy.mount(html`<ui5-button id="btnOpen">Open Menu</ui5-button>
<ui5-menu id="menu" opener="btnOpen" open>
<ui5-menu id="menu" opener="btnOpen">
<ui5-menu-item text="Item 1" loading-delay="500" loading>
<ui5-menu-item text="Item 1.1"></ui5-menu-item>
</ui5-menu-item>
</ui5-menu>`);

cy.get("[ui5-menu]")
.ui5MenuOpen();

cy.get("[ui5-menu]")
.ui5MenuOpened();

Expand All @@ -147,10 +162,13 @@ describe.skip("Menu interaction", () => {

it("Menu and Menu items busy indication - without items", () => {
cy.mount(html`<ui5-button id="btnOpen">Open Menu</ui5-button>
<ui5-menu id="menu" opener="btnOpen" open>
<ui5-menu id="menu" opener="btnOpen">
<ui5-menu-item text="Item 1" loading-delay="500" loading></ui5-menu-item>
</ui5-menu>`);

cy.get("[ui5-menu]")
.ui5MenuOpen();

cy.get("[ui5-menu] > [ui5-menu-item]")
.shadow()
.find("[ui5-busy-indicator]")
Expand Down Expand Up @@ -190,10 +208,13 @@ describe.skip("Menu interaction", () => {
describe("Event firing", () => {
it("Event firing - 'ui5-item-click' after 'click' on menu item", () => {
cy.mount(html`<ui5-button id="btnOpen">Open Menu</ui5-button>
<ui5-menu open opener="btnOpen">
<ui5-menu opener="btnOpen">
<ui5-menu-item text="Item 1.0"></ui5-menu-item>
</ui5-menu>`);

cy.get("[ui5-menu]")
.ui5MenuOpen();

cy.get("[ui5-menu]")
.then($item => {
$item.get(0).addEventListener("ui5-item-click", cy.stub().as("clicked"));
Expand All @@ -211,10 +232,13 @@ describe.skip("Menu interaction", () => {

it("Event firing - 'ui5-item-click' after 'Space' on menu item", () => {
cy.mount(html`<ui5-button id="btnOpen">Open Menu</ui5-button>
<ui5-menu open opener="btnOpen">
<ui5-menu opener="btnOpen">
<ui5-menu-item text="Item 1.0"></ui5-menu-item>
</ui5-menu>`);

cy.get("[ui5-menu]")
.ui5MenuOpen();

cy.get("[ui5-menu]")
.then($menu => {
$menu.get(0).addEventListener("ui5-item-click", cy.stub().as("clicked"));
Expand All @@ -232,10 +256,13 @@ describe.skip("Menu interaction", () => {

it("Event firing - 'ui5-item-click' after 'Enter' on menu item", () => {
cy.mount(html`<ui5-button id="btnOpen">Open Menu</ui5-button>
<ui5-menu open opener="btnOpen">
<ui5-menu opener="btnOpen">
<ui5-menu-item text="Item 1.0"></ui5-menu-item>
</ui5-menu>`);

cy.get("[ui5-menu]")
.ui5MenuOpen();

cy.get("[ui5-menu]")
.then($item => {
$item.get(0).addEventListener("ui5-item-click", cy.stub().as("clicked"));
Expand All @@ -253,10 +280,13 @@ describe.skip("Menu interaction", () => {

it("Prevent menu closing on item press", () => {
cy.mount(html`<ui5-button id="btnOpen">Open Menu</ui5-button>
<ui5-menu open opener="btnOpen" @ui5-item-click="${(e: CustomEvent) => e.preventDefault()}">
<ui5-menu opener="btnOpen" @ui5-item-click="${(e: CustomEvent) => e.preventDefault()}">
<ui5-menu-item text="Item 1.0"></ui5-menu-item>
</ui5-menu>`);

cy.get("[ui5-menu]")
.ui5MenuOpen();

cy.get("[ui5-menu]")
.as("menu")
.then($item => {
Expand Down Expand Up @@ -335,14 +365,17 @@ describe.skip("Menu interaction", () => {
describe("Accessibility", () => {
it("Menu and Menu items accessibility attributes", () => {
cy.mount(html`<ui5-button id="btnOpen">Open Menu</ui5-button>
<ui5-menu open opener="btnOpen">
<ui5-menu opener="btnOpen">
<ui5-menu-item text="Item 1.0" accessible-name="test accessible name">
<ui5-menu-item text="Item 1.1"></ui5-menu-item>
</ui5-menu-item>
<ui5-menu-item text="Item 2.0" accessible-name="test accessible name"></ui5-menu-item>
<ui5-menu-item text="Item 3.0" additional-text="Ctrl+A"></ui5-menu-item>
</ui5-menu>`);

cy.get("[ui5-menu]")
.ui5MenuOpen();

cy.get("[ui5-menu]")
.as("menu");

Expand Down Expand Up @@ -397,12 +430,15 @@ describe.skip("Menu interaction", () => {

it("Menu popover has an accessible name", () => {
cy.mount(html`<ui5-button id="btnOpen">Open Menu</ui5-button>
<ui5-menu open opener="btnOpen">
<ui5-menu opener="btnOpen">
<ui5-menu-item text="Item 1.0" icon="open-folder">
<ui5-menu-item text="1.1"></ui5-menu-item>
</ui5-menu-item>
</ui5-menu>`);

cy.get("[ui5-menu]")
.ui5MenuOpen();

cy.get("[ui5-menu]")
.ui5MenuOpened();

Expand Down
9 changes: 7 additions & 2 deletions packages/main/cypress/support/commands/Menu.commands.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,17 @@ Cypress.Commands.add("ui5MenuOpened", { prevSubject: true }, subject => {

cy.get("@menu")
.should("be.visible")
.should("have.attr", "open");
.and("have.attr", "open");

cy.get("@menu")
.shadow()
.find("[ui5-responsive-popover]")
.and("have.attr", "open");
.should("have.attr", "open");

cy.get("@menu")
.find(" > [ui5-menu-item]")
.first()
.should("be.visible");
});

Cypress.Commands.add("ui5MenuItemClick", { prevSubject: true }, subject => {
Expand Down