Skip to content

Commit 8fba34e

Browse files
committed
import drawer and update tests again
1 parent 29665b0 commit 8fba34e

File tree

10 files changed

+52
-32
lines changed

10 files changed

+52
-32
lines changed

packages/compass-aggregations/src/components/pipeline-toolbar/index.spec.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ describe('PipelineToolbar', function () {
115115
const settings = within(toolbar).getByTestId('pipeline-settings');
116116

117117
userEvent.click(within(settings).getByTestId('save-menu-show-actions'));
118-
const saveMenuContent = screen.getByTestId('lg-menu');
118+
const saveMenuContent = screen.getByTestId('lg-save-menu');
119119
expect(saveMenuContent.childNodes[0].textContent).to.equal('Save');
120120
expect(saveMenuContent.childNodes[1].textContent).to.equal('Save as');
121121
expect(saveMenuContent.childNodes[2].textContent).to.equal('Create view');

packages/compass-aggregations/src/components/pipeline-toolbar/pipeline-settings/pipeline-menus.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ export const SaveMenuComponent: React.FunctionComponent<SaveMenuProps> = ({
6464

6565
return (
6666
<DropdownMenuButton<SaveMenuActions>
67-
data-testid="save-menu"
67+
data-lgid="lg-save-menu"
6868
actions={menuActions}
6969
onAction={onAction}
7070
buttonText="Save"

packages/compass-components/src/components/context-menu.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ export function ContextMenu({ menu }: ContextMenuWrapperProps) {
7070
}}
7171
/>
7272
<Menu
73-
data-testid="context-menu"
73+
data-lgid="lg-context-menu"
7474
refEl={anchorRef}
7575
ref={menuRef}
7676
open={menu.isOpen}

packages/compass-components/src/components/leafygreen.tsx

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,22 @@ import {
1818
MongoDBLogoMark,
1919
MongoDBLogo,
2020
} from '@leafygreen-ui/logo';
21-
import { Menu, MenuSeparator, MenuItem } from '@leafygreen-ui/menu';
21+
import {
22+
Menu,
23+
MenuSeparator,
24+
MenuItem,
25+
getLgIds as getLgIdsMenu,
26+
} from '@leafygreen-ui/menu';
2227
export type { MenuItemProps } from '@leafygreen-ui/menu';
2328
import { InfoSprinkle } from '@leafygreen-ui/info-sprinkle';
29+
import {
30+
Drawer,
31+
DisplayMode as DrawerDisplayMode,
32+
DrawerLayout,
33+
DrawerStackProvider,
34+
useDrawerStackContext,
35+
useDrawerToolbarContext,
36+
} from '@leafygreen-ui/drawer';
2437

2538
// If a leafygreen Menu (and therefore MenuItems) makes its way into a <form>,
2639
// clicking on a menu item will submit that form. This is because it uses a button
@@ -175,6 +188,7 @@ export {
175188
Menu,
176189
MenuItem,
177190
MenuSeparator,
191+
getLgIdsMenu,
178192
Modal,
179193
ModalFooter,
180194
MarketingModal,
@@ -224,4 +238,10 @@ export {
224238
Combobox,
225239
ComboboxGroup,
226240
ComboboxOption,
241+
Drawer,
242+
DrawerDisplayMode,
243+
DrawerLayout,
244+
DrawerStackProvider,
245+
useDrawerStackContext,
246+
useDrawerToolbarContext,
227247
};

packages/compass-components/src/components/workspace-tabs/tab.spec.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ describe('Tab', function () {
130130
it('should propagate clicks on "Duplicate"', async function () {
131131
const tab = await screen.findByText('docs');
132132
userEvent.click(tab, { button: 2 });
133-
expect(screen.getByTestId('lg-menu')).to.be.visible;
133+
expect(screen.getByTestId('lg-context-menu')).to.be.visible;
134134

135135
const menuItem = await screen.findByText('Duplicate');
136136
menuItem.click();
@@ -141,7 +141,7 @@ describe('Tab', function () {
141141
it('should propagate clicks on "Close all other tabs"', async function () {
142142
const tab = await screen.findByText('docs');
143143
userEvent.click(tab, { button: 2 });
144-
expect(screen.getByTestId('lg-menu')).to.be.visible;
144+
expect(screen.getByTestId('lg-context-menu')).to.be.visible;
145145

146146
const menuItem = await screen.findByText('Close all other tabs');
147147
menuItem.click();

packages/compass-connections-navigation/src/connections-navigation-tree.spec.tsx

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -946,7 +946,7 @@ describe('ConnectionsNavigationTree', function () {
946946
) => {
947947
userEvent.click(element, { button: 2 });
948948
await waitFor(() => {
949-
expect(screen.getByTestId('lg-menu')).to.be.visible;
949+
expect(screen.getByTestId('lg-context-menu')).to.be.visible;
950950
});
951951
let groupIndex = 0;
952952
let itemIndex = 0;
@@ -1005,7 +1005,7 @@ describe('ConnectionsNavigationTree', function () {
10051005
userEvent.click(connectionElement, { button: 2 });
10061006

10071007
await waitFor(() => {
1008-
expect(screen.getByTestId('lg-menu')).to.be.visible;
1008+
expect(screen.getByTestId('lg-context-menu')).to.be.visible;
10091009
});
10101010

10111011
// Check for expected context menu items for disconnected connection
@@ -1061,7 +1061,7 @@ describe('ConnectionsNavigationTree', function () {
10611061
).getByTestId('base-navigation-item');
10621062
userEvent.click(databaseElement, { button: 2 });
10631063

1064-
const contextMenu = screen.getByTestId('lg-menu');
1064+
const contextMenu = screen.getByTestId('lg-context-menu');
10651065

10661066
// Check that write actions are not present in read-only mode
10671067
expect(() => within(contextMenu).getByText('Create collection')).to
@@ -1092,7 +1092,7 @@ describe('ConnectionsNavigationTree', function () {
10921092
userEvent.click(collectionElement, { button: 2 });
10931093

10941094
await waitFor(() => {
1095-
expect(screen.getByTestId('lg-menu')).to.be.visible;
1095+
expect(screen.getByTestId('lg-context-menu')).to.be.visible;
10961096
});
10971097

10981098
// Check for expected context menu items for collection
@@ -1128,7 +1128,7 @@ describe('ConnectionsNavigationTree', function () {
11281128
userEvent.click(collectionElement, { button: 2 });
11291129

11301130
await waitFor(() => {
1131-
expect(screen.getByTestId('lg-menu')).to.be.visible;
1131+
expect(screen.getByTestId('lg-context-menu')).to.be.visible;
11321132
});
11331133

11341134
await assertContextMenuItems(collectionElement, [
@@ -1214,7 +1214,7 @@ describe('ConnectionsNavigationTree', function () {
12141214
userEvent.click(collectionElement, { button: 2 });
12151215

12161216
await waitFor(() => {
1217-
expect(screen.getByTestId('lg-menu')).to.be.visible;
1217+
expect(screen.getByTestId('lg-context-menu')).to.be.visible;
12181218
});
12191219

12201220
userEvent.click(screen.getByText('Open in new tab'));

packages/compass-crud/src/components/crud-toolbar.spec.tsx

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -503,7 +503,7 @@ describe('CrudToolbar Component', function () {
503503
const toolbar = screen.getByTestId('query-bar').closest('div');
504504
userEvent.click(toolbar!, { button: 2 });
505505

506-
const contextMenu = screen.getByTestId('lg-menu');
506+
const contextMenu = screen.getByTestId('lg-context-menu');
507507
expect(within(contextMenu).getByText('Expand all documents')).to.be
508508
.visible;
509509
expect(within(contextMenu).getByText('Refresh')).to.be.visible;
@@ -516,7 +516,7 @@ describe('CrudToolbar Component', function () {
516516
const toolbar = screen.getByTestId('query-bar').closest('div');
517517
userEvent.click(toolbar!, { button: 2 });
518518

519-
const contextMenu = screen.getByTestId('lg-menu');
519+
const contextMenu = screen.getByTestId('lg-context-menu');
520520
const expandMenuItem = within(contextMenu).getByText(
521521
'Expand all documents'
522522
);
@@ -532,7 +532,7 @@ describe('CrudToolbar Component', function () {
532532
const toolbar = screen.getByTestId('query-bar').closest('div');
533533
userEvent.click(toolbar!, { button: 2 });
534534

535-
const contextMenu = screen.getByTestId('lg-menu');
535+
const contextMenu = screen.getByTestId('lg-context-menu');
536536
const collapseMenuItem = within(contextMenu).getByText(
537537
'Collapse all documents'
538538
);
@@ -548,7 +548,7 @@ describe('CrudToolbar Component', function () {
548548
const toolbar = screen.getByTestId('query-bar').closest('div');
549549
userEvent.click(toolbar!, { button: 2 });
550550

551-
const contextMenu = screen.getByTestId('lg-menu');
551+
const contextMenu = screen.getByTestId('lg-context-menu');
552552
const importMenuItem = within(contextMenu).getByText(
553553
'Import JSON or CSV file'
554554
);
@@ -566,7 +566,7 @@ describe('CrudToolbar Component', function () {
566566
const toolbar = screen.getByTestId('query-bar').closest('div');
567567
userEvent.click(toolbar!, { button: 2 });
568568

569-
const contextMenu = screen.getByTestId('lg-menu');
569+
const contextMenu = screen.getByTestId('lg-context-menu');
570570
const insertMenuItem =
571571
within(contextMenu).getByText('Insert document...');
572572
userEvent.click(insertMenuItem);
@@ -583,7 +583,7 @@ describe('CrudToolbar Component', function () {
583583
const toolbar = screen.getByTestId('query-bar').closest('div');
584584
userEvent.click(toolbar!, { button: 2 });
585585

586-
const contextMenu = screen.getByTestId('lg-menu');
586+
const contextMenu = screen.getByTestId('lg-context-menu');
587587
const exportQueryMenuItem = within(contextMenu).getByText(
588588
'Export query results...'
589589
);
@@ -599,7 +599,7 @@ describe('CrudToolbar Component', function () {
599599
const toolbar = screen.getByTestId('query-bar').closest('div');
600600
userEvent.click(toolbar!, { button: 2 });
601601

602-
const contextMenu = screen.getByTestId('lg-menu');
602+
const contextMenu = screen.getByTestId('lg-context-menu');
603603
const exportCollectionMenuItem = within(contextMenu).getByText(
604604
'Export full collection...'
605605
);
@@ -615,7 +615,7 @@ describe('CrudToolbar Component', function () {
615615
const toolbar = screen.getByTestId('query-bar').closest('div');
616616
userEvent.click(toolbar!, { button: 2 });
617617

618-
const contextMenu = screen.getByTestId('lg-menu');
618+
const contextMenu = screen.getByTestId('lg-context-menu');
619619
const updateMenuItem = within(contextMenu).getByText('Bulk update');
620620
userEvent.click(updateMenuItem);
621621

@@ -629,7 +629,7 @@ describe('CrudToolbar Component', function () {
629629
const toolbar = screen.getByTestId('query-bar').closest('div');
630630
userEvent.click(toolbar!, { button: 2 });
631631

632-
const contextMenu = screen.getByTestId('lg-menu');
632+
const contextMenu = screen.getByTestId('lg-context-menu');
633633
const deleteMenuItem = within(contextMenu).getByText('Bulk delete');
634634
userEvent.click(deleteMenuItem);
635635

@@ -643,7 +643,7 @@ describe('CrudToolbar Component', function () {
643643
const toolbar = screen.getByTestId('query-bar').closest('div');
644644
userEvent.click(toolbar!, { button: 2 });
645645

646-
const contextMenu = screen.getByTestId('lg-menu');
646+
const contextMenu = screen.getByTestId('lg-context-menu');
647647
const refreshMenuItem = within(contextMenu).getByText('Refresh');
648648
userEvent.click(refreshMenuItem);
649649

@@ -658,7 +658,7 @@ describe('CrudToolbar Component', function () {
658658
const toolbar = screen.getByTestId('query-bar').closest('div');
659659
userEvent.click(toolbar!, { button: 2 });
660660

661-
const contextMenu = screen.getByTestId('lg-menu');
661+
const contextMenu = screen.getByTestId('lg-context-menu');
662662
expect(within(contextMenu).queryByText('Import JSON or CSV file')).to
663663
.not.exist;
664664
expect(within(contextMenu).queryByText('Export query results...')).to
@@ -673,7 +673,7 @@ describe('CrudToolbar Component', function () {
673673
const toolbar = screen.getByTestId('query-bar').closest('div');
674674
userEvent.click(toolbar!, { button: 2 });
675675

676-
const contextMenu = screen.getByTestId('lg-menu');
676+
const contextMenu = screen.getByTestId('lg-context-menu');
677677
expect(within(contextMenu).queryByText('Insert document...')).to.not
678678
.exist;
679679
});
@@ -684,7 +684,7 @@ describe('CrudToolbar Component', function () {
684684
const toolbar = screen.getByTestId('query-bar').closest('div');
685685
userEvent.click(toolbar!, { button: 2 });
686686

687-
const contextMenu = screen.getByTestId('lg-menu');
687+
const contextMenu = screen.getByTestId('lg-context-menu');
688688
expect(within(contextMenu).queryByText('Bulk update')).to.not.exist;
689689
expect(within(contextMenu).queryByText('Bulk delete')).to.not.exist;
690690
});
@@ -695,7 +695,7 @@ describe('CrudToolbar Component', function () {
695695
const toolbar = screen.getByTestId('query-bar').closest('div');
696696
userEvent.click(toolbar!, { button: 2 });
697697

698-
const contextMenu = screen.getByTestId('lg-menu');
698+
const contextMenu = screen.getByTestId('lg-context-menu');
699699
expect(within(contextMenu).queryByText('Bulk update')).to.not.exist;
700700
});
701701

@@ -705,7 +705,7 @@ describe('CrudToolbar Component', function () {
705705
const toolbar = screen.getByTestId('query-bar').closest('div');
706706
userEvent.click(toolbar!, { button: 2 });
707707

708-
const contextMenu = screen.getByTestId('lg-menu');
708+
const contextMenu = screen.getByTestId('lg-context-menu');
709709
expect(within(contextMenu).queryByText('Bulk update')).to.not.exist;
710710
});
711711

@@ -715,7 +715,7 @@ describe('CrudToolbar Component', function () {
715715
const toolbar = screen.getByTestId('query-bar').closest('div');
716716
userEvent.click(toolbar!, { button: 2 });
717717

718-
const contextMenu = screen.getByTestId('lg-menu');
718+
const contextMenu = screen.getByTestId('lg-context-menu');
719719
expect(within(contextMenu).queryByText('Bulk update')).to.not.exist;
720720
expect(within(contextMenu).queryByText('Bulk delete')).to.not.exist;
721721
});
@@ -731,7 +731,7 @@ describe('CrudToolbar Component', function () {
731731
const toolbar = screen.getByTestId('query-bar').closest('div');
732732
userEvent.click(toolbar!, { button: 2 });
733733

734-
const contextMenu = screen.getByTestId('lg-menu');
734+
const contextMenu = screen.getByTestId('lg-context-menu');
735735
expect(within(contextMenu).getByText('Expand all documents')).to.be
736736
.visible;
737737
expect(within(contextMenu).getByText('Import JSON or CSV file')).to.be

packages/compass-e2e-tests/helpers/selectors.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -845,7 +845,7 @@ export const CreateNewPipelineButton =
845845
export const NewPipelineActions = '#new-pipeline-actions';
846846
export const NewPipelineActionsMenu = `${NewPipelineActions} + [role="menu"]`;
847847
export const SavePipelineMenuButton = '[data-testid="save-menu-show-actions"]';
848-
export const SavePipelineMenuContent = '[data-testid="lg-menu"]';
848+
export const SavePipelineMenuContent = '[data-testid="lg-save-menu"]';
849849
export const SavePipelineCreateViewAction =
850850
'[data-testid="save-menu-createView-action"]';
851851
export const SavePipelineSaveAsAction =

packages/compass-e2e-tests/tests/collection-aggregations-tab.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1425,7 +1425,7 @@ describe('Collection aggregations tab', function () {
14251425
await modal.waitForDisplayed({ reverse: true });
14261426
});
14271427

1428-
it('adds a new stage before or after current stage', async function () {
1428+
it.only('adds a new stage before or after current stage', async function () {
14291429
await browser.selectStageOperator(0, '$match');
14301430
await browser.setCodemirrorEditorValue(
14311431
Selectors.stageEditor(0),

packages/compass-sidebar/src/components/multiple-connections/sidebar.spec.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ describe('Multiple Connections Sidebar Component', function () {
245245
doRender(undefined, []);
246246
const header = screen.getByTestId('connections-header');
247247
userEvent.click(header, { button: 2 });
248-
const menu = screen.getByTestId('lg-menu');
248+
const menu = screen.getByTestId('lg-context-menu');
249249
expect(within(menu).getByTestId('menu-group-0-item-0')).to.have.text(
250250
'Collapse all connections'
251251
);

0 commit comments

Comments
 (0)