Skip to content

Commit

Permalink
fix tests
Browse files Browse the repository at this point in the history
  • Loading branch information
alisonelizabeth committed Nov 8, 2019
1 parent e31dba7 commit 9d47441
Show file tree
Hide file tree
Showing 7 changed files with 39 additions and 29 deletions.
7 changes: 5 additions & 2 deletions src/plugins/es_ui_shared/public/request/np_ready_request.ts
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,14 @@ export const sendRequest = async (
try {
const response = await httpClient[method](path, { body });

return { data: response, error: null };
return {
data: response.data ? response.data : response,
error: null,
};
} catch (e) {
return {
data: null,
error: e.response ? e.response : e,
error: e.response && e.response.data ? e.response.data : e.body,
};
}
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ const registerHttpRequestMockHelpers = (server: SinonFakeServer) => {
};

const setCreateTemplateResponse = (response?: HttpResponse, error?: any) => {
const status = error ? error.status || 400 : 200;
const status = error ? error.body.status || 400 : 200;
const body = error ? JSON.stringify(error.body) : JSON.stringify(response);

server.respondWith('PUT', `${API_PATH}/templates`, [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,30 @@
import axios from 'axios';
import axiosXhrAdapter from 'axios/lib/adapters/xhr';
import { init as initHttpRequests } from './http_requests';
import { setHttpClient } from '../../../public/app/services/api';
import { httpService } from '../../../public/app/services/http';
import { breadcrumbService } from '../../../public/app/services/breadcrumbs';
import { documentationService } from '../../../public/app/services/documentation';
import { notificationService } from '../../../public/app/services/notification';
import { uiMetricService } from '../../../public/app/services/ui_metric';
import { createUiStatsReporter } from '../../../../../../../src/legacy/core_plugins/ui_metric/public';

/* eslint-disable @kbn/eslint/no-restricted-paths */
import { notificationServiceMock } from '../../../../../../../src/core/public/notifications/notifications_service.mock';
import { chromeServiceMock } from '../../../../../../../src/core/public/chrome/chrome_service.mock';
import { docLinksServiceMock } from '../../../../../../../src/core/public/doc_links/doc_links_service.mock';

const mockHttpClient = axios.create({ adapter: axiosXhrAdapter });

export const setupEnvironment = () => {
const { server, httpRequestsMockHelpers } = initHttpRequests();

// Mock initialization of services
// @ts-ignore
setHttpClient(mockHttpClient);
httpService.init(mockHttpClient);
breadcrumbService.init(chromeServiceMock.createStartContract(), '');
documentationService.init(docLinksServiceMock.createStartContract());
notificationService.init(notificationServiceMock.createStartContract());
uiMetricService.init(createUiStatsReporter);

const { server, httpRequestsMockHelpers } = initHttpRequests();

return {
server,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -113,16 +113,13 @@ describe.skip('<TemplateClone />', () => {

const latestRequest = server.requests[server.requests.length - 1];

const body = JSON.parse(latestRequest.requestBody);
const expected = {
const expected = JSON.stringify({
...templateToClone,
name: `${templateToClone.name}-copy`,
indexPatterns: DEFAULT_INDEX_PATTERNS,
aliases: {},
mappings: {},
settings: {},
};
expect(body).toEqual(expected);
});

expect(JSON.parse(latestRequest.requestBody).body).toEqual(expected);
});
});
});
Original file line number Diff line number Diff line change
Expand Up @@ -310,15 +310,16 @@ describe.skip('<TemplateCreate />', () => {

const latestRequest = server.requests[server.requests.length - 1];

const expected = {
const expected = JSON.stringify({
isManaged: false,
name: TEMPLATE_NAME,
indexPatterns: DEFAULT_INDEX_PATTERNS,
settings: SETTINGS,
mappings: MAPPINGS,
aliases: ALIASES,
isManaged: false,
};
expect(JSON.parse(latestRequest.requestBody)).toEqual(expected);
});

expect(JSON.parse(latestRequest.requestBody).body).toEqual(expected);
});

it('should surface the API errors from the put HTTP request', async () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -118,17 +118,18 @@ describe.skip('<TemplateEdit />', () => {

const { version, order } = templateToEdit;

const expected = {
const expected = JSON.stringify({
name: TEMPLATE_NAME,
version,
order,
indexPatterns: UPDATED_INDEX_PATTERN,
isManaged: false,
settings: SETTINGS,
mappings: MAPPINGS,
aliases: ALIASES,
isManaged: false,
};
expect(JSON.parse(latestRequest.requestBody)).toEqual(expected);
});

expect(JSON.parse(latestRequest.requestBody).body).toEqual(expected);
});
});
});
Original file line number Diff line number Diff line change
Expand Up @@ -244,10 +244,3 @@ export async function updateTemplate(template: Template) {

return result;
}

export async function loadTemplateToClone(name: Template['name']) {
return await sendRequest({
path: `${API_BASE_PATH}/templates/${encodeURIComponent(name)}`,
method: 'get',
});
}

0 comments on commit 9d47441

Please sign in to comment.