From bdd1d530cb3022e2319aa7f90153267e94d343b4 Mon Sep 17 00:00:00 2001 From: Aleh Zasypkin Date: Fri, 7 Sep 2018 08:40:03 +0300 Subject: [PATCH] Get rid of `__tests__` folders in the core. (#22662) --- .../{__tests__ => }/__fixtures__/config.yml | 0 .../__fixtures__/config_flat.yml | 0 .../__fixtures__/en_var_ref_config.yml | 0 .../{__tests__ => }/__fixtures__/one.yml | 0 .../{__tests__ => }/__fixtures__/two.yml | 0 .../config/{__tests__ => }/__mocks__/env.ts | 2 +- .../__snapshots__/config_service.test.ts.snap | 0 .../__snapshots__/env.test.ts.snap | 0 .../__snapshots__/read_config.test.ts.snap | 0 .../config/{__tests__ => }/apply_argv.test.ts | 2 +- .../{__tests__ => }/config_service.test.ts | 9 ++++----- .../ensure_deep_object.test.ts | 2 +- .../server/config/{__tests__ => }/env.test.ts | 4 ++-- src/core/server/config/index.ts | 1 - .../raw_config_service.test.ts | 4 ++-- .../{__tests__ => }/read_config.test.ts | 2 +- .../__snapshots__/index.test.ts.snap | 0 .../{__tests__ => }/index.test.ts | 2 +- .../{__tests__ => }/schema_error.test.ts | 2 +- .../__snapshots__/any_type.test.ts.snap | 0 .../__snapshots__/array_type.test.ts.snap | 0 .../__snapshots__/boolean_type.test.ts.snap | 0 .../__snapshots__/byte_size_type.test.ts.snap | 0 .../conditional_type.test.ts.snap | 0 .../__snapshots__/duration_type.test.ts.snap | 0 .../__snapshots__/literal_type.test.ts.snap | 0 .../__snapshots__/map_of_type.test.ts.snap | 0 .../__snapshots__/maybe_type.test.ts.snap | 0 .../__snapshots__/number_type.test.ts.snap | 0 .../__snapshots__/object_type.test.ts.snap | 0 .../__snapshots__/one_of_type.test.ts.snap | 0 .../__snapshots__/string_type.test.ts.snap | 0 .../types/{__tests__ => }/any_type.test.ts | 2 +- .../types/{__tests__ => }/array_type.test.ts | 2 +- .../{__tests__ => }/boolean_type.test.ts | 2 +- .../{__tests__ => }/byte_size_type.test.ts | 4 ++-- .../{__tests__ => }/conditional_type.test.ts | 2 +- .../{__tests__ => }/duration_type.test.ts | 2 +- .../{__tests__ => }/literal_type.test.ts | 2 +- .../types/{__tests__ => }/map_of_type.test.ts | 2 +- .../types/{__tests__ => }/maybe_type.test.ts | 2 +- .../types/{__tests__ => }/number_type.test.ts | 2 +- .../types/{__tests__ => }/object_type.test.ts | 2 +- .../types/{__tests__ => }/one_of_type.test.ts | 2 +- .../types/{__tests__ => }/string_type.test.ts | 2 +- .../__snapshots__/http_config.test.ts.snap | 0 .../__snapshots__/http_server.test.ts.snap | 0 .../__snapshots__/http_service.test.ts.snap | 0 .../https_redirect_server.test.ts.snap | 0 .../http/{__tests__ => }/http_config.test.ts | 2 +- .../http/{__tests__ => }/http_server.test.ts | 9 ++++----- .../http/{__tests__ => }/http_service.test.ts | 8 +++----- .../https_redirect_server.test.ts | 8 ++++---- src/core/server/index.test.ts | 2 +- .../__snapshots__/legacy_service.test.ts.snap | 0 ...gacy_object_to_config_adapter.test.ts.snap | 0 .../legacy_object_to_config_adapter.test.ts | 2 +- .../legacy_platform_proxy.test.ts | 2 +- .../{__tests__ => }/legacy_service.test.ts | 20 +++++++++---------- .../legacy_appender.test.ts.snap | 0 .../{__tests__ => }/legacy_appender.test.ts | 10 +++++----- .../__snapshots__/logging_config.test.ts.snap | 0 .../logging_service.test.ts.snap | 0 .../{__tests__ => }/appenders.test.ts | 12 +++++------ .../buffer_appender.test.ts | 2 +- .../console_appender.test.ts | 2 +- .../{__tests__ => file}/file_appender.test.ts | 2 +- .../__snapshots__/json_layout.test.ts.snap | 0 .../__snapshots__/pattern_layout.test.ts.snap | 0 .../{__tests__ => }/json_layout.test.ts | 6 +++--- .../layouts/{__tests__ => }/layouts.test.ts | 6 +++--- .../{__tests__ => }/pattern_layout.test.ts | 8 ++++---- .../logging/{__tests__ => }/log_level.test.ts | 2 +- .../logging/{__tests__ => }/logger.test.ts | 8 ++++---- .../{__tests__ => }/logger_adapter.test.ts | 4 ++-- .../{__tests__ => }/logging_config.test.ts | 2 +- .../{__tests__ => }/logging_service.test.ts | 3 +-- .../__snapshots__/index.test.ts.snap | 0 .../server/root/{__tests__ => }/index.test.ts | 14 ++++++------- .../__snapshots__/get.test.ts.snap | 0 src/core/utils/{__tests__ => }/get.test.ts | 2 +- src/core/utils/{__tests__ => }/url.test.ts | 2 +- 82 files changed, 95 insertions(+), 101 deletions(-) rename src/core/server/config/{__tests__ => }/__fixtures__/config.yml (100%) rename src/core/server/config/{__tests__ => }/__fixtures__/config_flat.yml (100%) rename src/core/server/config/{__tests__ => }/__fixtures__/en_var_ref_config.yml (100%) rename src/core/server/config/{__tests__ => }/__fixtures__/one.yml (100%) rename src/core/server/config/{__tests__ => }/__fixtures__/two.yml (100%) rename src/core/server/config/{__tests__ => }/__mocks__/env.ts (97%) rename src/core/server/config/{__tests__ => }/__snapshots__/config_service.test.ts.snap (100%) rename src/core/server/config/{__tests__ => }/__snapshots__/env.test.ts.snap (100%) rename src/core/server/config/{__tests__ => }/__snapshots__/read_config.test.ts.snap (100%) rename src/core/server/config/{__tests__ => }/apply_argv.test.ts (97%) rename src/core/server/config/{__tests__ => }/config_service.test.ts (97%) rename src/core/server/config/{__tests__ => }/ensure_deep_object.test.ts (98%) rename src/core/server/config/{__tests__ => }/env.test.ts (97%) rename src/core/server/config/{__tests__ => }/raw_config_service.test.ts (98%) rename src/core/server/config/{__tests__ => }/read_config.test.ts (98%) rename src/core/server/config/schema/byte_size_value/{__tests__ => }/__snapshots__/index.test.ts.snap (100%) rename src/core/server/config/schema/byte_size_value/{__tests__ => }/index.test.ts (99%) rename src/core/server/config/schema/errors/{__tests__ => }/schema_error.test.ts (98%) rename src/core/server/config/schema/types/{__tests__ => }/__snapshots__/any_type.test.ts.snap (100%) rename src/core/server/config/schema/types/{__tests__ => }/__snapshots__/array_type.test.ts.snap (100%) rename src/core/server/config/schema/types/{__tests__ => }/__snapshots__/boolean_type.test.ts.snap (100%) rename src/core/server/config/schema/types/{__tests__ => }/__snapshots__/byte_size_type.test.ts.snap (100%) rename src/core/server/config/schema/types/{__tests__ => }/__snapshots__/conditional_type.test.ts.snap (100%) rename src/core/server/config/schema/types/{__tests__ => }/__snapshots__/duration_type.test.ts.snap (100%) rename src/core/server/config/schema/types/{__tests__ => }/__snapshots__/literal_type.test.ts.snap (100%) rename src/core/server/config/schema/types/{__tests__ => }/__snapshots__/map_of_type.test.ts.snap (100%) rename src/core/server/config/schema/types/{__tests__ => }/__snapshots__/maybe_type.test.ts.snap (100%) rename src/core/server/config/schema/types/{__tests__ => }/__snapshots__/number_type.test.ts.snap (100%) rename src/core/server/config/schema/types/{__tests__ => }/__snapshots__/object_type.test.ts.snap (100%) rename src/core/server/config/schema/types/{__tests__ => }/__snapshots__/one_of_type.test.ts.snap (100%) rename src/core/server/config/schema/types/{__tests__ => }/__snapshots__/string_type.test.ts.snap (100%) rename src/core/server/config/schema/types/{__tests__ => }/any_type.test.ts (98%) rename src/core/server/config/schema/types/{__tests__ => }/array_type.test.ts (99%) rename src/core/server/config/schema/types/{__tests__ => }/boolean_type.test.ts (98%) rename src/core/server/config/schema/types/{__tests__ => }/byte_size_type.test.ts (97%) rename src/core/server/config/schema/types/{__tests__ => }/conditional_type.test.ts (99%) rename src/core/server/config/schema/types/{__tests__ => }/duration_type.test.ts (98%) rename src/core/server/config/schema/types/{__tests__ => }/literal_type.test.ts (98%) rename src/core/server/config/schema/types/{__tests__ => }/map_of_type.test.ts (98%) rename src/core/server/config/schema/types/{__tests__ => }/maybe_type.test.ts (98%) rename src/core/server/config/schema/types/{__tests__ => }/number_type.test.ts (98%) rename src/core/server/config/schema/types/{__tests__ => }/object_type.test.ts (99%) rename src/core/server/config/schema/types/{__tests__ => }/one_of_type.test.ts (99%) rename src/core/server/config/schema/types/{__tests__ => }/string_type.test.ts (99%) rename src/core/server/http/{__tests__ => }/__snapshots__/http_config.test.ts.snap (100%) rename src/core/server/http/{__tests__ => }/__snapshots__/http_server.test.ts.snap (100%) rename src/core/server/http/{__tests__ => }/__snapshots__/http_service.test.ts.snap (100%) rename src/core/server/http/{__tests__ => }/__snapshots__/https_redirect_server.test.ts.snap (100%) rename src/core/server/http/{__tests__ => }/http_config.test.ts (99%) rename src/core/server/http/{__tests__ => }/http_server.test.ts (98%) rename src/core/server/http/{__tests__ => }/http_service.test.ts (95%) rename src/core/server/http/{__tests__ => }/https_redirect_server.test.ts (92%) rename src/core/server/legacy_compat/{__tests__ => }/__snapshots__/legacy_service.test.ts.snap (100%) rename src/core/server/legacy_compat/config/{__tests__ => }/__snapshots__/legacy_object_to_config_adapter.test.ts.snap (100%) rename src/core/server/legacy_compat/config/{__tests__ => }/legacy_object_to_config_adapter.test.ts (98%) rename src/core/server/legacy_compat/{__tests__ => }/legacy_platform_proxy.test.ts (98%) rename src/core/server/legacy_compat/{__tests__ => }/legacy_service.test.ts (95%) rename src/core/server/legacy_compat/logging/appenders/{__tests__ => }/__snapshots__/legacy_appender.test.ts.snap (100%) rename src/core/server/legacy_compat/logging/appenders/{__tests__ => }/legacy_appender.test.ts (93%) rename src/core/server/logging/{__tests__ => }/__snapshots__/logging_config.test.ts.snap (100%) rename src/core/server/logging/{__tests__ => }/__snapshots__/logging_service.test.ts.snap (100%) rename src/core/server/logging/appenders/{__tests__ => }/appenders.test.ts (88%) rename src/core/server/logging/appenders/{__tests__ => buffer}/buffer_appender.test.ts (97%) rename src/core/server/logging/appenders/{__tests__ => console}/console_appender.test.ts (97%) rename src/core/server/logging/appenders/{__tests__ => file}/file_appender.test.ts (98%) rename src/core/server/logging/layouts/{__tests__ => }/__snapshots__/json_layout.test.ts.snap (100%) rename src/core/server/logging/layouts/{__tests__ => }/__snapshots__/pattern_layout.test.ts.snap (100%) rename src/core/server/logging/layouts/{__tests__ => }/json_layout.test.ts (94%) rename src/core/server/logging/layouts/{__tests__ => }/layouts.test.ts (93%) rename src/core/server/logging/layouts/{__tests__ => }/pattern_layout.test.ts (93%) rename src/core/server/logging/{__tests__ => }/log_level.test.ts (98%) rename src/core/server/logging/{__tests__ => }/logger.test.ts (98%) rename src/core/server/logging/{__tests__ => }/logger_adapter.test.ts (97%) rename src/core/server/logging/{__tests__ => }/logging_config.test.ts (98%) rename src/core/server/logging/{__tests__ => }/logging_service.test.ts (98%) rename src/core/server/root/{__tests__ => }/__snapshots__/index.test.ts.snap (100%) rename src/core/server/root/{__tests__ => }/index.test.ts (95%) rename src/core/utils/{__tests__ => }/__snapshots__/get.test.ts.snap (100%) rename src/core/utils/{__tests__ => }/get.test.ts (97%) rename src/core/utils/{__tests__ => }/url.test.ts (98%) diff --git a/src/core/server/config/__tests__/__fixtures__/config.yml b/src/core/server/config/__fixtures__/config.yml similarity index 100% rename from src/core/server/config/__tests__/__fixtures__/config.yml rename to src/core/server/config/__fixtures__/config.yml diff --git a/src/core/server/config/__tests__/__fixtures__/config_flat.yml b/src/core/server/config/__fixtures__/config_flat.yml similarity index 100% rename from src/core/server/config/__tests__/__fixtures__/config_flat.yml rename to src/core/server/config/__fixtures__/config_flat.yml diff --git a/src/core/server/config/__tests__/__fixtures__/en_var_ref_config.yml b/src/core/server/config/__fixtures__/en_var_ref_config.yml similarity index 100% rename from src/core/server/config/__tests__/__fixtures__/en_var_ref_config.yml rename to src/core/server/config/__fixtures__/en_var_ref_config.yml diff --git a/src/core/server/config/__tests__/__fixtures__/one.yml b/src/core/server/config/__fixtures__/one.yml similarity index 100% rename from src/core/server/config/__tests__/__fixtures__/one.yml rename to src/core/server/config/__fixtures__/one.yml diff --git a/src/core/server/config/__tests__/__fixtures__/two.yml b/src/core/server/config/__fixtures__/two.yml similarity index 100% rename from src/core/server/config/__tests__/__fixtures__/two.yml rename to src/core/server/config/__fixtures__/two.yml diff --git a/src/core/server/config/__tests__/__mocks__/env.ts b/src/core/server/config/__mocks__/env.ts similarity index 97% rename from src/core/server/config/__tests__/__mocks__/env.ts rename to src/core/server/config/__mocks__/env.ts index e90c33f19ee49b..dec62978a292fe 100644 --- a/src/core/server/config/__tests__/__mocks__/env.ts +++ b/src/core/server/config/__mocks__/env.ts @@ -19,7 +19,7 @@ // Test helpers to simplify mocking environment options. -import { EnvOptions } from '../../env'; +import { EnvOptions } from '../env'; type DeepPartial = { [P in keyof T]?: T[P] extends Array ? Array> : DeepPartial diff --git a/src/core/server/config/__tests__/__snapshots__/config_service.test.ts.snap b/src/core/server/config/__snapshots__/config_service.test.ts.snap similarity index 100% rename from src/core/server/config/__tests__/__snapshots__/config_service.test.ts.snap rename to src/core/server/config/__snapshots__/config_service.test.ts.snap diff --git a/src/core/server/config/__tests__/__snapshots__/env.test.ts.snap b/src/core/server/config/__snapshots__/env.test.ts.snap similarity index 100% rename from src/core/server/config/__tests__/__snapshots__/env.test.ts.snap rename to src/core/server/config/__snapshots__/env.test.ts.snap diff --git a/src/core/server/config/__tests__/__snapshots__/read_config.test.ts.snap b/src/core/server/config/__snapshots__/read_config.test.ts.snap similarity index 100% rename from src/core/server/config/__tests__/__snapshots__/read_config.test.ts.snap rename to src/core/server/config/__snapshots__/read_config.test.ts.snap diff --git a/src/core/server/config/__tests__/apply_argv.test.ts b/src/core/server/config/apply_argv.test.ts similarity index 97% rename from src/core/server/config/__tests__/apply_argv.test.ts rename to src/core/server/config/apply_argv.test.ts index b3d2f3749271ae..80aa3d9f74a401 100644 --- a/src/core/server/config/__tests__/apply_argv.test.ts +++ b/src/core/server/config/apply_argv.test.ts @@ -17,7 +17,7 @@ * under the License. */ -import { Config, ObjectToConfigAdapter } from '..'; +import { Config, ObjectToConfigAdapter } from '.'; /** * Overrides some config values with ones from argv. diff --git a/src/core/server/config/__tests__/config_service.test.ts b/src/core/server/config/config_service.test.ts similarity index 97% rename from src/core/server/config/__tests__/config_service.test.ts rename to src/core/server/config/config_service.test.ts index c41ae3ccd8b752..22598b2a971d01 100644 --- a/src/core/server/config/__tests__/config_service.test.ts +++ b/src/core/server/config/config_service.test.ts @@ -23,13 +23,12 @@ import { BehaviorSubject } from 'rxjs'; import { first } from 'rxjs/operators'; const mockPackage = new Proxy({ raw: {} as any }, { get: (obj, prop) => obj.raw[prop] }); -jest.mock('../../../../utils/package_json', () => ({ pkg: mockPackage })); +jest.mock('../../../utils/package_json', () => ({ pkg: mockPackage })); -import { schema, Type, TypeOf } from '../schema'; +import { schema, Type, TypeOf } from './schema'; -import { ConfigService, ObjectToConfigAdapter } from '..'; -import { logger } from '../../logging/__mocks__'; -import { Env } from '../env'; +import { ConfigService, Env, ObjectToConfigAdapter } from '.'; +import { logger } from '../logging/__mocks__'; import { getEnvOptions } from './__mocks__/env'; const emptyArgv = getEnvOptions(); diff --git a/src/core/server/config/__tests__/ensure_deep_object.test.ts b/src/core/server/config/ensure_deep_object.test.ts similarity index 98% rename from src/core/server/config/__tests__/ensure_deep_object.test.ts rename to src/core/server/config/ensure_deep_object.test.ts index 40c07322660737..5a520fbeef3169 100644 --- a/src/core/server/config/__tests__/ensure_deep_object.test.ts +++ b/src/core/server/config/ensure_deep_object.test.ts @@ -17,7 +17,7 @@ * under the License. */ -import { ensureDeepObject } from '../ensure_deep_object'; +import { ensureDeepObject } from './ensure_deep_object'; test('flat object', () => { const obj = { diff --git a/src/core/server/config/__tests__/env.test.ts b/src/core/server/config/env.test.ts similarity index 97% rename from src/core/server/config/__tests__/env.test.ts rename to src/core/server/config/env.test.ts index 381273a1f8ffbe..56ff576fd8f31d 100644 --- a/src/core/server/config/__tests__/env.test.ts +++ b/src/core/server/config/env.test.ts @@ -30,9 +30,9 @@ jest.mock('path', () => ({ })); const mockPackage = new Proxy({ raw: {} as any }, { get: (obj, prop) => obj.raw[prop] }); -jest.mock('../../../../utils/package_json', () => ({ pkg: mockPackage })); +jest.mock('../../../utils/package_json', () => ({ pkg: mockPackage })); -import { Env } from '../env'; +import { Env } from '.'; import { getEnvOptions } from './__mocks__/env'; test('correctly creates default environment in dev mode.', () => { diff --git a/src/core/server/config/index.ts b/src/core/server/config/index.ts index c63a8d6aa7c041..bbddec03a0f41f 100644 --- a/src/core/server/config/index.ts +++ b/src/core/server/config/index.ts @@ -24,4 +24,3 @@ export { Config, ConfigPath } from './config'; export { ObjectToConfigAdapter } from './object_to_config_adapter'; export { Env, CliArgs } from './env'; export { ConfigWithSchema } from './config_with_schema'; -export { getConfigFromFiles } from './read_config'; diff --git a/src/core/server/config/__tests__/raw_config_service.test.ts b/src/core/server/config/raw_config_service.test.ts similarity index 98% rename from src/core/server/config/__tests__/raw_config_service.test.ts rename to src/core/server/config/raw_config_service.test.ts index 66cc31bc77774f..eb5c212a31eb9f 100644 --- a/src/core/server/config/__tests__/raw_config_service.test.ts +++ b/src/core/server/config/raw_config_service.test.ts @@ -19,12 +19,12 @@ const mockGetConfigFromFiles = jest.fn(); -jest.mock('../read_config', () => ({ +jest.mock('./read_config', () => ({ getConfigFromFiles: mockGetConfigFromFiles, })); import { first } from 'rxjs/operators'; -import { RawConfigService } from '../raw_config_service'; +import { RawConfigService } from '.'; const configFile = '/config/kibana.yml'; const anotherConfigFile = '/config/kibana.dev.yml'; diff --git a/src/core/server/config/__tests__/read_config.test.ts b/src/core/server/config/read_config.test.ts similarity index 98% rename from src/core/server/config/__tests__/read_config.test.ts rename to src/core/server/config/read_config.test.ts index b9aa3871b17947..46b75f28eb987b 100644 --- a/src/core/server/config/__tests__/read_config.test.ts +++ b/src/core/server/config/read_config.test.ts @@ -18,7 +18,7 @@ */ import { relative, resolve } from 'path'; -import { getConfigFromFiles } from '../read_config'; +import { getConfigFromFiles } from './read_config'; const fixtureFile = (name: string) => `${__dirname}/__fixtures__/${name}`; diff --git a/src/core/server/config/schema/byte_size_value/__tests__/__snapshots__/index.test.ts.snap b/src/core/server/config/schema/byte_size_value/__snapshots__/index.test.ts.snap similarity index 100% rename from src/core/server/config/schema/byte_size_value/__tests__/__snapshots__/index.test.ts.snap rename to src/core/server/config/schema/byte_size_value/__snapshots__/index.test.ts.snap diff --git a/src/core/server/config/schema/byte_size_value/__tests__/index.test.ts b/src/core/server/config/schema/byte_size_value/index.test.ts similarity index 99% rename from src/core/server/config/schema/byte_size_value/__tests__/index.test.ts rename to src/core/server/config/schema/byte_size_value/index.test.ts index ece87692481527..46ed96c83dd1f7 100644 --- a/src/core/server/config/schema/byte_size_value/__tests__/index.test.ts +++ b/src/core/server/config/schema/byte_size_value/index.test.ts @@ -17,7 +17,7 @@ * under the License. */ -import { ByteSizeValue } from '../'; +import { ByteSizeValue } from '.'; describe('parsing units', () => { test('bytes', () => { diff --git a/src/core/server/config/schema/errors/__tests__/schema_error.test.ts b/src/core/server/config/schema/errors/schema_error.test.ts similarity index 98% rename from src/core/server/config/schema/errors/__tests__/schema_error.test.ts rename to src/core/server/config/schema/errors/schema_error.test.ts index 15ce626621b58a..0f632b781e9a60 100644 --- a/src/core/server/config/schema/errors/__tests__/schema_error.test.ts +++ b/src/core/server/config/schema/errors/schema_error.test.ts @@ -18,7 +18,7 @@ */ import { relative } from 'path'; -import { SchemaError } from '..'; +import { SchemaError } from '.'; /** * Make all paths in stacktrace relative. diff --git a/src/core/server/config/schema/types/__tests__/__snapshots__/any_type.test.ts.snap b/src/core/server/config/schema/types/__snapshots__/any_type.test.ts.snap similarity index 100% rename from src/core/server/config/schema/types/__tests__/__snapshots__/any_type.test.ts.snap rename to src/core/server/config/schema/types/__snapshots__/any_type.test.ts.snap diff --git a/src/core/server/config/schema/types/__tests__/__snapshots__/array_type.test.ts.snap b/src/core/server/config/schema/types/__snapshots__/array_type.test.ts.snap similarity index 100% rename from src/core/server/config/schema/types/__tests__/__snapshots__/array_type.test.ts.snap rename to src/core/server/config/schema/types/__snapshots__/array_type.test.ts.snap diff --git a/src/core/server/config/schema/types/__tests__/__snapshots__/boolean_type.test.ts.snap b/src/core/server/config/schema/types/__snapshots__/boolean_type.test.ts.snap similarity index 100% rename from src/core/server/config/schema/types/__tests__/__snapshots__/boolean_type.test.ts.snap rename to src/core/server/config/schema/types/__snapshots__/boolean_type.test.ts.snap diff --git a/src/core/server/config/schema/types/__tests__/__snapshots__/byte_size_type.test.ts.snap b/src/core/server/config/schema/types/__snapshots__/byte_size_type.test.ts.snap similarity index 100% rename from src/core/server/config/schema/types/__tests__/__snapshots__/byte_size_type.test.ts.snap rename to src/core/server/config/schema/types/__snapshots__/byte_size_type.test.ts.snap diff --git a/src/core/server/config/schema/types/__tests__/__snapshots__/conditional_type.test.ts.snap b/src/core/server/config/schema/types/__snapshots__/conditional_type.test.ts.snap similarity index 100% rename from src/core/server/config/schema/types/__tests__/__snapshots__/conditional_type.test.ts.snap rename to src/core/server/config/schema/types/__snapshots__/conditional_type.test.ts.snap diff --git a/src/core/server/config/schema/types/__tests__/__snapshots__/duration_type.test.ts.snap b/src/core/server/config/schema/types/__snapshots__/duration_type.test.ts.snap similarity index 100% rename from src/core/server/config/schema/types/__tests__/__snapshots__/duration_type.test.ts.snap rename to src/core/server/config/schema/types/__snapshots__/duration_type.test.ts.snap diff --git a/src/core/server/config/schema/types/__tests__/__snapshots__/literal_type.test.ts.snap b/src/core/server/config/schema/types/__snapshots__/literal_type.test.ts.snap similarity index 100% rename from src/core/server/config/schema/types/__tests__/__snapshots__/literal_type.test.ts.snap rename to src/core/server/config/schema/types/__snapshots__/literal_type.test.ts.snap diff --git a/src/core/server/config/schema/types/__tests__/__snapshots__/map_of_type.test.ts.snap b/src/core/server/config/schema/types/__snapshots__/map_of_type.test.ts.snap similarity index 100% rename from src/core/server/config/schema/types/__tests__/__snapshots__/map_of_type.test.ts.snap rename to src/core/server/config/schema/types/__snapshots__/map_of_type.test.ts.snap diff --git a/src/core/server/config/schema/types/__tests__/__snapshots__/maybe_type.test.ts.snap b/src/core/server/config/schema/types/__snapshots__/maybe_type.test.ts.snap similarity index 100% rename from src/core/server/config/schema/types/__tests__/__snapshots__/maybe_type.test.ts.snap rename to src/core/server/config/schema/types/__snapshots__/maybe_type.test.ts.snap diff --git a/src/core/server/config/schema/types/__tests__/__snapshots__/number_type.test.ts.snap b/src/core/server/config/schema/types/__snapshots__/number_type.test.ts.snap similarity index 100% rename from src/core/server/config/schema/types/__tests__/__snapshots__/number_type.test.ts.snap rename to src/core/server/config/schema/types/__snapshots__/number_type.test.ts.snap diff --git a/src/core/server/config/schema/types/__tests__/__snapshots__/object_type.test.ts.snap b/src/core/server/config/schema/types/__snapshots__/object_type.test.ts.snap similarity index 100% rename from src/core/server/config/schema/types/__tests__/__snapshots__/object_type.test.ts.snap rename to src/core/server/config/schema/types/__snapshots__/object_type.test.ts.snap diff --git a/src/core/server/config/schema/types/__tests__/__snapshots__/one_of_type.test.ts.snap b/src/core/server/config/schema/types/__snapshots__/one_of_type.test.ts.snap similarity index 100% rename from src/core/server/config/schema/types/__tests__/__snapshots__/one_of_type.test.ts.snap rename to src/core/server/config/schema/types/__snapshots__/one_of_type.test.ts.snap diff --git a/src/core/server/config/schema/types/__tests__/__snapshots__/string_type.test.ts.snap b/src/core/server/config/schema/types/__snapshots__/string_type.test.ts.snap similarity index 100% rename from src/core/server/config/schema/types/__tests__/__snapshots__/string_type.test.ts.snap rename to src/core/server/config/schema/types/__snapshots__/string_type.test.ts.snap diff --git a/src/core/server/config/schema/types/__tests__/any_type.test.ts b/src/core/server/config/schema/types/any_type.test.ts similarity index 98% rename from src/core/server/config/schema/types/__tests__/any_type.test.ts rename to src/core/server/config/schema/types/any_type.test.ts index 6f39f3deab5fd2..4d68c860ba13d3 100644 --- a/src/core/server/config/schema/types/__tests__/any_type.test.ts +++ b/src/core/server/config/schema/types/any_type.test.ts @@ -17,7 +17,7 @@ * under the License. */ -import { schema } from '../..'; +import { schema } from '..'; test('works for any value', () => { expect(schema.any().validate(true)).toBe(true); diff --git a/src/core/server/config/schema/types/__tests__/array_type.test.ts b/src/core/server/config/schema/types/array_type.test.ts similarity index 99% rename from src/core/server/config/schema/types/__tests__/array_type.test.ts rename to src/core/server/config/schema/types/array_type.test.ts index f1fb124a95ede0..c6943e0d1b5f39 100644 --- a/src/core/server/config/schema/types/__tests__/array_type.test.ts +++ b/src/core/server/config/schema/types/array_type.test.ts @@ -17,7 +17,7 @@ * under the License. */ -import { schema } from '../..'; +import { schema } from '..'; test('returns value if it matches the type', () => { const type = schema.arrayOf(schema.string()); diff --git a/src/core/server/config/schema/types/__tests__/boolean_type.test.ts b/src/core/server/config/schema/types/boolean_type.test.ts similarity index 98% rename from src/core/server/config/schema/types/__tests__/boolean_type.test.ts rename to src/core/server/config/schema/types/boolean_type.test.ts index bfd4259af387ea..d6e274f05e3ffa 100644 --- a/src/core/server/config/schema/types/__tests__/boolean_type.test.ts +++ b/src/core/server/config/schema/types/boolean_type.test.ts @@ -17,7 +17,7 @@ * under the License. */ -import { schema } from '../..'; +import { schema } from '..'; test('returns value by default', () => { expect(schema.boolean().validate(true)).toBe(true); diff --git a/src/core/server/config/schema/types/__tests__/byte_size_type.test.ts b/src/core/server/config/schema/types/byte_size_type.test.ts similarity index 97% rename from src/core/server/config/schema/types/__tests__/byte_size_type.test.ts rename to src/core/server/config/schema/types/byte_size_type.test.ts index 786b996ae5687a..67eae1e7c382a6 100644 --- a/src/core/server/config/schema/types/__tests__/byte_size_type.test.ts +++ b/src/core/server/config/schema/types/byte_size_type.test.ts @@ -17,8 +17,8 @@ * under the License. */ -import { schema } from '../..'; -import { ByteSizeValue } from '../../byte_size_value'; +import { schema } from '..'; +import { ByteSizeValue } from '../byte_size_value'; const { byteSize } = schema; diff --git a/src/core/server/config/schema/types/__tests__/conditional_type.test.ts b/src/core/server/config/schema/types/conditional_type.test.ts similarity index 99% rename from src/core/server/config/schema/types/__tests__/conditional_type.test.ts rename to src/core/server/config/schema/types/conditional_type.test.ts index 112ee874afa7b9..a72c3463e00cb1 100644 --- a/src/core/server/config/schema/types/__tests__/conditional_type.test.ts +++ b/src/core/server/config/schema/types/conditional_type.test.ts @@ -17,7 +17,7 @@ * under the License. */ -import { schema } from '../..'; +import { schema } from '..'; test('required by default', () => { const type = schema.conditional( diff --git a/src/core/server/config/schema/types/__tests__/duration_type.test.ts b/src/core/server/config/schema/types/duration_type.test.ts similarity index 98% rename from src/core/server/config/schema/types/__tests__/duration_type.test.ts rename to src/core/server/config/schema/types/duration_type.test.ts index 0c1d7e4dd8e508..9a21afc6cf40ff 100644 --- a/src/core/server/config/schema/types/__tests__/duration_type.test.ts +++ b/src/core/server/config/schema/types/duration_type.test.ts @@ -18,7 +18,7 @@ */ import { duration as momentDuration } from 'moment'; -import { schema } from '../..'; +import { schema } from '..'; const { duration } = schema; diff --git a/src/core/server/config/schema/types/__tests__/literal_type.test.ts b/src/core/server/config/schema/types/literal_type.test.ts similarity index 98% rename from src/core/server/config/schema/types/__tests__/literal_type.test.ts rename to src/core/server/config/schema/types/literal_type.test.ts index 4d590200c1ccf7..5ee0ac4edff688 100644 --- a/src/core/server/config/schema/types/__tests__/literal_type.test.ts +++ b/src/core/server/config/schema/types/literal_type.test.ts @@ -17,7 +17,7 @@ * under the License. */ -import { schema } from '../..'; +import { schema } from '..'; const { literal } = schema; diff --git a/src/core/server/config/schema/types/__tests__/map_of_type.test.ts b/src/core/server/config/schema/types/map_of_type.test.ts similarity index 98% rename from src/core/server/config/schema/types/__tests__/map_of_type.test.ts rename to src/core/server/config/schema/types/map_of_type.test.ts index ed4e12f162c59f..1b72d39fcec263 100644 --- a/src/core/server/config/schema/types/__tests__/map_of_type.test.ts +++ b/src/core/server/config/schema/types/map_of_type.test.ts @@ -17,7 +17,7 @@ * under the License. */ -import { schema } from '../..'; +import { schema } from '..'; test('handles object as input', () => { const type = schema.mapOf(schema.string(), schema.string()); diff --git a/src/core/server/config/schema/types/__tests__/maybe_type.test.ts b/src/core/server/config/schema/types/maybe_type.test.ts similarity index 98% rename from src/core/server/config/schema/types/__tests__/maybe_type.test.ts rename to src/core/server/config/schema/types/maybe_type.test.ts index 950987763baf19..b29f504c03b322 100644 --- a/src/core/server/config/schema/types/__tests__/maybe_type.test.ts +++ b/src/core/server/config/schema/types/maybe_type.test.ts @@ -17,7 +17,7 @@ * under the License. */ -import { schema } from '../..'; +import { schema } from '..'; test('returns value if specified', () => { const type = schema.maybe(schema.string()); diff --git a/src/core/server/config/schema/types/__tests__/number_type.test.ts b/src/core/server/config/schema/types/number_type.test.ts similarity index 98% rename from src/core/server/config/schema/types/__tests__/number_type.test.ts rename to src/core/server/config/schema/types/number_type.test.ts index dd6be2631d28cf..b85d5113563eb6 100644 --- a/src/core/server/config/schema/types/__tests__/number_type.test.ts +++ b/src/core/server/config/schema/types/number_type.test.ts @@ -17,7 +17,7 @@ * under the License. */ -import { schema } from '../..'; +import { schema } from '..'; test('returns value by default', () => { expect(schema.number().validate(4)).toBe(4); diff --git a/src/core/server/config/schema/types/__tests__/object_type.test.ts b/src/core/server/config/schema/types/object_type.test.ts similarity index 99% rename from src/core/server/config/schema/types/__tests__/object_type.test.ts rename to src/core/server/config/schema/types/object_type.test.ts index ec54528c292a05..e0eaabadb8ef59 100644 --- a/src/core/server/config/schema/types/__tests__/object_type.test.ts +++ b/src/core/server/config/schema/types/object_type.test.ts @@ -17,7 +17,7 @@ * under the License. */ -import { schema } from '../..'; +import { schema } from '..'; test('returns value by default', () => { const type = schema.object({ diff --git a/src/core/server/config/schema/types/__tests__/one_of_type.test.ts b/src/core/server/config/schema/types/one_of_type.test.ts similarity index 99% rename from src/core/server/config/schema/types/__tests__/one_of_type.test.ts rename to src/core/server/config/schema/types/one_of_type.test.ts index e2f0f9688544af..72119e761590b1 100644 --- a/src/core/server/config/schema/types/__tests__/one_of_type.test.ts +++ b/src/core/server/config/schema/types/one_of_type.test.ts @@ -17,7 +17,7 @@ * under the License. */ -import { schema } from '../..'; +import { schema } from '..'; test('handles string', () => { expect(schema.oneOf([schema.string()]).validate('test')).toBe('test'); diff --git a/src/core/server/config/schema/types/__tests__/string_type.test.ts b/src/core/server/config/schema/types/string_type.test.ts similarity index 99% rename from src/core/server/config/schema/types/__tests__/string_type.test.ts rename to src/core/server/config/schema/types/string_type.test.ts index f9415a0ac2506f..193d85d2907310 100644 --- a/src/core/server/config/schema/types/__tests__/string_type.test.ts +++ b/src/core/server/config/schema/types/string_type.test.ts @@ -17,7 +17,7 @@ * under the License. */ -import { schema } from '../..'; +import { schema } from '..'; test('returns value is string and defined', () => { expect(schema.string().validate('test')).toBe('test'); diff --git a/src/core/server/http/__tests__/__snapshots__/http_config.test.ts.snap b/src/core/server/http/__snapshots__/http_config.test.ts.snap similarity index 100% rename from src/core/server/http/__tests__/__snapshots__/http_config.test.ts.snap rename to src/core/server/http/__snapshots__/http_config.test.ts.snap diff --git a/src/core/server/http/__tests__/__snapshots__/http_server.test.ts.snap b/src/core/server/http/__snapshots__/http_server.test.ts.snap similarity index 100% rename from src/core/server/http/__tests__/__snapshots__/http_server.test.ts.snap rename to src/core/server/http/__snapshots__/http_server.test.ts.snap diff --git a/src/core/server/http/__tests__/__snapshots__/http_service.test.ts.snap b/src/core/server/http/__snapshots__/http_service.test.ts.snap similarity index 100% rename from src/core/server/http/__tests__/__snapshots__/http_service.test.ts.snap rename to src/core/server/http/__snapshots__/http_service.test.ts.snap diff --git a/src/core/server/http/__tests__/__snapshots__/https_redirect_server.test.ts.snap b/src/core/server/http/__snapshots__/https_redirect_server.test.ts.snap similarity index 100% rename from src/core/server/http/__tests__/__snapshots__/https_redirect_server.test.ts.snap rename to src/core/server/http/__snapshots__/https_redirect_server.test.ts.snap diff --git a/src/core/server/http/__tests__/http_config.test.ts b/src/core/server/http/http_config.test.ts similarity index 99% rename from src/core/server/http/__tests__/http_config.test.ts rename to src/core/server/http/http_config.test.ts index 45bd8962fc0df5..54d28ef921fcfd 100644 --- a/src/core/server/http/__tests__/http_config.test.ts +++ b/src/core/server/http/http_config.test.ts @@ -17,7 +17,7 @@ * under the License. */ -import { HttpConfig } from '../http_config'; +import { HttpConfig } from '.'; test('has defaults for config', () => { const httpSchema = HttpConfig.schema; diff --git a/src/core/server/http/__tests__/http_server.test.ts b/src/core/server/http/http_server.test.ts similarity index 98% rename from src/core/server/http/__tests__/http_server.test.ts rename to src/core/server/http/http_server.test.ts index 42f93a13e1c804..704a6ddf97abae 100644 --- a/src/core/server/http/__tests__/http_server.test.ts +++ b/src/core/server/http/http_server.test.ts @@ -26,11 +26,10 @@ jest.mock('fs', () => ({ import Chance from 'chance'; import supertest from 'supertest'; -import { ByteSizeValue } from '../../config/schema'; -import { logger } from '../../logging/__mocks__'; -import { HttpConfig } from '../http_config'; -import { HttpServer } from '../http_server'; -import { Router } from '../router'; +import { HttpConfig, Router } from '.'; +import { ByteSizeValue } from '../config/schema'; +import { logger } from '../logging/__mocks__'; +import { HttpServer } from './http_server'; const chance = new Chance(); diff --git a/src/core/server/http/__tests__/http_service.test.ts b/src/core/server/http/http_service.test.ts similarity index 95% rename from src/core/server/http/__tests__/http_service.test.ts rename to src/core/server/http/http_service.test.ts index 1c6d2598481177..a42ac26745c605 100644 --- a/src/core/server/http/__tests__/http_service.test.ts +++ b/src/core/server/http/http_service.test.ts @@ -19,16 +19,14 @@ const mockHttpServer = jest.fn(); -jest.mock('../http_server', () => ({ +jest.mock('./http_server', () => ({ HttpServer: mockHttpServer, })); import { noop } from 'lodash'; import { BehaviorSubject } from 'rxjs'; -import { logger } from '../../logging/__mocks__'; -import { HttpConfig } from '../http_config'; -import { HttpService } from '../http_service'; -import { Router } from '../router'; +import { HttpConfig, HttpService, Router } from '.'; +import { logger } from '../logging/__mocks__'; beforeEach(() => { logger.mockClear(); diff --git a/src/core/server/http/__tests__/https_redirect_server.test.ts b/src/core/server/http/https_redirect_server.test.ts similarity index 92% rename from src/core/server/http/__tests__/https_redirect_server.test.ts rename to src/core/server/http/https_redirect_server.test.ts index c92691a679ef06..6d9443335a62b6 100644 --- a/src/core/server/http/__tests__/https_redirect_server.test.ts +++ b/src/core/server/http/https_redirect_server.test.ts @@ -25,10 +25,10 @@ import Chance from 'chance'; import { Server } from 'http'; import supertest from 'supertest'; -import { ByteSizeValue } from '../../config/schema'; -import { logger } from '../../logging/__mocks__'; -import { HttpConfig } from '../http_config'; -import { HttpsRedirectServer } from '../https_redirect_server'; +import { HttpConfig } from '.'; +import { ByteSizeValue } from '../config/schema'; +import { logger } from '../logging/__mocks__'; +import { HttpsRedirectServer } from './https_redirect_server'; const chance = new Chance(); diff --git a/src/core/server/index.test.ts b/src/core/server/index.test.ts index 8a83d8d500b814..d6bd19d36ce3c0 100644 --- a/src/core/server/index.test.ts +++ b/src/core/server/index.test.ts @@ -30,7 +30,7 @@ jest.mock('./legacy_compat/legacy_service', () => ({ import { BehaviorSubject } from 'rxjs'; import { Server } from '.'; import { Env } from './config'; -import { getEnvOptions } from './config/__tests__/__mocks__/env'; +import { getEnvOptions } from './config/__mocks__/env'; import { logger } from './logging/__mocks__'; const mockConfigService = { atPath: jest.fn(), getUnusedPaths: jest.fn().mockReturnValue([]) }; diff --git a/src/core/server/legacy_compat/__tests__/__snapshots__/legacy_service.test.ts.snap b/src/core/server/legacy_compat/__snapshots__/legacy_service.test.ts.snap similarity index 100% rename from src/core/server/legacy_compat/__tests__/__snapshots__/legacy_service.test.ts.snap rename to src/core/server/legacy_compat/__snapshots__/legacy_service.test.ts.snap diff --git a/src/core/server/legacy_compat/config/__tests__/__snapshots__/legacy_object_to_config_adapter.test.ts.snap b/src/core/server/legacy_compat/config/__snapshots__/legacy_object_to_config_adapter.test.ts.snap similarity index 100% rename from src/core/server/legacy_compat/config/__tests__/__snapshots__/legacy_object_to_config_adapter.test.ts.snap rename to src/core/server/legacy_compat/config/__snapshots__/legacy_object_to_config_adapter.test.ts.snap diff --git a/src/core/server/legacy_compat/config/__tests__/legacy_object_to_config_adapter.test.ts b/src/core/server/legacy_compat/config/legacy_object_to_config_adapter.test.ts similarity index 98% rename from src/core/server/legacy_compat/config/__tests__/legacy_object_to_config_adapter.test.ts rename to src/core/server/legacy_compat/config/legacy_object_to_config_adapter.test.ts index b465a55be42432..afa3cf03fe9a9d 100644 --- a/src/core/server/legacy_compat/config/__tests__/legacy_object_to_config_adapter.test.ts +++ b/src/core/server/legacy_compat/config/legacy_object_to_config_adapter.test.ts @@ -17,7 +17,7 @@ * under the License. */ -import { LegacyObjectToConfigAdapter } from '../legacy_object_to_config_adapter'; +import { LegacyObjectToConfigAdapter } from './legacy_object_to_config_adapter'; describe('#get', () => { test('correctly handles paths that do not exist.', () => { diff --git a/src/core/server/legacy_compat/__tests__/legacy_platform_proxy.test.ts b/src/core/server/legacy_compat/legacy_platform_proxy.test.ts similarity index 98% rename from src/core/server/legacy_compat/__tests__/legacy_platform_proxy.test.ts rename to src/core/server/legacy_compat/legacy_platform_proxy.test.ts index 8330bbb8d74db5..cc7436ce32170a 100644 --- a/src/core/server/legacy_compat/__tests__/legacy_platform_proxy.test.ts +++ b/src/core/server/legacy_compat/legacy_platform_proxy.test.ts @@ -19,7 +19,7 @@ import { Server } from 'net'; -import { LegacyPlatformProxy } from '../legacy_platform_proxy'; +import { LegacyPlatformProxy } from './legacy_platform_proxy'; let server: jest.Mocked; let proxy: LegacyPlatformProxy; diff --git a/src/core/server/legacy_compat/__tests__/legacy_service.test.ts b/src/core/server/legacy_compat/legacy_service.test.ts similarity index 95% rename from src/core/server/legacy_compat/__tests__/legacy_service.test.ts rename to src/core/server/legacy_compat/legacy_service.test.ts index dc16709861084a..70c71e3b4b0b84 100644 --- a/src/core/server/legacy_compat/__tests__/legacy_service.test.ts +++ b/src/core/server/legacy_compat/legacy_service.test.ts @@ -19,20 +19,20 @@ import { BehaviorSubject, Subject, throwError } from 'rxjs'; -jest.mock('../legacy_platform_proxy'); -jest.mock('../../../../server/kbn_server'); -jest.mock('../../../../cli/cluster/cluster_manager'); +jest.mock('./legacy_platform_proxy'); +jest.mock('../../../server/kbn_server'); +jest.mock('../../../cli/cluster/cluster_manager'); import { first } from 'rxjs/operators'; +import { LegacyService } from '.'; // @ts-ignore: implicit any for JS file -import MockClusterManager from '../../../../cli/cluster/cluster_manager'; +import MockClusterManager from '../../../cli/cluster/cluster_manager'; // @ts-ignore: implicit any for JS file -import MockKbnServer from '../../../../server/kbn_server'; -import { Config, ConfigService, Env, ObjectToConfigAdapter } from '../../config'; -import { getEnvOptions } from '../../config/__tests__/__mocks__/env'; -import { logger } from '../../logging/__mocks__'; -import { LegacyPlatformProxy } from '../legacy_platform_proxy'; -import { LegacyService } from '../legacy_service'; +import MockKbnServer from '../../../server/kbn_server'; +import { Config, ConfigService, Env, ObjectToConfigAdapter } from '../config'; +import { getEnvOptions } from '../config/__mocks__/env'; +import { logger } from '../logging/__mocks__'; +import { LegacyPlatformProxy } from './legacy_platform_proxy'; const MockLegacyPlatformProxy: jest.Mock = LegacyPlatformProxy as any; diff --git a/src/core/server/legacy_compat/logging/appenders/__tests__/__snapshots__/legacy_appender.test.ts.snap b/src/core/server/legacy_compat/logging/appenders/__snapshots__/legacy_appender.test.ts.snap similarity index 100% rename from src/core/server/legacy_compat/logging/appenders/__tests__/__snapshots__/legacy_appender.test.ts.snap rename to src/core/server/legacy_compat/logging/appenders/__snapshots__/legacy_appender.test.ts.snap diff --git a/src/core/server/legacy_compat/logging/appenders/__tests__/legacy_appender.test.ts b/src/core/server/legacy_compat/logging/appenders/legacy_appender.test.ts similarity index 93% rename from src/core/server/legacy_compat/logging/appenders/__tests__/legacy_appender.test.ts rename to src/core/server/legacy_compat/logging/appenders/legacy_appender.test.ts index 5f62a853666d9c..adc5dcae3ec9d3 100644 --- a/src/core/server/legacy_compat/logging/appenders/__tests__/legacy_appender.test.ts +++ b/src/core/server/legacy_compat/logging/appenders/legacy_appender.test.ts @@ -17,12 +17,12 @@ * under the License. */ -jest.mock('../../legacy_logging_server'); +jest.mock('../legacy_logging_server'); -import { LogLevel } from '../../../../logging/log_level'; -import { LogRecord } from '../../../../logging/log_record'; -import { LegacyLoggingServer } from '../../legacy_logging_server'; -import { LegacyAppender } from '../legacy_appender'; +import { LogLevel } from '../../../logging/log_level'; +import { LogRecord } from '../../../logging/log_record'; +import { LegacyLoggingServer } from '../legacy_logging_server'; +import { LegacyAppender } from './legacy_appender'; afterEach(() => (LegacyLoggingServer as any).mockClear()); diff --git a/src/core/server/logging/__tests__/__snapshots__/logging_config.test.ts.snap b/src/core/server/logging/__snapshots__/logging_config.test.ts.snap similarity index 100% rename from src/core/server/logging/__tests__/__snapshots__/logging_config.test.ts.snap rename to src/core/server/logging/__snapshots__/logging_config.test.ts.snap diff --git a/src/core/server/logging/__tests__/__snapshots__/logging_service.test.ts.snap b/src/core/server/logging/__snapshots__/logging_service.test.ts.snap similarity index 100% rename from src/core/server/logging/__tests__/__snapshots__/logging_service.test.ts.snap rename to src/core/server/logging/__snapshots__/logging_service.test.ts.snap diff --git a/src/core/server/logging/appenders/__tests__/appenders.test.ts b/src/core/server/logging/appenders/appenders.test.ts similarity index 88% rename from src/core/server/logging/appenders/__tests__/appenders.test.ts rename to src/core/server/logging/appenders/appenders.test.ts index f141de991f453d..2103f9d8187b2a 100644 --- a/src/core/server/logging/appenders/__tests__/appenders.test.ts +++ b/src/core/server/logging/appenders/appenders.test.ts @@ -18,8 +18,8 @@ */ const mockCreateLayout = jest.fn(); -jest.mock('../../layouts/layouts', () => { - const { schema } = require('../../../config/schema'); +jest.mock('../layouts/layouts', () => { + const { schema } = require('../../config/schema'); return { Layouts: { configSchema: schema.object({ kind: schema.literal('mock') }), @@ -28,10 +28,10 @@ jest.mock('../../layouts/layouts', () => { }; }); -import { LegacyAppender } from '../../../legacy_compat/logging/appenders/legacy_appender'; -import { Appenders } from '../appenders'; -import { ConsoleAppender } from '../console/console_appender'; -import { FileAppender } from '../file/file_appender'; +import { LegacyAppender } from '../../legacy_compat/logging/appenders/legacy_appender'; +import { Appenders } from './appenders'; +import { ConsoleAppender } from './console/console_appender'; +import { FileAppender } from './file/file_appender'; beforeEach(() => { mockCreateLayout.mockReset(); diff --git a/src/core/server/logging/appenders/__tests__/buffer_appender.test.ts b/src/core/server/logging/appenders/buffer/buffer_appender.test.ts similarity index 97% rename from src/core/server/logging/appenders/__tests__/buffer_appender.test.ts rename to src/core/server/logging/appenders/buffer/buffer_appender.test.ts index cdf2714f44e298..453a29271c5821 100644 --- a/src/core/server/logging/appenders/__tests__/buffer_appender.test.ts +++ b/src/core/server/logging/appenders/buffer/buffer_appender.test.ts @@ -19,7 +19,7 @@ import { LogLevel } from '../../log_level'; import { LogRecord } from '../../log_record'; -import { BufferAppender } from '../buffer/buffer_appender'; +import { BufferAppender } from './buffer_appender'; test('`flush()` does not return any record buffered at the beginning.', () => { const appender = new BufferAppender(); diff --git a/src/core/server/logging/appenders/__tests__/console_appender.test.ts b/src/core/server/logging/appenders/console/console_appender.test.ts similarity index 97% rename from src/core/server/logging/appenders/__tests__/console_appender.test.ts rename to src/core/server/logging/appenders/console/console_appender.test.ts index 35128bd6ba1fdb..fc885e5f58a119 100644 --- a/src/core/server/logging/appenders/__tests__/console_appender.test.ts +++ b/src/core/server/logging/appenders/console/console_appender.test.ts @@ -30,7 +30,7 @@ jest.mock('../../layouts/layouts', () => { import { LogLevel } from '../../log_level'; import { LogRecord } from '../../log_record'; -import { ConsoleAppender } from '../console/console_appender'; +import { ConsoleAppender } from './console_appender'; test('`configSchema` creates correct schema.', () => { const appenderSchema = ConsoleAppender.configSchema; diff --git a/src/core/server/logging/appenders/__tests__/file_appender.test.ts b/src/core/server/logging/appenders/file/file_appender.test.ts similarity index 98% rename from src/core/server/logging/appenders/__tests__/file_appender.test.ts rename to src/core/server/logging/appenders/file/file_appender.test.ts index 69b4980dff1f01..cc8f0196bff7c2 100644 --- a/src/core/server/logging/appenders/__tests__/file_appender.test.ts +++ b/src/core/server/logging/appenders/file/file_appender.test.ts @@ -33,7 +33,7 @@ jest.mock('fs', () => ({ createWriteStream: mockCreateWriteStream })); import { LogLevel } from '../../log_level'; import { LogRecord } from '../../log_record'; -import { FileAppender } from '../file/file_appender'; +import { FileAppender } from './file_appender'; const tickMs = (ms: number) => new Promise(resolve => setTimeout(resolve, ms)); diff --git a/src/core/server/logging/layouts/__tests__/__snapshots__/json_layout.test.ts.snap b/src/core/server/logging/layouts/__snapshots__/json_layout.test.ts.snap similarity index 100% rename from src/core/server/logging/layouts/__tests__/__snapshots__/json_layout.test.ts.snap rename to src/core/server/logging/layouts/__snapshots__/json_layout.test.ts.snap diff --git a/src/core/server/logging/layouts/__tests__/__snapshots__/pattern_layout.test.ts.snap b/src/core/server/logging/layouts/__snapshots__/pattern_layout.test.ts.snap similarity index 100% rename from src/core/server/logging/layouts/__tests__/__snapshots__/pattern_layout.test.ts.snap rename to src/core/server/logging/layouts/__snapshots__/pattern_layout.test.ts.snap diff --git a/src/core/server/logging/layouts/__tests__/json_layout.test.ts b/src/core/server/logging/layouts/json_layout.test.ts similarity index 94% rename from src/core/server/logging/layouts/__tests__/json_layout.test.ts rename to src/core/server/logging/layouts/json_layout.test.ts index ec94d023b2d64f..49b8ddef07a63c 100644 --- a/src/core/server/logging/layouts/__tests__/json_layout.test.ts +++ b/src/core/server/logging/layouts/json_layout.test.ts @@ -17,9 +17,9 @@ * under the License. */ -import { LogLevel } from '../../log_level'; -import { LogRecord } from '../../log_record'; -import { JsonLayout } from '../json_layout'; +import { LogLevel } from '../log_level'; +import { LogRecord } from '../log_record'; +import { JsonLayout } from './json_layout'; const records: LogRecord[] = [ { diff --git a/src/core/server/logging/layouts/__tests__/layouts.test.ts b/src/core/server/logging/layouts/layouts.test.ts similarity index 93% rename from src/core/server/logging/layouts/__tests__/layouts.test.ts rename to src/core/server/logging/layouts/layouts.test.ts index ca70710233fee3..aa1c54c846bc66 100644 --- a/src/core/server/logging/layouts/__tests__/layouts.test.ts +++ b/src/core/server/logging/layouts/layouts.test.ts @@ -17,9 +17,9 @@ * under the License. */ -import { JsonLayout } from '../json_layout'; -import { Layouts } from '../layouts'; -import { PatternLayout } from '../pattern_layout'; +import { JsonLayout } from './json_layout'; +import { Layouts } from './layouts'; +import { PatternLayout } from './pattern_layout'; test('`configSchema` creates correct schema for `pattern` layout.', () => { const layoutsSchema = Layouts.configSchema; diff --git a/src/core/server/logging/layouts/__tests__/pattern_layout.test.ts b/src/core/server/logging/layouts/pattern_layout.test.ts similarity index 93% rename from src/core/server/logging/layouts/__tests__/pattern_layout.test.ts rename to src/core/server/logging/layouts/pattern_layout.test.ts index 4e6ddf2c097ed1..ae8b39b9cc99ae 100644 --- a/src/core/server/logging/layouts/__tests__/pattern_layout.test.ts +++ b/src/core/server/logging/layouts/pattern_layout.test.ts @@ -17,10 +17,10 @@ * under the License. */ -import { stripAnsiSnapshotSerializer } from '../../../../test_helpers/strip_ansi_snapshot_serializer'; -import { LogLevel } from '../../log_level'; -import { LogRecord } from '../../log_record'; -import { PatternLayout } from '../pattern_layout'; +import { stripAnsiSnapshotSerializer } from '../../../test_helpers/strip_ansi_snapshot_serializer'; +import { LogLevel } from '../log_level'; +import { LogRecord } from '../log_record'; +import { PatternLayout } from './pattern_layout'; const records: LogRecord[] = [ { diff --git a/src/core/server/logging/__tests__/log_level.test.ts b/src/core/server/logging/log_level.test.ts similarity index 98% rename from src/core/server/logging/__tests__/log_level.test.ts rename to src/core/server/logging/log_level.test.ts index 43de344b34cffb..1f86cf21037a6f 100644 --- a/src/core/server/logging/__tests__/log_level.test.ts +++ b/src/core/server/logging/log_level.test.ts @@ -17,7 +17,7 @@ * under the License. */ -import { LogLevel } from '../log_level'; +import { LogLevel } from './log_level'; const allLogLevels = [ LogLevel.Off, diff --git a/src/core/server/logging/__tests__/logger.test.ts b/src/core/server/logging/logger.test.ts similarity index 98% rename from src/core/server/logging/__tests__/logger.test.ts rename to src/core/server/logging/logger.test.ts index 2dc16178fb47b9..61eaa4912185b3 100644 --- a/src/core/server/logging/__tests__/logger.test.ts +++ b/src/core/server/logging/logger.test.ts @@ -17,10 +17,10 @@ * under the License. */ -import { Appender } from '../appenders/appenders'; -import { LogLevel } from '../log_level'; -import { BaseLogger } from '../logger'; -import { LoggingConfig } from '../logging_config'; +import { LoggingConfig } from '.'; +import { Appender } from './appenders/appenders'; +import { LogLevel } from './log_level'; +import { BaseLogger } from './logger'; const context = LoggingConfig.getLoggerContext(['context', 'parent', 'child']); let appenderMocks: Appender[]; diff --git a/src/core/server/logging/__tests__/logger_adapter.test.ts b/src/core/server/logging/logger_adapter.test.ts similarity index 97% rename from src/core/server/logging/__tests__/logger_adapter.test.ts rename to src/core/server/logging/logger_adapter.test.ts index 25a9c01b108d69..075e8f4d47ffe1 100644 --- a/src/core/server/logging/__tests__/logger_adapter.test.ts +++ b/src/core/server/logging/logger_adapter.test.ts @@ -17,8 +17,8 @@ * under the License. */ -import { Logger } from '../logger'; -import { LoggerAdapter } from '../logger_adapter'; +import { Logger } from '.'; +import { LoggerAdapter } from './logger_adapter'; test('proxies all method calls to the internal logger.', () => { const internalLogger: Logger = { diff --git a/src/core/server/logging/__tests__/logging_config.test.ts b/src/core/server/logging/logging_config.test.ts similarity index 98% rename from src/core/server/logging/__tests__/logging_config.test.ts rename to src/core/server/logging/logging_config.test.ts index 2f1f1d9f2f7c02..f21b5aaf3c1a72 100644 --- a/src/core/server/logging/__tests__/logging_config.test.ts +++ b/src/core/server/logging/logging_config.test.ts @@ -17,7 +17,7 @@ * under the License. */ -import { LoggingConfig } from '../logging_config'; +import { LoggingConfig } from '.'; test('`schema` creates correct schema with defaults.', () => { const loggingConfigSchema = LoggingConfig.schema; diff --git a/src/core/server/logging/__tests__/logging_service.test.ts b/src/core/server/logging/logging_service.test.ts similarity index 98% rename from src/core/server/logging/__tests__/logging_service.test.ts rename to src/core/server/logging/logging_service.test.ts index eb452376d6ccc0..b6aeb88b500523 100644 --- a/src/core/server/logging/__tests__/logging_service.test.ts +++ b/src/core/server/logging/logging_service.test.ts @@ -32,8 +32,7 @@ jest.spyOn(global, 'Date').mockImplementation(() => timestamp); import { createWriteStream } from 'fs'; const mockCreateWriteStream = createWriteStream as jest.Mock; -import { LoggingConfig } from '../logging_config'; -import { LoggingService } from '../logging_service'; +import { LoggingConfig, LoggingService } from '.'; let service: LoggingService; beforeEach(() => (service = new LoggingService())); diff --git a/src/core/server/root/__tests__/__snapshots__/index.test.ts.snap b/src/core/server/root/__snapshots__/index.test.ts.snap similarity index 100% rename from src/core/server/root/__tests__/__snapshots__/index.test.ts.snap rename to src/core/server/root/__snapshots__/index.test.ts.snap diff --git a/src/core/server/root/__tests__/index.test.ts b/src/core/server/root/index.test.ts similarity index 95% rename from src/core/server/root/__tests__/index.test.ts rename to src/core/server/root/index.test.ts index 851e7c9dca85ed..97308ef484f4f9 100644 --- a/src/core/server/root/__tests__/index.test.ts +++ b/src/core/server/root/index.test.ts @@ -18,24 +18,24 @@ */ const mockLoggingService = { asLoggerFactory: jest.fn(), upgrade: jest.fn(), stop: jest.fn() }; -jest.mock('../../logging', () => ({ +jest.mock('../logging', () => ({ LoggingService: jest.fn(() => mockLoggingService), })); const mockConfigService = { atPath: jest.fn() }; -jest.mock('../../config/config_service', () => ({ +jest.mock('../config/config_service', () => ({ ConfigService: jest.fn(() => mockConfigService), })); const mockServer = { start: jest.fn(), stop: jest.fn() }; -jest.mock('../../', () => ({ Server: jest.fn(() => mockServer) })); +jest.mock('../', () => ({ Server: jest.fn(() => mockServer) })); import { BehaviorSubject } from 'rxjs'; import { filter, first } from 'rxjs/operators'; -import { Root } from '../'; -import { Config, Env } from '../../config'; -import { getEnvOptions } from '../../config/__tests__/__mocks__/env'; -import { logger } from '../../logging/__mocks__'; +import { Root } from '.'; +import { Config, Env } from '../config'; +import { getEnvOptions } from '../config/__mocks__/env'; +import { logger } from '../logging/__mocks__'; const env = new Env('.', getEnvOptions()); const config$ = new BehaviorSubject({} as Config); diff --git a/src/core/utils/__tests__/__snapshots__/get.test.ts.snap b/src/core/utils/__snapshots__/get.test.ts.snap similarity index 100% rename from src/core/utils/__tests__/__snapshots__/get.test.ts.snap rename to src/core/utils/__snapshots__/get.test.ts.snap diff --git a/src/core/utils/__tests__/get.test.ts b/src/core/utils/get.test.ts similarity index 97% rename from src/core/utils/__tests__/get.test.ts rename to src/core/utils/get.test.ts index a93ad6f6d708eb..f409638b5d4915 100644 --- a/src/core/utils/__tests__/get.test.ts +++ b/src/core/utils/get.test.ts @@ -17,7 +17,7 @@ * under the License. */ -import { get } from '../get'; +import { get } from './get'; const obj = { bar: { diff --git a/src/core/utils/__tests__/url.test.ts b/src/core/utils/url.test.ts similarity index 98% rename from src/core/utils/__tests__/url.test.ts rename to src/core/utils/url.test.ts index 6ff3a75d6e725f..f890b2ec13db3e 100644 --- a/src/core/utils/__tests__/url.test.ts +++ b/src/core/utils/url.test.ts @@ -17,7 +17,7 @@ * under the License. */ -import { modifyUrl } from '../url'; +import { modifyUrl } from './url'; describe('modifyUrl()', () => { test('throws an error with invalid input', () => {