merge conflicts

[arvados.git] / src / views-components / main-app-bar / main-app-bar.test.tsx

diff --git a/src/views-components/main-app-bar/main-app-bar.test.tsx b/src/views-components/main-app-bar/main-app-bar.test.tsx
index 46c281cb3c95da92a0e80907dc750ca4d0d43220..6d5c9de897162288c5936d028f07dcb1dfaee88b 100644 (file)
--- a/src/views-components/main-app-bar/main-app-bar.test.tsx
+++ b/src/views-components/main-app-bar/main-app-bar.test.tsx
@@ -5,10 +5,10 @@
 import * as React from "react";
 import { mount, configure, ReactWrapper } from "enzyme";
 import * as Adapter from "enzyme-adapter-react-16";
-import MainAppBar from "./main-app-bar";
-import SearchBar from "../../components/search-bar/search-bar";
-import Breadcrumbs from "../../components/breadcrumbs/breadcrumbs";
-import DropdownMenu from "../../components/dropdown-menu/dropdown-menu";
+import { MainAppBar } from "./main-app-bar";
+import { SearchBar } from "../../components/search-bar/search-bar";
+import { Breadcrumbs } from "../../components/breadcrumbs/breadcrumbs";
+import { DropdownMenu } from "../../components/dropdown-menu/dropdown-menu";
 import { Button, MenuItem, IconButton } from "@material-ui/core";
 import { User } from "../../models/user";
 
@@ -30,6 +30,7 @@ describe("<MainAppBar />", () => {
                 user={user}
                 onContextMenu={jest.fn()}
                 onDetailsPanelToggle={jest.fn()}
+                onContextMenu={jest.fn()}
                 {...{ searchText: "", breadcrumbs: [], menuItems: { accountMenu: [], helpMenu: [], anonymousMenu: [] }, onSearch: jest.fn(), onBreadcrumbClick: jest.fn(), onMenuItemClick: jest.fn() }}
             />
         );
@@ -62,6 +63,7 @@ describe("<MainAppBar />", () => {
                 searchDebounce={2000}
                 onContextMenu={jest.fn()}
                 onSearch={onSearch}
+                onContextMenu={jest.fn()}
                 onDetailsPanelToggle={jest.fn()}
                 {...{ user, breadcrumbs: [], menuItems: { accountMenu: [], helpMenu: [], anonymousMenu: [] }, onBreadcrumbClick: jest.fn(), onMenuItemClick: jest.fn() }}
             />
@@ -81,6 +83,7 @@ describe("<MainAppBar />", () => {
                 breadcrumbs={items}
                 onContextMenu={jest.fn()}
                 onBreadcrumbClick={onBreadcrumbClick}
+                onContextMenu={jest.fn()}
                 onDetailsPanelToggle={jest.fn()}
                 {...{ user, searchText: "", menuItems: { accountMenu: [], helpMenu: [], anonymousMenu: [] }, onSearch: jest.fn(), onMenuItemClick: jest.fn() }}
             />
@@ -99,6 +102,7 @@ describe("<MainAppBar />", () => {
                 menuItems={menuItems}
                 onContextMenu={jest.fn()}
                 onMenuItemClick={onMenuItemClick}
+                onContextMenu={jest.fn()}
                 onDetailsPanelToggle={jest.fn()}
                 {...{ user, searchText: "", breadcrumbs: [], onSearch: jest.fn(), onBreadcrumbClick: jest.fn() }}
             />