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

[ftr/startServers] resolve relative config arguments at CLI (#141450)

Browse source
This commit is contained in:
Spencer 2022-09-22 11:00:30 -05:00 • committed by GitHub
parent da8eb44f92
commit a5afcd7ae9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

25
packages/kbn-test/src/functional_tests/start_servers/flags.test.ts
View file

@ -6,13 +6,19 @@
* Side Public License, v 1. * Side Public License, v 1.
*/ */
import Path from 'path';
import { getFlags, FlagsReader } from '@kbn/dev-cli-runner'; import { getFlags, FlagsReader } from '@kbn/dev-cli-runner';
import { createAnyInstanceSerializer, createAbsolutePathSerializer } from '@kbn/jest-serializers'; import { createAnyInstanceSerializer, createAbsolutePathSerializer } from '@kbn/jest-serializers';
import { REPO_ROOT } from '@kbn/utils';
import { EsVersion } from '../../functional_test_runner'; import { EsVersion } from '../../functional_test_runner';
import { parseFlags, FLAG_OPTIONS } from './flags'; import { parseFlags, FLAG_OPTIONS } from './flags';
jest.mock('uuid', () => ({ v4: () => 'some-uuid' })); jest.mock('uuid', () => ({ v4: () => 'some-uuid' }));
const cwdMock = (process.cwd = jest.fn().mockReturnValue(REPO_ROOT));
expect.addSnapshotSerializer( expect.addSnapshotSerializer(
createAnyInstanceSerializer(EsVersion, (v: EsVersion) => `EsVersion ${v.toString()}`) createAnyInstanceSerializer(EsVersion, (v: EsVersion) => `EsVersion ${v.toString()}`)
); );
@ -23,10 +29,27 @@ const defaults = getFlags(['--config=foo'], FLAG_OPTIONS);
const test = (opts: Record<string, string | string[] | boolean | undefined>) => const test = (opts: Record<string, string | string[] | boolean | undefined>) =>
parseFlags(new FlagsReader({ ...defaults, ...opts })); parseFlags(new FlagsReader({ ...defaults, ...opts }));
beforeEach(() => {
cwdMock.mockReturnValue(REPO_ROOT);
});
it('parses a subset of the flags from runTests', () => { it('parses a subset of the flags from runTests', () => {
expect(test({ config: 'foo' })).toMatchInlineSnapshot(` expect(test({ config: 'foo' })).toMatchInlineSnapshot(`
Object { Object {
"config": "foo", "config": <absolute path>/foo,
"esFrom": undefined,
"esVersion": <EsVersion 9.9.9>,
"installDir": undefined,
"logsDir": undefined,
}
`);
});
it('respects the cwd of the script', () => {
cwdMock.mockReturnValue(Path.resolve(REPO_ROOT, 'x-pack'));
expect(test({ config: 'foo' })).toMatchInlineSnapshot(`
Object {
"config": <absolute path>/x-pack/foo,
"esFrom": undefined, "esFrom": undefined,
"esVersion": <EsVersion 9.9.9>, "esVersion": <EsVersion 9.9.9>,
"installDir": undefined, "installDir": undefined,

4
packages/kbn-test/src/functional_tests/start_servers/flags.ts
View file

@ -31,8 +31,8 @@ export const FLAG_OPTIONS: FlagOptions = {
export function parseFlags(flags: FlagsReader) { export function parseFlags(flags: FlagsReader) {
const configs = [ const configs = [
...(flags.arrayOfStrings('config') ?? []), ...(flags.arrayOfPaths('config') ?? []),
...(flags.arrayOfStrings('journey') ?? []), ...(flags.arrayOfPaths('journey') ?? []),
]; ];
if (configs.length !== 1) { if (configs.length !== 1) {
throw createFlagError(`expected exactly one --config or --journey flag`); throw createFlagError(`expected exactly one --config or --journey flag`);