Fix tests and types

elastic · Dec 30, 2019 · 9bb0b78 · 9bb0b78
1 parent 29d03bf
commit 9bb0b78
Show file tree

Hide file tree

Showing 13 changed files with 46 additions and 29 deletions.
diff --git a/docs/development/core/public/kibana-plugin-public.ihttpfetcherror.body.md b/docs/development/core/public/kibana-plugin-public.ihttpfetcherror.body.md
@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-public](./kibana-plugin-public.md) &gt; [IHttpFetchError](./kibana-plugin-public.ihttpfetcherror.md) &gt; [body](./kibana-plugin-public.ihttpfetcherror.body.md)
+
+## IHttpFetchError.body property
+
+<b>Signature:</b>
+
+```typescript
+readonly body?: any;
+```
diff --git a/docs/development/core/public/kibana-plugin-public.ihttpfetcherror.md b/docs/development/core/public/kibana-plugin-public.ihttpfetcherror.md
@@ -15,6 +15,7 @@ export interface IHttpFetchError extends Error
 
 |  Property | Type | Description |
 |  --- | --- | --- |
+|  [body](./kibana-plugin-public.ihttpfetcherror.body.md) | <code>any</code> |  |
 |  [req](./kibana-plugin-public.ihttpfetcherror.req.md) | <code>Request</code> |  |
 |  [request](./kibana-plugin-public.ihttpfetcherror.request.md) | <code>Request</code> |  |
 |  [res](./kibana-plugin-public.ihttpfetcherror.res.md) | <code>Response</code> |  |

diff --git a/docs/development/core/public/kibana-plugin-public.savedobjectsclient.find.md b/docs/development/core/public/kibana-plugin-public.savedobjectsclient.find.md
@@ -9,5 +9,5 @@ Search for objects
 <b>Signature:</b>
 
 ```typescript
-find: <T extends SavedObjectAttributes>(options: Pick<SavedObjectFindOptionsServer, "search" | "filter" | "type" | "page" | "fields" | "searchFields" | "defaultSearchOperator" | "hasReference" | "sortField" | "perPage">) => Promise<SavedObjectsFindResponsePublic<T>>;
+find: <T extends SavedObjectAttributes>(options: Pick<SavedObjectFindOptionsServer, "search" | "filter" | "type" | "page" | "perPage" | "sortField" | "fields" | "searchFields" | "hasReference" | "defaultSearchOperator">) => Promise<SavedObjectsFindResponsePublic<T>>;
 ```
diff --git a/docs/development/core/public/kibana-plugin-public.savedobjectsclient.md b/docs/development/core/public/kibana-plugin-public.savedobjectsclient.md
@@ -20,7 +20,7 @@ export declare class SavedObjectsClient
 |  [bulkGet](./kibana-plugin-public.savedobjectsclient.bulkget.md) |  | <code>(objects?: {</code><br/><code>        id: string;</code><br/><code>        type: string;</code><br/><code>    }[]) =&gt; Promise&lt;SavedObjectsBatchResponse&lt;SavedObjectAttributes&gt;&gt;</code> | Returns an array of objects by id |
 |  [create](./kibana-plugin-public.savedobjectsclient.create.md) |  | <code>&lt;T extends SavedObjectAttributes&gt;(type: string, attributes: T, options?: SavedObjectsCreateOptions) =&gt; Promise&lt;SimpleSavedObject&lt;T&gt;&gt;</code> | Persists an object |
 |  [delete](./kibana-plugin-public.savedobjectsclient.delete.md) |  | <code>(type: string, id: string) =&gt; Promise&lt;{}&gt;</code> | Deletes an object |
-|  [find](./kibana-plugin-public.savedobjectsclient.find.md) |  | <code>&lt;T extends SavedObjectAttributes&gt;(options: Pick&lt;SavedObjectFindOptionsServer, &quot;search&quot; &#124; &quot;filter&quot; &#124; &quot;type&quot; &#124; &quot;page&quot; &#124; &quot;fields&quot; &#124; &quot;searchFields&quot; &#124; &quot;defaultSearchOperator&quot; &#124; &quot;hasReference&quot; &#124; &quot;sortField&quot; &#124; &quot;perPage&quot;&gt;) =&gt; Promise&lt;SavedObjectsFindResponsePublic&lt;T&gt;&gt;</code> | Search for objects |
+|  [find](./kibana-plugin-public.savedobjectsclient.find.md) |  | <code>&lt;T extends SavedObjectAttributes&gt;(options: Pick&lt;SavedObjectFindOptionsServer, &quot;search&quot; &#124; &quot;filter&quot; &#124; &quot;type&quot; &#124; &quot;page&quot; &#124; &quot;perPage&quot; &#124; &quot;sortField&quot; &#124; &quot;fields&quot; &#124; &quot;searchFields&quot; &#124; &quot;hasReference&quot; &#124; &quot;defaultSearchOperator&quot;&gt;) =&gt; Promise&lt;SavedObjectsFindResponsePublic&lt;T&gt;&gt;</code> | Search for objects |
 |  [get](./kibana-plugin-public.savedobjectsclient.get.md) |  | <code>&lt;T extends SavedObjectAttributes&gt;(type: string, id: string) =&gt; Promise&lt;SimpleSavedObject&lt;T&gt;&gt;</code> | Fetches a single object |
 
 ## Methods

diff --git a/src/core/public/http/types.ts b/src/core/public/http/types.ts
@@ -298,6 +298,7 @@ export interface IHttpFetchError extends Error {
    * @deprecated Provided for legacy compatibility. Prefer the `response` property instead.
    */
   readonly res?: Response;
+  readonly body?: any;
 }
 
 /** @public */

diff --git a/src/core/public/public.api.md b/src/core/public/public.api.md
@@ -620,6 +620,8 @@ export type IContextProvider<THandler extends HandlerFunction<any>, TContextName
 
 // @public (undocumented)
 export interface IHttpFetchError extends Error {
+    // (undocumented)
+    readonly body?: any;
     // @deprecated (undocumented)
     readonly req: Request;
     // (undocumented)

diff --git a/src/plugins/data/public/search/sync_search_strategy.test.ts b/src/plugins/data/public/search/sync_search_strategy.test.ts
@@ -44,10 +44,8 @@ describe('Sync search strategy', () => {
       },
       {}
     );
-    expect(mockCoreSetup.http.fetch.mock.calls[0][0]).toBe(
-      `/internal/search/${SYNC_SEARCH_STRATEGY}`
-    );
-    expect(mockCoreSetup.http.fetch.mock.calls[0][1]).toEqual({
+    expect(mockCoreSetup.http.fetch.mock.calls[0][0]).toEqual({
+      path: `/internal/search/${SYNC_SEARCH_STRATEGY}`,
       body: JSON.stringify({
         serverStrategy: 'SYNC_SEARCH_STRATEGY',
       }),

diff --git a/src/plugins/data/public/search/sync_search_strategy.ts b/src/plugins/data/public/search/sync_search_strategy.ts
@@ -36,14 +36,12 @@ export const syncSearchStrategyProvider: TSearchStrategyProvider<typeof SYNC_SEA
     request: ISyncSearchRequest,
     options: ISearchOptions = {}
   ) => {
-    const response: Promise<IKibanaSearchResponse> = context.core.http.fetch(
-      `/internal/search/${request.serverStrategy}`,
-      {
-        method: 'POST',
-        body: JSON.stringify(request),
-        signal: options.signal,
-      }
-    );
+    const response: Promise<IKibanaSearchResponse> = context.core.http.fetch({
+      path: `/internal/search/${request.serverStrategy}`,
+      method: 'POST',
+      body: JSON.stringify(request),
+      signal: options.signal,
+    });
 
     return from(response);
   };

diff --git a/x-pack/legacy/plugins/lens/public/indexpattern_plugin/datapanel.test.tsx b/x-pack/legacy/plugins/lens/public/indexpattern_plugin/datapanel.test.tsx
@@ -278,8 +278,8 @@ describe('IndexPattern Data Panel', () => {
 
     function testProps() {
       const setState = jest.fn();
-      core.http.get.mockImplementation(async (url: string) => {
-        const parts = url.split('/');
+      core.http.get.mockImplementation(async ({ path }) => {
+        const parts = path.split('/');
         const indexPatternTitle = parts[parts.length - 1];
         return {
           indexPatternTitle,
@@ -397,15 +397,17 @@ describe('IndexPattern Data Panel', () => {
       expect(setState).toHaveBeenCalledTimes(2);
       expect(core.http.get).toHaveBeenCalledTimes(2);
 
-      expect(core.http.get).toHaveBeenCalledWith('/api/lens/existing_fields/aaa', {
+      expect(core.http.get).toHaveBeenCalledWith({
+        path: '/api/lens/existing_fields/aaa',
         query: {
           fromDate: '2019-01-01',
           toDate: '2020-01-01',
           timeFieldName: 'atime',
         },
       });
 
-      expect(core.http.get).toHaveBeenCalledWith('/api/lens/existing_fields/aaa', {
+      expect(core.http.get).toHaveBeenCalledWith({
+        path: '/api/lens/existing_fields/aaa',
         query: {
           fromDate: '2019-01-01',
           toDate: '2020-01-02',
@@ -436,15 +438,17 @@ describe('IndexPattern Data Panel', () => {
 
       expect(setState).toHaveBeenCalledTimes(2);
 
-      expect(core.http.get).toHaveBeenCalledWith('/api/lens/existing_fields/aaa', {
+      expect(core.http.get).toHaveBeenCalledWith({
+        path: '/api/lens/existing_fields/aaa',
         query: {
           fromDate: '2019-01-01',
           toDate: '2020-01-01',
           timeFieldName: 'atime',
         },
       });
 
-      expect(core.http.get).toHaveBeenCalledWith('/api/lens/existing_fields/bbb', {
+      expect(core.http.get).toHaveBeenCalledWith({
+        path: '/api/lens/existing_fields/bbb',
         query: {
           fromDate: '2019-01-01',
           toDate: '2020-01-01',
@@ -484,13 +488,13 @@ describe('IndexPattern Data Panel', () => {
       let overlapCount = 0;
       const props = testProps();
 
-      core.http.get.mockImplementation((url: string) => {
+      core.http.get.mockImplementation(({ path }) => {
         if (queryCount) {
           ++overlapCount;
         }
         ++queryCount;
 
-        const parts = url.split('/');
+        const parts = path.split('/');
         const indexPatternTitle = parts[parts.length - 1];
         const result = Promise.resolve({
           indexPatternTitle,

diff --git a/x-pack/legacy/plugins/lens/public/indexpattern_plugin/loader.test.ts b/x-pack/legacy/plugins/lens/public/indexpattern_plugin/loader.test.ts
@@ -516,8 +516,8 @@ describe('loader', () => {
   describe('syncExistingFields', () => {
     it('should call once for each index pattern', async () => {
       const setState = jest.fn();
-      const fetchJson = jest.fn(async (url: string) => {
-        const indexPatternTitle = _.last(url.split('/'));
+      const fetchJson = jest.fn(({ path }: { path: string }) => {
+        const indexPatternTitle = _.last(path.split('/'));
         return {
           indexPatternTitle,
           existingFieldNames: ['field_1', 'field_2'].map(

diff --git a/x-pack/legacy/plugins/lens/public/indexpattern_plugin/loader.ts b/x-pack/legacy/plugins/lens/public/indexpattern_plugin/loader.ts
@@ -243,7 +243,8 @@ export async function syncExistingFields({
         query.timeFieldName = pattern.timeFieldName;
       }
 
-      return fetchJson(`${BASE_API_URL}/existing_fields/${pattern.title}`, {
+      return fetchJson({
+        path: `${BASE_API_URL}/existing_fields/${pattern.title}`,
         query,
       }) as Promise<ExistingFields>;
     })

diff --git a/x-pack/legacy/plugins/xpack_main/server/lib/__tests__/replace_injected_vars.js b/x-pack/legacy/plugins/xpack_main/server/lib/__tests__/replace_injected_vars.js
@@ -16,6 +16,7 @@ const buildRequest = (path = '/app/kibana') => {
   return {
     path,
     route: { settings: {} },
+    headers: {},
     raw: {
       req: {
         socket: {},

diff --git a/x-pack/plugins/security/public/session/session_timeout_http_interceptor.test.ts b/x-pack/plugins/security/public/session/session_timeout_http_interceptor.test.ts
@@ -58,7 +58,7 @@ describe('response', () => {
     http.intercept(interceptor);
     fetchMock.mock('*', 200);
 
-    await http.fetch('/foo-api', { headers: { 'kbn-system-api': 'true' } });
+    await http.fetch('/foo-api', { asSystemApi: true });
 
     expect(sessionTimeoutMock.extend).not.toHaveBeenCalled();
   });
@@ -99,9 +99,9 @@ describe('responseError', () => {
     http.intercept(interceptor);
     fetchMock.mock('*', 401);
 
-    await expect(
-      http.fetch('/foo-api', { headers: { 'kbn-system-api': 'true' } })
-    ).rejects.toMatchInlineSnapshot(`[Error: Unauthorized]`);
+    await expect(http.fetch('/foo-api', { asSystemApi: true })).rejects.toMatchInlineSnapshot(
+      `[Error: Unauthorized]`
+    );
 
     expect(sessionTimeoutMock.extend).not.toHaveBeenCalled();
   });