1
0
mirror of https://github.com/lensapp/lens.git synced 2025-05-20 05:10:56 +00:00

Adapt application builder and tests to array-like paths over string-like paths

Array-like paths do not have weakness for special characters as part of id, such as ".".

Also note: the error messaging for clicking of application menu in application builder is a bit worse now I think, but the simplification of the test code is worth it in this case IMHO.

Co-authored-by: Janne Savolainen <janne.savolainen@live.fi>

Signed-off-by: Iku-turso <mikko.aspiala@gmail.com>
This commit is contained in:
Iku-turso 2022-10-21 15:20:01 +03:00
parent 19e3dd77b4
commit 20aaaafce3
2 changed files with 59 additions and 59 deletions

View File

@ -3,50 +3,50 @@
exports[`application-menu given enough time passes populates application menu 1`] = ` exports[`application-menu given enough time passes populates application menu 1`] = `
Array [ Array [
"root", "root",
"root.mac", "root -> mac",
"root.mac.about", "root -> mac -> about",
"root.mac.separator-1", "root -> mac -> separator-1",
"root.mac.navigate-to-preferences", "root -> mac -> navigate-to-preferences",
"root.mac.navigate-to-extensions", "root -> mac -> navigate-to-extensions",
"root.mac.separator-2", "root -> mac -> separator-2",
"root.mac.services", "root -> mac -> services",
"root.mac.separator-3", "root -> mac -> separator-3",
"root.mac.hide", "root -> mac -> hide",
"root.mac.hide-others", "root -> mac -> hide-others",
"root.mac.unhide", "root -> mac -> unhide",
"root.mac.separator-4", "root -> mac -> separator-4",
"root.mac.quit", "root -> mac -> quit",
"root.file", "root -> file",
"root.file.add-cluster", "root -> file -> add-cluster",
"root.file.separator-1-for-file", "root -> file -> separator-1-for-file",
"root.file.close-window", "root -> file -> close-window",
"root.edit", "root -> edit",
"root.edit.undo", "root -> edit -> undo",
"root.edit.redo", "root -> edit -> redo",
"root.edit.separator-1-in-edit", "root -> edit -> separator-1-in-edit",
"root.edit.cut", "root -> edit -> cut",
"root.edit.copy", "root -> edit -> copy",
"root.edit.paste", "root -> edit -> paste",
"root.edit.delete", "root -> edit -> delete",
"root.edit.separator-2-in-edit", "root -> edit -> separator-2-in-edit",
"root.edit.selectAll", "root -> edit -> selectAll",
"root.view", "root -> view",
"root.view.navigate-to-catalog", "root -> view -> navigate-to-catalog",
"root.view.open-command-palette", "root -> view -> open-command-palette",
"root.view.separator-1-for-view", "root -> view -> separator-1-for-view",
"root.view.go-back", "root -> view -> go-back",
"root.view.go-forward", "root -> view -> go-forward",
"root.view.reload", "root -> view -> reload",
"root.view.toggle-dev-tools", "root -> view -> toggle-dev-tools",
"root.view.separator-2-for-view", "root -> view -> separator-2-for-view",
"root.view.reset-zoom", "root -> view -> reset-zoom",
"root.view.zoom-in", "root -> view -> zoom-in",
"root.view.zoom-out", "root -> view -> zoom-out",
"root.view.separator-3-for-view", "root -> view -> separator-3-for-view",
"root.view.toggle-full-screen", "root -> view -> toggle-full-screen",
"root.help", "root -> help",
"root.help.navigate-to-welcome", "root -> help -> navigate-to-welcome",
"root.help.open-documentation", "root -> help -> open-documentation",
"root.help.open-support", "root -> help -> open-support",
] ]
`; `;

View File

@ -92,16 +92,16 @@ describe("application-menu-in-legacy-extension-api", () => {
it("related menu items exist", () => { it("related menu items exist", () => {
const menuItemPathsForExtension = builder.applicationMenu.items.filter( const menuItemPathsForExtension = builder.applicationMenu.items.filter(
(x) => (x) =>
x.startsWith("root.some-top-menu-item.some-extension-name"), x.startsWith("root -> some-top-menu-item -> some-extension-name"),
); );
expect(menuItemPathsForExtension).toEqual([ expect(menuItemPathsForExtension).toEqual([
"root.some-top-menu-item.some-extension-name/some-clickable-item", "root -> some-top-menu-item -> some-extension-name/some-clickable-item",
// Note: anonymous index "1" is used by the non-visible menu item. // Note: anonymous index "1" is used by the non-visible menu item.
"root.some-top-menu-item.some-extension-name/2-separator", "root -> some-top-menu-item -> some-extension-name/2-separator",
"root.some-top-menu-item.some-extension-name/some-os-action-menu-item-id", "root -> some-top-menu-item -> some-extension-name/some-os-action-menu-item-id",
"root.some-top-menu-item.some-extension-name/some-submenu-with-explicit-children", "root -> some-top-menu-item -> some-extension-name/some-submenu-with-explicit-children",
"root.some-top-menu-item.some-extension-name/some-submenu-with-explicit-children.some-extension-name/some-submenu-with-explicit-children/some-explicit-child", "root -> some-top-menu-item -> some-extension-name/some-submenu-with-explicit-children -> some-extension-name/some-submenu-with-explicit-children/some-explicit-child",
]); ]);
}); });
@ -132,15 +132,15 @@ describe("application-menu-in-legacy-extension-api", () => {
const menuItemPathsForExtension = builder.applicationMenu.items.filter( const menuItemPathsForExtension = builder.applicationMenu.items.filter(
(x) => (x) =>
x.startsWith("root.some-top-menu-item.some-extension-name"), x.startsWith("root -> some-top-menu-item -> some-extension-name"),
); );
expect(menuItemPathsForExtension).toEqual([ expect(menuItemPathsForExtension).toEqual([
"root.some-top-menu-item.some-extension-name/some-clickable-item", "root -> some-top-menu-item -> some-extension-name/some-clickable-item",
"root.some-top-menu-item.some-extension-name/2-separator", "root -> some-top-menu-item -> some-extension-name/2-separator",
"root.some-top-menu-item.some-extension-name/some-os-action-menu-item-id", "root -> some-top-menu-item -> some-extension-name/some-os-action-menu-item-id",
"root.some-top-menu-item.some-extension-name/some-submenu-with-explicit-children", "root -> some-top-menu-item -> some-extension-name/some-submenu-with-explicit-children",
"root.some-top-menu-item.some-extension-name/some-submenu-with-explicit-children.some-extension-name/some-submenu-with-explicit-children/some-explicit-child", "root -> some-top-menu-item -> some-extension-name/some-submenu-with-explicit-children -> some-extension-name/some-submenu-with-explicit-children/some-explicit-child",
]); ]);
}); });
}); });
@ -180,11 +180,11 @@ describe("application-menu-in-legacy-extension-api", () => {
it("only recognizable menu items from extension exist", () => { it("only recognizable menu items from extension exist", () => {
const menuItemPathsForExtension = builder.applicationMenu.items.filter( const menuItemPathsForExtension = builder.applicationMenu.items.filter(
(x) => (x) =>
x.startsWith("root.some-top-menu-item.some-extension-name"), x.startsWith("root -> some-top-menu-item -> some-extension-name"),
); );
expect(menuItemPathsForExtension).toEqual([ expect(menuItemPathsForExtension).toEqual([
"root.some-top-menu-item.some-extension-name/some-recognizable-item", "root -> some-top-menu-item -> some-extension-name/some-recognizable-item",
]); ]);
}); });