From 0ff038dc1c89171fac6c878fd615937014548a52 Mon Sep 17 00:00:00 2001 From: Spencer Date: Thu, 10 Dec 2020 11:47:32 -0700 Subject: [PATCH] [7.10] [mocha] find tests in ts files too (#85515) (#85609) Co-authored-by: Spencer Alger Co-authored-by: Tyler Smalley Co-authored-by: Spencer Alger Co-authored-by: Tyler Smalley --- .../__tests__/index_doc_records_stream.ts | 5 +++++ src/dev/mocha/run_mocha_cli.js | 19 ++++++++++--------- .../api/console/proxy/tests}/body.test.ts | 6 +++--- .../api/console/proxy/tests}/headers.test.ts | 10 +++++----- .../api/console/proxy/tests}/mocks.ts | 10 +++++----- .../api/console/proxy/tests}/params.test.ts | 6 +++--- .../proxy/tests}/proxy_fallback.test.ts | 6 +++--- .../console/proxy/tests}/query_string.test.ts | 6 +++--- .../proxy/tests}/route_validation.test.ts | 2 +- .../api/console/proxy/tests}/stubs.ts | 0 10 files changed, 38 insertions(+), 32 deletions(-) rename src/plugins/console/server/{__tests__/proxy_route => routes/api/console/proxy/tests}/body.test.ts (94%) rename src/plugins/console/server/{__tests__/proxy_route => routes/api/console/proxy/tests}/headers.test.ts (88%) rename src/plugins/console/server/{__tests__/proxy_route => routes/api/console/proxy/tests}/mocks.ts (86%) rename src/plugins/console/server/{__tests__/proxy_route => routes/api/console/proxy/tests}/params.test.ts (93%) rename src/plugins/console/server/{__tests__/proxy_route => routes/api/console/proxy/tests}/proxy_fallback.test.ts (91%) rename src/plugins/console/server/{__tests__/proxy_route => routes/api/console/proxy/tests}/query_string.test.ts (93%) rename src/plugins/console/server/{__tests__/proxy_route => routes/api/console/proxy/tests}/route_validation.test.ts (95%) rename src/plugins/console/server/{__tests__/proxy_route => routes/api/console/proxy/tests}/stubs.ts (100%) diff --git a/packages/kbn-es-archiver/src/lib/docs/__tests__/index_doc_records_stream.ts b/packages/kbn-es-archiver/src/lib/docs/__tests__/index_doc_records_stream.ts index 3205549bf97c7..08bf7f28a44fe 100644 --- a/packages/kbn-es-archiver/src/lib/docs/__tests__/index_doc_records_stream.ts +++ b/packages/kbn-es-archiver/src/lib/docs/__tests__/index_doc_records_stream.ts @@ -42,6 +42,7 @@ describe('esArchiver: createIndexDocRecordsStream()', () => { expect(name).to.be('bulk'); expect(params).to.eql({ body: recordsToBulkBody(records), + requestTimeout: 120000, }); return { ok: true }; }, @@ -66,6 +67,7 @@ describe('esArchiver: createIndexDocRecordsStream()', () => { expect(name).to.be('bulk'); expect(params).to.eql({ body: recordsToBulkBody(records.slice(0, 1)), + requestTimeout: 120000, }); return { ok: true }; }, @@ -73,6 +75,7 @@ describe('esArchiver: createIndexDocRecordsStream()', () => { expect(name).to.be('bulk'); expect(params).to.eql({ body: recordsToBulkBody(records.slice(1)), + requestTimeout: 120000, }); return { ok: true }; }, @@ -100,6 +103,7 @@ describe('esArchiver: createIndexDocRecordsStream()', () => { expect(name).to.be('bulk'); expect(params).to.eql({ body: recordsToBulkBody(records.slice(0, 1)), + requestTimeout: 120000, }); await delay(delayMs); return { ok: true }; @@ -108,6 +112,7 @@ describe('esArchiver: createIndexDocRecordsStream()', () => { expect(name).to.be('bulk'); expect(params).to.eql({ body: recordsToBulkBody(records.slice(1)), + requestTimeout: 120000, }); expect(Date.now() - start).to.not.be.lessThan(delayMs); return { ok: true }; diff --git a/src/dev/mocha/run_mocha_cli.js b/src/dev/mocha/run_mocha_cli.js index 475e1750a92b9..5f9131e54efd6 100644 --- a/src/dev/mocha/run_mocha_cli.js +++ b/src/dev/mocha/run_mocha_cli.js @@ -67,14 +67,14 @@ export function runMochaCli() { globby .sync( [ - 'src/**/__tests__/**/*.js', - 'packages/**/__tests__/**/*.js', - 'tasks/**/__tests__/**/*.js', - 'x-pack/common/**/__tests__/**/*.js', - 'x-pack/server/**/__tests__/**/*.js', - `x-pack/legacy/plugins/*/__tests__/**/*.js`, - `x-pack/legacy/plugins/*/common/**/__tests__/**/*.js`, - `x-pack/legacy/plugins/*/**/server/**/__tests__/**/*.js`, + 'src/**/__tests__/**/*.{js,ts,tsx}', + 'packages/**/__tests__/**/*.{js,ts,tsx}', + 'tasks/**/__tests__/**/*.{js,ts,tsx}', + 'x-pack/common/**/__tests__/**/*.{js,ts,tsx}', + 'x-pack/server/**/__tests__/**/*.{js,ts,tsx}', + `x-pack/legacy/plugins/*/__tests__/**/*.{js,ts,tsx}`, + `x-pack/legacy/plugins/*/common/**/__tests__/**/*.{js,ts,tsx}`, + `x-pack/legacy/plugins/*/**/server/**/__tests__/**/*.{js,ts,tsx}`, ], { cwd: REPO_ROOT, @@ -83,7 +83,8 @@ export function runMochaCli() { ignore: [ '**/__tests__/fixtures/**', 'src/**/public/**', - '**/_*.js', + '**/_*.{js,ts,tsx}', + '**/*.test.*', 'packages/**/target/**', ], } diff --git a/src/plugins/console/server/__tests__/proxy_route/body.test.ts b/src/plugins/console/server/routes/api/console/proxy/tests/body.test.ts similarity index 94% rename from src/plugins/console/server/__tests__/proxy_route/body.test.ts rename to src/plugins/console/server/routes/api/console/proxy/tests/body.test.ts index 526c2e4c78ea4..d0c8383792796 100644 --- a/src/plugins/console/server/__tests__/proxy_route/body.test.ts +++ b/src/plugins/console/server/routes/api/console/proxy/tests/body.test.ts @@ -21,9 +21,9 @@ import { getProxyRouteHandlerDeps } from './mocks'; import expect from '@kbn/expect'; import { Readable } from 'stream'; -import { kibanaResponseFactory } from '../../../../../core/server'; -import { createHandler } from '../../routes/api/console/proxy/create_handler'; -import * as requestModule from '../../lib/proxy_request'; +import { kibanaResponseFactory } from '../../../../../../../../core/server'; +import { createHandler } from '../create_handler'; +import * as requestModule from '../../../../../lib/proxy_request'; import { createResponseStub } from './stubs'; describe('Console Proxy Route', () => { diff --git a/src/plugins/console/server/__tests__/proxy_route/headers.test.ts b/src/plugins/console/server/routes/api/console/proxy/tests/headers.test.ts similarity index 88% rename from src/plugins/console/server/__tests__/proxy_route/headers.test.ts rename to src/plugins/console/server/routes/api/console/proxy/tests/headers.test.ts index 8a779715ac823..2d4c616754e33 100644 --- a/src/plugins/console/server/__tests__/proxy_route/headers.test.ts +++ b/src/plugins/console/server/routes/api/console/proxy/tests/headers.test.ts @@ -16,21 +16,21 @@ * specific language governing permissions and limitations * under the License. */ -jest.mock('../../../../../core/server/http/router/request', () => ({ +jest.mock('../../../../../../../../core/server/http/router/request', () => ({ ensureRawRequest: jest.fn(), })); -import { kibanaResponseFactory } from '../../../../../core/server'; +import { kibanaResponseFactory } from '../../../../../../../../core/server'; // eslint-disable-next-line @kbn/eslint/no-restricted-paths -import { ensureRawRequest } from '../../../../../core/server/http/router/request'; +import { ensureRawRequest } from '../../../../../../../../core/server/http/router/request'; import { getProxyRouteHandlerDeps } from './mocks'; import expect from '@kbn/expect'; -import * as requestModule from '../../lib/proxy_request'; +import * as requestModule from '../../../../../lib/proxy_request'; -import { createHandler } from '../../routes/api/console/proxy/create_handler'; +import { createHandler } from '../create_handler'; import { createResponseStub } from './stubs'; diff --git a/src/plugins/console/server/__tests__/proxy_route/mocks.ts b/src/plugins/console/server/routes/api/console/proxy/tests/mocks.ts similarity index 86% rename from src/plugins/console/server/__tests__/proxy_route/mocks.ts rename to src/plugins/console/server/routes/api/console/proxy/tests/mocks.ts index 411bea1a48e8a..158a4a979683f 100644 --- a/src/plugins/console/server/__tests__/proxy_route/mocks.ts +++ b/src/plugins/console/server/routes/api/console/proxy/tests/mocks.ts @@ -17,15 +17,15 @@ * under the License. */ -jest.mock('../../lib/proxy_request', () => ({ +jest.mock('../../../../../lib/proxy_request', () => ({ proxyRequest: jest.fn(), })); import { duration } from 'moment'; -import { ProxyConfigCollection } from '../../lib'; -import { RouteDependencies, ProxyDependencies } from '../../routes'; -import { EsLegacyConfigService, SpecDefinitionsService } from '../../services'; -import { coreMock, httpServiceMock } from '../../../../../core/server/mocks'; +import { ProxyConfigCollection } from '../../../../../lib'; +import { RouteDependencies, ProxyDependencies } from '../../../../../routes'; +import { EsLegacyConfigService, SpecDefinitionsService } from '../../../../../services'; +import { coreMock, httpServiceMock } from '../../../../../../../../core/server/mocks'; const defaultProxyValue = Object.freeze({ readLegacyESConfig: async () => ({ diff --git a/src/plugins/console/server/__tests__/proxy_route/params.test.ts b/src/plugins/console/server/routes/api/console/proxy/tests/params.test.ts similarity index 93% rename from src/plugins/console/server/__tests__/proxy_route/params.test.ts rename to src/plugins/console/server/routes/api/console/proxy/tests/params.test.ts index e1c5295f6d30f..fc1dae7fbcea2 100644 --- a/src/plugins/console/server/__tests__/proxy_route/params.test.ts +++ b/src/plugins/console/server/routes/api/console/proxy/tests/params.test.ts @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -import { kibanaResponseFactory } from '../../../../../core/server'; +import { kibanaResponseFactory } from '../../../../../../../../core/server'; import { getProxyRouteHandlerDeps } from './mocks'; import { createResponseStub } from './stubs'; -import * as requestModule from '../../lib/proxy_request'; +import * as requestModule from '../../../../../lib/proxy_request'; import expect from '@kbn/expect'; -import { createHandler } from '../../routes/api/console/proxy/create_handler'; +import { createHandler } from '../create_handler'; describe('Console Proxy Route', () => { let handler: ReturnType; diff --git a/src/plugins/console/server/__tests__/proxy_route/proxy_fallback.test.ts b/src/plugins/console/server/routes/api/console/proxy/tests/proxy_fallback.test.ts similarity index 91% rename from src/plugins/console/server/__tests__/proxy_route/proxy_fallback.test.ts rename to src/plugins/console/server/routes/api/console/proxy/tests/proxy_fallback.test.ts index fc5233d0f833d..17ce715ac1afa 100644 --- a/src/plugins/console/server/__tests__/proxy_route/proxy_fallback.test.ts +++ b/src/plugins/console/server/routes/api/console/proxy/tests/proxy_fallback.test.ts @@ -20,9 +20,9 @@ import { duration } from 'moment'; import { getProxyRouteHandlerDeps } from './mocks'; -import { kibanaResponseFactory } from '../../../../../core/server'; -import { createHandler } from '../../routes/api/console/proxy/create_handler'; -import * as requestModule from '../../lib/proxy_request'; +import { kibanaResponseFactory } from '../../../../../../../../core/server'; +import * as requestModule from '../../../../../lib/proxy_request'; +import { createHandler } from '../create_handler'; describe('Console Proxy Route', () => { afterEach(async () => { diff --git a/src/plugins/console/server/__tests__/proxy_route/query_string.test.ts b/src/plugins/console/server/routes/api/console/proxy/tests/query_string.test.ts similarity index 93% rename from src/plugins/console/server/__tests__/proxy_route/query_string.test.ts rename to src/plugins/console/server/routes/api/console/proxy/tests/query_string.test.ts index 028022db1096d..f0e7e5d6e8f9a 100644 --- a/src/plugins/console/server/__tests__/proxy_route/query_string.test.ts +++ b/src/plugins/console/server/routes/api/console/proxy/tests/query_string.test.ts @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -import { kibanaResponseFactory } from '../../../../../core/server'; +import { kibanaResponseFactory } from '../../../../../../../../core/server'; import { getProxyRouteHandlerDeps } from './mocks'; import { createResponseStub } from './stubs'; -import * as requestModule from '../../lib/proxy_request'; +import * as requestModule from '../../../../../lib/proxy_request'; import expect from '@kbn/expect'; -import { createHandler } from '../../routes/api/console/proxy/create_handler'; +import { createHandler } from '../create_handler'; describe('Console Proxy Route', () => { let request: any; diff --git a/src/plugins/console/server/__tests__/proxy_route/route_validation.test.ts b/src/plugins/console/server/routes/api/console/proxy/tests/route_validation.test.ts similarity index 95% rename from src/plugins/console/server/__tests__/proxy_route/route_validation.test.ts rename to src/plugins/console/server/routes/api/console/proxy/tests/route_validation.test.ts index 403ef9737ae42..2588c96e3b091 100644 --- a/src/plugins/console/server/__tests__/proxy_route/route_validation.test.ts +++ b/src/plugins/console/server/routes/api/console/proxy/tests/route_validation.test.ts @@ -17,7 +17,7 @@ * under the License. */ -import { routeValidationConfig } from '../../routes/api/console/proxy/validation_config'; +import { routeValidationConfig } from '../validation_config'; const { query } = routeValidationConfig; diff --git a/src/plugins/console/server/__tests__/proxy_route/stubs.ts b/src/plugins/console/server/routes/api/console/proxy/tests/stubs.ts similarity index 100% rename from src/plugins/console/server/__tests__/proxy_route/stubs.ts rename to src/plugins/console/server/routes/api/console/proxy/tests/stubs.ts