Skip to content

Commit a982675

Browse files
XavierMXavierM
committed
Merge branch 'master' of github.com:elastic/kibana into security-navigation
2 parents b332c7b + 573409b commit a982675

24 files changed

Lines changed: 850 additions & 785 deletions

‎x-pack/plugins/index_management/__jest__/client_integration/helpers/index.ts‎

Lines changed: 38 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,44 @@
44
* you may not use this file except in compliance with the Elastic License.
55
*/
66

7-
import { setup as homeSetup } from './home.helpers';
8-
import { setup as templateCreateSetup } from './template_create.helpers';
9-
import { setup as templateCloneSetup } from './template_clone.helpers';
10-
import { setup as templateEditSetup } from './template_edit.helpers';
11-
127
export { nextTick, getRandomString, findTestSubject, TestBed } from '../../../../../test_utils';
138

14-
export { setupEnvironment } from './setup_environment';
9+
export { setupEnvironment, WithAppDependencies, services } from './setup_environment';
1510

16-
export const pageHelpers = {
17-
home: { setup: homeSetup },
18-
templateCreate: { setup: templateCreateSetup },
19-
templateClone: { setup: templateCloneSetup },
20-
templateEdit: { setup: templateEditSetup },
21-
};
11+
export type TestSubjects =
12+
| 'aliasesTab'
13+
| 'appTitle'
14+
| 'cell'
15+
| 'closeDetailsButton'
16+
| 'createTemplateButton'
17+
| 'deleteSystemTemplateCallOut'
18+
| 'deleteTemplateButton'
19+
| 'deleteTemplatesConfirmation'
20+
| 'documentationLink'
21+
| 'emptyPrompt'
22+
| 'manageTemplateButton'
23+
| 'mappingsTab'
24+
| 'noAliasesCallout'
25+
| 'noMappingsCallout'
26+
| 'noSettingsCallout'
27+
| 'indicesList'
28+
| 'indicesTab'
29+
| 'indexTableIncludeHiddenIndicesToggle'
30+
| 'indexTableIndexNameLink'
31+
| 'reloadButton'
32+
| 'reloadIndicesButton'
33+
| 'row'
34+
| 'sectionError'
35+
| 'sectionLoading'
36+
| 'settingsTab'
37+
| 'summaryTab'
38+
| 'summaryTitle'
39+
| 'systemTemplatesSwitch'
40+
| 'templateDetails'
41+
| 'templateDetails.manageTemplateButton'
42+
| 'templateDetails.sectionLoading'
43+
| 'templateDetails.tab'
44+
| 'templateDetails.title'
45+
| 'templateList'
46+
| 'templateTable'
47+
| 'templatesTab';

‎x-pack/plugins/index_management/__jest__/client_integration/helpers/setup_environment.tsx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
* or more contributor license agreements. Licensed under the Elastic License;
44
* you may not use this file except in compliance with the Elastic License.
55
*/
6+
67
/* eslint-disable @kbn/eslint/no-restricted-paths */
78
import React from 'react';
89
import axios from 'axios';

0 commit comments

Comments
 (0)