github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-23 09:19:04 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into chore/canvas-in-xpack

Browse source
This commit is contained in:
Joe Fleming 2018-09-13 16:22:17 -07:00 • committed by GitHub
commit 90d2c1aac0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
14 changed files with 58 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
package.json
View file

@ -60,7 +60,7 @@
"url": "https://github.com/elastic/kibana.git"
},
"dependencies": {
"@elastic/eui": "3.11.0",
"@elastic/eui": "4.0.1",
"@elastic/filesaver": "1.1.2",
"@elastic/numeral": "2.3.2",
"@elastic/ui-ace": "0.2.3",

1
src/core_plugins/input_control_vis/public/components/vis/__snapshots__/form_row.test.js.snap
View file

@ -11,6 +11,7 @@ exports[`renders disabled control with tooltip 1`] = `
>
<EuiToolTip
content="I am disabled for testing purposes"
delay="regular"
placement="top"
position="top"
>

2
src/core_plugins/kibana/public/home/components/__snapshots__/recently_accessed.test.js.snap
View file

@ -64,6 +64,7 @@ exports[`render 1`] = `
<EuiToolTip
anchorClassName="homRecentlyAccessed__anchor"
content="label0"
delay="regular"
position="bottom"
>
<EuiLink
@ -108,6 +109,7 @@ exports[`render 1`] = `
<EuiToolTip
anchorClassName="homRecentlyAccessed__anchor"
content="label1"
delay="regular"
position="bottom"
>
<EuiLink

5
src/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/relationships/__tests__/__snapshots__/relationships.test.js.snap
View file

@ -18,6 +18,7 @@ exports[`Relationships should render dashboards normally 1`] = `
<h2>
<EuiToolTip
content="dashboard"
delay="regular"
position="top"
>
<EuiIcon
@ -123,6 +124,7 @@ exports[`Relationships should render errors 1`] = `
<h2>
<EuiToolTip
content="dashboard"
delay="regular"
position="top"
>
<EuiIcon
@ -166,6 +168,7 @@ exports[`Relationships should render index patterns normally 1`] = `
<h2>
<EuiToolTip
content="index patterns"
delay="regular"
position="top"
>
<EuiIcon
@ -327,6 +330,7 @@ exports[`Relationships should render searches normally 1`] = `
<h2>
<EuiToolTip
content="search"
delay="regular"
position="top"
>
<EuiIcon
@ -486,6 +490,7 @@ exports[`Relationships should render visualizations normally 1`] = `
<h2>
<EuiToolTip
content="visualization"
delay="regular"
position="top"
>
<EuiIcon

2
src/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/table/__tests__/__snapshots__/table.test.js.snap
View file

@ -79,12 +79,14 @@ exports[`Table should render normally 1`] = `
"icon": "eye",
"name": "In app",
"onClick": [Function],
"type": "icon",
},
Object {
"description": "View the relationships this saved object has to other saved objects",
"icon": "kqlSelector",
"name": "Relationships",
"onClick": [Function],
"type": "icon",
},
],
"name": "Actions",

2
src/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/table/table.js
View file

@ -145,6 +145,7 @@ export class Table extends PureComponent {
name: 'In app',
description:
'View this saved object within Kibana',
type: 'icon',
icon: 'eye',
onClick: object => goInApp(object.id, object.type),
},
@ -152,6 +153,7 @@ export class Table extends PureComponent {
name: 'Relationships',
description:
'View the relationships this saved object has to other saved objects',
type: 'icon',
icon: 'kqlSelector',
onClick: object =>
onShowRelationships(object.id, object.type, object.title),

12
src/functional_test_runner/cli.js
View file

@ -28,11 +28,20 @@ const cmd = new Command('node scripts/functional_test_runner');
const resolveConfigPath = v => resolve(process.cwd(), v);
const defaultConfigPath = resolveConfigPath('test/functional/config.js');
const collectExcludePaths = () => {
const paths = [];
return (arg) => {
paths.push(resolve(arg));
return paths;
};
};
cmd
.option('--config [path]', 'Path to a config file', resolveConfigPath, defaultConfigPath)
.option('--bail', 'stop tests after the first failure', false)
.option('--grep <pattern>', 'pattern used to select which tests to run')
.option('--invert', 'invert grep to exclude tests', false)
.option('--exclude [file]', 'Path to a test file that should not be loaded', collectExcludePaths(), [])
.option('--verbose', 'Log everything', false)
.option('--quiet', 'Only log errors', false)
.option('--silent', 'Log nothing', false)
@ -60,7 +69,8 @@ const functionalTestRunner = createFunctionalTestRunner({
grep: cmd.grep,
invert: cmd.invert,
},
updateBaselines: cmd.updateBaselines
updateBaselines: cmd.updateBaselines,
excludeTestFiles: cmd.exclude
}
});

2
src/functional_test_runner/lib/config/schema.js
View file

@ -60,6 +60,8 @@ export const schema = Joi.object().keys({
otherwise: Joi.default([]),
}),
excludeTestFiles: Joi.array().items(Joi.string()).default([]),
services: Joi.object().pattern(
ID_PATTERN,
Joi.func().required()

15
src/functional_test_runner/lib/mocha/load_test_files.js
View file

@ -31,12 +31,20 @@ import { decorateMochaUi } from './decorate_mocha_ui';
* @param {String} path
* @return {undefined} - mutates mocha, no return value
*/
export const loadTestFiles = (mocha, log, lifecycle, providers, paths, updateBaselines) => {
export const loadTestFiles = ({ mocha, log, lifecycle, providers, paths, excludePaths, updateBaselines }) => {
const pendingExcludes = new Set(excludePaths.slice(0));
const innerLoadTestFile = (path) => {
if (typeof path !== 'string' || !isAbsolute(path)) {
throw new TypeError('loadTestFile() only accepts absolute paths');
}
if (pendingExcludes.has(path)) {
pendingExcludes.delete(path);
log.warning('Skipping test file %s', path);
return;
}
loadTracer(path, `testFile[${path}]`, () => {
log.verbose('Loading test file %s', path);
@ -74,9 +82,14 @@ export const loadTestFiles = (mocha, log, lifecycle, providers, paths, updateBas
mocha.suite.emit('require', returnVal, path, mocha);
mocha.suite.emit('post-require', global, path, mocha);
context.revertProxiedAssignments();
});
};
paths.forEach(innerLoadTestFile);
if (pendingExcludes.size) {
throw new Error(`After loading all test files some exclude paths were not consumed:${['', ...pendingExcludes].join('\n -')}`);
}
};

10
src/functional_test_runner/lib/mocha/setup_mocha.js
View file

@ -46,6 +46,14 @@ export async function setupMocha(lifecycle, log, config, providers) {
await lifecycle.trigger('beforeEachTest');
});
loadTestFiles(mocha, log, lifecycle, providers, config.get('testFiles'), config.get('updateBaselines'));
loadTestFiles({
mocha,
log,
lifecycle,
providers,
paths: config.get('testFiles'),
excludePaths: config.get('excludeTestFiles'),
updateBaselines: config.get('updateBaselines'),
});
return mocha;
}

2
x-pack/package.json
View file

@ -87,7 +87,7 @@
},
"dependencies": {
"@elastic/datemath": "^4.0.2",
"@elastic/eui": "3.11.0",
"@elastic/eui": "4.0.1",
"@elastic/node-crypto": "0.1.2",
"@elastic/node-phantom-simple": "2.2.4",
"@elastic/numeral": "2.3.2",

2
x-pack/plugins/ml/public/jobs/new_job/simple/components/bucket_span_estimator/__snapshots__/bucket_span_estimator_view.test.js.snap
View file

@ -6,6 +6,7 @@ exports[`BucketSpanEstimator renders the button 1`] = `
>
<EuiToolTip
content="Experimental feature for estimating bucket span."
delay="regular"
position="bottom"
>
<EuiButton
@ -30,6 +31,7 @@ exports[`BucketSpanEstimator renders the loading button 1`] = `
>
<EuiToolTip
content="Experimental feature for estimating bucket span."
delay="regular"
position="bottom"
>
<EuiButton

6
x-pack/yarn.lock
View file

@ -23,9 +23,9 @@
dependencies:
moment "^2.13.0"
"@elastic/eui@3.11.0":
version "3.11.0"
resolved "https://registry.yarnpkg.com/@elastic/eui/-/eui-3.11.0.tgz#272c4a4d59149421b968a670fa84fa704260d345"
"@elastic/eui@4.0.1":
version "4.0.1"
resolved "https://registry.yarnpkg.com/@elastic/eui/-/eui-4.0.1.tgz#6543d397fb31836508fa4323564b02da11c642db"
dependencies:
classnames "^2.2.5"
core-js "^2.5.1"

6
yarn.lock
View file

@ -94,9 +94,9 @@
version "0.0.0"
uid ""
"@elastic/eui@3.11.0":
version "3.11.0"
resolved "https://registry.yarnpkg.com/@elastic/eui/-/eui-3.11.0.tgz#272c4a4d59149421b968a670fa84fa704260d345"
"@elastic/eui@4.0.1":
version "4.0.1"
resolved "https://registry.yarnpkg.com/@elastic/eui/-/eui-4.0.1.tgz#6543d397fb31836508fa4323564b02da11c642db"
dependencies:
classnames "^2.2.5"
core-js "^2.5.1"