-
Notifications
You must be signed in to change notification settings - Fork 8.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into feature/tutorial-translations-part7
# Conflicts: # src/core_plugins/kibana/server/tutorials/apm/apm_client_instructions.js # src/core_plugins/kibana/server/tutorials/apm/apm_server_instructions.js # src/core_plugins/kibana/server/tutorials/apm/elastic_cloud.js # src/core_plugins/kibana/server/tutorials/apm/index.js # src/core_plugins/kibana/server/tutorials/apm/on_prem.js
- Loading branch information
Showing
339 changed files
with
6,712 additions
and
3,352 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| { | ||
| "paths": { | ||
| "kbn": "src/core_plugins/kibana", | ||
| "common.server": "src/server", | ||
| "common.ui": "src/ui", | ||
| "xpack.idxMgmt": "xpack/plugins/index_management" | ||
| }, | ||
| "exclude": [ | ||
| "src/ui/ui_render/bootstrap/app_bootstrap.js", | ||
| "src/ui/ui_render/ui_render_mixin.js", | ||
| "x-pack/plugins/monitoring/public/components/cluster/overview/alerts_panel.js", | ||
| "x-pack/plugins/monitoring/public/directives/alerts/index.js" | ||
| ] | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
79 changes: 79 additions & 0 deletions
79
packages/kbn-dev-utils/src/proc_runner/with_proc_runner.test.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,79 @@ | ||
| /* | ||
| * Licensed to Elasticsearch B.V. under one or more contributor | ||
| * license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright | ||
| * ownership. Elasticsearch B.V. licenses this file to you under | ||
| * the Apache License, Version 2.0 (the "License"); you may | ||
| * not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| import { ToolingLog } from '../tooling_log'; | ||
| import { withProcRunner } from './with_proc_runner'; | ||
| import { ProcRunner } from './proc_runner'; | ||
|
|
||
| it('passes proc runner to a function', async () => { | ||
| await withProcRunner(new ToolingLog(), proc => { | ||
| expect(proc).toBeInstanceOf(ProcRunner); | ||
| }); | ||
| }); | ||
|
|
||
| it('calls procRunner.teardown() if function returns synchronously', async () => { | ||
| let teardownSpy; | ||
| await withProcRunner(new ToolingLog(), proc => { | ||
| teardownSpy = jest.spyOn(proc, 'teardown'); | ||
| }); | ||
|
|
||
| expect(teardownSpy).toHaveBeenCalled(); | ||
| }); | ||
|
|
||
| it('calls procRunner.teardown() if function throw synchronous error, and rejects with the error', async () => { | ||
| const error = new Error('foo'); | ||
| let teardownSpy; | ||
|
|
||
| await expect( | ||
| withProcRunner(new ToolingLog(), proc => { | ||
| teardownSpy = jest.spyOn(proc, 'teardown'); | ||
| throw error; | ||
| }) | ||
| ).rejects.toThrowError(error); | ||
|
|
||
| expect(teardownSpy).toHaveBeenCalled(); | ||
| }); | ||
|
|
||
| it('waits for promise to resolve before tearing down proc', async () => { | ||
| let teardownSpy; | ||
|
|
||
| await withProcRunner(new ToolingLog(), async proc => { | ||
| await new Promise(resolve => setTimeout(resolve, 500)); | ||
| teardownSpy = jest.spyOn(proc, 'teardown'); | ||
| }); | ||
|
|
||
| expect(teardownSpy).not.toBe(undefined); | ||
| expect(teardownSpy).toHaveBeenCalled(); | ||
| }); | ||
|
|
||
| it('waits for promise to reject before tearing down proc and rejecting with the error', async () => { | ||
| const error = new Error('foo'); | ||
| let teardownSpy; | ||
|
|
||
| await expect( | ||
| withProcRunner(new ToolingLog(), async proc => { | ||
| await new Promise(resolve => setTimeout(resolve, 500)); | ||
| teardownSpy = jest.spyOn(proc, 'teardown'); | ||
| throw error; | ||
| }) | ||
| ).rejects.toThrowError(error); | ||
|
|
||
| expect(teardownSpy).not.toBe(undefined); | ||
| expect(teardownSpy).toHaveBeenCalled(); | ||
| }); |
91 changes: 91 additions & 0 deletions
91
packages/kbn-dev-utils/src/tooling_log/__snapshots__/log_levels.test.js.snap
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,91 @@ | ||
| // Jest Snapshot v1, https://goo.gl/fbAQLP | ||
|
|
||
| exports[`parses valid log levels correctly: debug 1`] = ` | ||
| Object { | ||
| "flags": Object { | ||
| "debug": true, | ||
| "error": true, | ||
| "info": true, | ||
| "silent": true, | ||
| "verbose": false, | ||
| "warning": true, | ||
| }, | ||
| "name": "debug", | ||
| } | ||
| `; | ||
|
|
||
| exports[`parses valid log levels correctly: error 1`] = ` | ||
| Object { | ||
| "flags": Object { | ||
| "debug": false, | ||
| "error": true, | ||
| "info": false, | ||
| "silent": true, | ||
| "verbose": false, | ||
| "warning": false, | ||
| }, | ||
| "name": "error", | ||
| } | ||
| `; | ||
|
|
||
| exports[`parses valid log levels correctly: info 1`] = ` | ||
| Object { | ||
| "flags": Object { | ||
| "debug": false, | ||
| "error": true, | ||
| "info": true, | ||
| "silent": true, | ||
| "verbose": false, | ||
| "warning": true, | ||
| }, | ||
| "name": "info", | ||
| } | ||
| `; | ||
|
|
||
| exports[`parses valid log levels correctly: silent 1`] = ` | ||
| Object { | ||
| "flags": Object { | ||
| "debug": false, | ||
| "error": false, | ||
| "info": false, | ||
| "silent": true, | ||
| "verbose": false, | ||
| "warning": false, | ||
| }, | ||
| "name": "silent", | ||
| } | ||
| `; | ||
|
|
||
| exports[`parses valid log levels correctly: verbose 1`] = ` | ||
| Object { | ||
| "flags": Object { | ||
| "debug": true, | ||
| "error": true, | ||
| "info": true, | ||
| "silent": true, | ||
| "verbose": true, | ||
| "warning": true, | ||
| }, | ||
| "name": "verbose", | ||
| } | ||
| `; | ||
|
|
||
| exports[`parses valid log levels correctly: warning 1`] = ` | ||
| Object { | ||
| "flags": Object { | ||
| "debug": false, | ||
| "error": true, | ||
| "info": false, | ||
| "silent": true, | ||
| "verbose": false, | ||
| "warning": true, | ||
| }, | ||
| "name": "warning", | ||
| } | ||
| `; | ||
|
|
||
| exports[`throws error for invalid levels: bar 1`] = `"Invalid log level \\"bar\\" (expected one of silent,error,warning,info,debug,verbose)"`; | ||
|
|
||
| exports[`throws error for invalid levels: foo 1`] = `"Invalid log level \\"foo\\" (expected one of silent,error,warning,info,debug,verbose)"`; | ||
|
|
||
| exports[`throws error for invalid levels: warn 1`] = `"Invalid log level \\"warn\\" (expected one of silent,error,warning,info,debug,verbose)"`; |
Oops, something went wrong.