fix mocks

elastic · Dec 8, 2020 · 0131e71 · 0131e71
1 parent 5690a71
commit 0131e71
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 11 deletions.
diff --git a/x-pack/plugins/global_search/public/services/search_service.mock.ts b/x-pack/plugins/global_search/public/services/search_service.mock.ts
@@ -7,19 +7,21 @@
 import { SearchServiceSetup, SearchServiceStart } from './search_service';
 import { of } from 'rxjs';
 
-const createSetupMock = (): jest.Mocked<SearchServiceSetup> => {
-  return {
+const createSetupMock = () => {
+  const mock: jest.Mocked<SearchServiceSetup> = {
     registerResultProvider: jest.fn(),
   };
+
+  return mock;
 };
 
-const createStartMock = (): jest.Mocked<SearchServiceStart> => {
-  const mock = {
+const createStartMock = () => {
+  const mock: jest.Mocked<SearchServiceStart> = {
     find: jest.fn(),
     getSearchableTypes: jest.fn(),
   };
   mock.find.mockReturnValue(of({ results: [] }));
-  mock.getSearchableTypes.mockReturnValue(of([]));
+  mock.getSearchableTypes.mockResolvedValue([]);
 
   return mock;
 };

diff --git a/x-pack/plugins/global_search/server/services/search_service.mock.ts b/x-pack/plugins/global_search/server/services/search_service.mock.ts
@@ -7,19 +7,21 @@
 import { SearchServiceSetup, SearchServiceStart } from './search_service';
 import { of } from 'rxjs';
 
-const createSetupMock = (): jest.Mocked<SearchServiceSetup> => {
-  return {
+const createSetupMock = () => {
+  const mock: jest.Mocked<SearchServiceSetup> = {
     registerResultProvider: jest.fn(),
   };
+
+  return mock;
 };
 
-const createStartMock = (): jest.Mocked<SearchServiceStart> => {
-  const mock = {
+const createStartMock = () => {
+  const mock: jest.Mocked<SearchServiceStart> = {
     find: jest.fn(),
     getSearchableTypes: jest.fn(),
   };
   mock.find.mockReturnValue(of({ results: [] }));
-  mock.getSearchableTypes.mockReturnValue(of([]));
+  mock.getSearchableTypes.mockResolvedValue([]);
 
   return mock;
 };

diff --git a/x-pack/plugins/global_search_bar/public/components/search_bar.test.tsx b/x-pack/plugins/global_search_bar/public/components/search_bar.test.tsx
@@ -11,8 +11,8 @@ import { of, BehaviorSubject } from 'rxjs';
 import { filter, map } from 'rxjs/operators';
 import { mountWithIntl } from '@kbn/test/jest';
 import { applicationServiceMock } from '../../../../../src/core/public/mocks';
-import { GlobalSearchBatchedResults, GlobalSearchResult } from '../../../global_search/public';
 import { globalSearchPluginMock } from '../../../global_search/public/mocks';
+import { GlobalSearchBatchedResults, GlobalSearchResult } from '../../../global_search/public';
 import { SearchBar } from './search_bar';
 
 type Result = { id: string; type: string } | string;