[7.10] [mocha] find tests in ts files too (#85515) (#85609)

Co-authored-by: Spencer Alger <[email protected]> Co-authored-by: Tyler Smalley <[email protected]> Co-authored-by: Spencer Alger <[email protected]> Co-authored-by: Tyler Smalley <[email protected]>
elastic · Dec 10, 2020 · 0ff038d · 0ff038d
1 parent 9916c94
commit 0ff038d
Show file tree

Hide file tree

Showing 10 changed files with 38 additions and 32 deletions.
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
@@ -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,13 +67,15 @@ describe('esArchiver: createIndexDocRecordsStream()', () => {
         expect(name).to.be('bulk');
         expect(params).to.eql({
           body: recordsToBulkBody(records.slice(0, 1)),
+          requestTimeout: 120000,
         });
         return { ok: true };
       },
       async (name, params) => {
         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
@@ -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/...server/__tests__/proxy_route/body.test.ts → ...utes/api/console/proxy/tests/body.test.ts b/...server/__tests__/proxy_route/body.test.ts → ...utes/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/...ver/__tests__/proxy_route/headers.test.ts → ...s/api/console/proxy/tests/headers.test.ts b/...ver/__tests__/proxy_route/headers.test.ts → ...s/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/...ole/server/__tests__/proxy_route/mocks.ts → ...r/routes/api/console/proxy/tests/mocks.ts b/...ole/server/__tests__/proxy_route/mocks.ts → ...r/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/...rver/__tests__/proxy_route/params.test.ts → ...es/api/console/proxy/tests/params.test.ts b/...rver/__tests__/proxy_route/params.test.ts → ...es/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<typeof createHandler>;

diff --git a/...ests__/proxy_route/proxy_fallback.test.ts → ...onsole/proxy/tests/proxy_fallback.test.ts b/...ests__/proxy_route/proxy_fallback.test.ts → ...onsole/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/..._tests__/proxy_route/query_string.test.ts → .../console/proxy/tests/query_string.test.ts b/..._tests__/proxy_route/query_string.test.ts → .../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/...ts__/proxy_route/route_validation.test.ts → ...sole/proxy/tests/route_validation.test.ts b/...ts__/proxy_route/route_validation.test.ts → ...sole/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/...ole/server/__tests__/proxy_route/stubs.ts → ...r/routes/api/console/proxy/tests/stubs.ts b/...ole/server/__tests__/proxy_route/stubs.ts → ...r/routes/api/console/proxy/tests/stubs.ts