Skip to content

Commit a50f285

Browse files
Merge branch 'master' into dev/typscriptify-expression-service-functional-tests
2 parents fb169f2 + b5133b5 commit a50f285

File tree

1,739 files changed

+14993
-7764
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,739 files changed

+14993
-7764
lines changed

.github/CODEOWNERS

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,9 @@
4040
# ML team owns the transform plugin, ES team added here for visibility
4141
# because the plugin lives in Kibana's Elasticsearch management section.
4242
/x-pack/legacy/plugins/transform/ @elastic/ml-ui @elastic/es-ui
43+
/x-pack/test/functional/apps/transform/ @elastic/ml-ui
44+
/x-pack/test/functional/services/transform_ui/ @elastic/ml-ui
45+
/x-pack/test/functional/services/transform.ts @elastic/ml-ui
4346

4447
# Operations
4548
/renovate.json5 @elastic/kibana-operations
@@ -71,6 +74,7 @@
7174
/x-pack/test/api_integration/apis/security/ @elastic/kibana-security
7275

7376
# Kibana Stack Services
77+
/src/dev/i18n @elastic/kibana-stack-services
7478
/packages/kbn-analytics/ @elastic/kibana-stack-services
7579
/src/legacy/core_plugins/ui_metric/ @elastic/kibana-stack-services
7680
/x-pack/legacy/plugins/telemetry @elastic/kibana-stack-services

.i18nrc.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
"embeddableApi": "src/plugins/embeddable",
99
"share": "src/plugins/share",
1010
"esUi": "src/plugins/es_ui_shared",
11+
"devTools": "src/plugins/dev_tools",
1112
"expressions": "src/plugins/expressions",
1213
"inputControl": "src/legacy/core_plugins/input_control_vis",
1314
"inspector": "src/plugins/inspector",

CONTRIBUTING.md

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -399,13 +399,19 @@ Test runner arguments:
399399
- `[test path]` is the relative path to the test file.
400400

401401
Examples:
402-
- Run the entire elasticsearch_service test suite with yarn:
403-
`node scripts/jest src/core/server/elasticsearch/elasticsearch_service.test.ts`
404-
- Run the jest test case whose description matches 'stops both admin and data clients':
405-
`node scripts/jest -t 'stops both admin and data clients' src/core/server/elasticsearch/elasticsearch_service.test.ts`
402+
- Run the entire elasticsearch_service test suite:
403+
```
404+
node scripts/jest src/core/server/elasticsearch/elasticsearch_service.test.ts
405+
```
406+
- Run the jest test case whose description matches `stops both admin and data clients`:
407+
```
408+
node scripts/jest -t 'stops both admin and data clients' src/core/server/elasticsearch/elasticsearch_service.test.ts
409+
```
406410
- Run the api integration test case whose description matches the given string:
407-
`node scripts/functional_tests_server --config test/api_integration/config.js`
408-
`node scripts/functional_test_runner --config test/api_integration/config.js --grep='should return 404 if id does not match any sample data sets'`
411+
```
412+
node scripts/functional_tests_server --config test/api_integration/config.js
413+
node scripts/functional_test_runner --config test/api_integration/config.js --grep='should return 404 if id does not match any sample data sets'
414+
```
409415
410416
### Debugging Unit Tests
411417

TYPESCRIPT.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ The first thing that will probably happen when you convert a `.js` file in our s
2121

2222
declare module '@elastic/eui' {
2323
// Add your types here
24-
export const EuiPopoverTitle: React.SFC<EuiPopoverTitleProps>;
24+
export const EuiPopoverTitle: React.FC<EuiPopoverTitleProps>;
2525
...
2626
}
2727
```
@@ -47,13 +47,13 @@ Since `@elastic/eui` already ships with a module declaration, any local addition
4747
// file `typings/@elastic/eui/index.d.ts`
4848

4949
import { CommonProps } from '@elastic/eui';
50-
import { SFC } from 'react';
50+
import { FC } from 'react';
5151

5252
declare module '@elastic/eui' {
5353
export type EuiNewComponentProps = CommonProps & {
5454
additionalProp: string;
5555
};
56-
export const EuiNewComponent: SFC<EuiNewComponentProps>;
56+
export const EuiNewComponent: FC<EuiNewComponentProps>;
5757
}
5858
```
5959

0 commit comments

Comments
 (0)