Rename client integration test folders (#100119) (#100395)

elastic · May 20, 2021 · 186fdf9 · 186fdf9
1 parent 0cec744
commit 186fdf9
Show file tree

Hide file tree

Showing 27 changed files with 51 additions and 52 deletions.
diff --git a/...ient_integration/helpers/http_requests.ts → ...ient_integration/helpers/http_requests.ts b/...ient_integration/helpers/http_requests.ts → ...ient_integration/helpers/http_requests.ts
@@ -6,9 +6,9 @@
  */
 
 import sinon, { SinonFakeServer } from 'sinon';
-import { API_BASE_PATH } from '../../common/constants';
-import { UpgradeAssistantStatus } from '../../common/types';
-import { ResponseError } from '../../public/application/lib/api';
+import { API_BASE_PATH } from '../../../common/constants';
+import { UpgradeAssistantStatus } from '../../../common/types';
+import { ResponseError } from '../../../public/application/lib/api';
 
 // Register helpers to mock HTTP Requests
 const registerHttpRequestMockHelpers = (server: SinonFakeServer) => {

diff --git a/...tests_client_integration/helpers/index.ts → ...est__/client_integration/helpers/index.ts b/...tests_client_integration/helpers/index.ts → ...est__/client_integration/helpers/index.ts
diff --git a/...nt_integration/helpers/indices.helpers.ts → ...nt_integration/helpers/indices.helpers.ts b/...nt_integration/helpers/indices.helpers.ts → ...nt_integration/helpers/indices.helpers.ts
@@ -6,7 +6,7 @@
  */
 
 import { registerTestBed, TestBed, TestBedConfig } from '@kbn/test/jest';
-import { EsDeprecationsContent } from '../../public/application/components/es_deprecations';
+import { EsDeprecationsContent } from '../../../public/application/components/es_deprecations';
 import { WithAppDependencies } from './setup_environment';
 
 const testBedConfig: TestBedConfig = {

diff --git a/...ent_integration/helpers/kibana.helpers.ts → ...ent_integration/helpers/kibana.helpers.ts b/...ent_integration/helpers/kibana.helpers.ts → ...ent_integration/helpers/kibana.helpers.ts
@@ -6,7 +6,7 @@
  */
 
 import { registerTestBed, TestBed, TestBedConfig } from '@kbn/test/jest';
-import { KibanaDeprecationsContent } from '../../public/application/components/kibana_deprecations';
+import { KibanaDeprecationsContent } from '../../../public/application/components/kibana_deprecations';
 import { WithAppDependencies } from './setup_environment';
 
 const testBedConfig: TestBedConfig = {

diff --git a/...t_integration/helpers/overview.helpers.ts → ...t_integration/helpers/overview.helpers.ts b/...t_integration/helpers/overview.helpers.ts → ...t_integration/helpers/overview.helpers.ts
@@ -7,7 +7,7 @@
 
 import { act } from 'react-dom/test-utils';
 import { registerTestBed, TestBed, TestBedConfig } from '@kbn/test/jest';
-import { DeprecationsOverview } from '../../public/application/components/overview';
+import { DeprecationsOverview } from '../../../public/application/components/overview';
 import { WithAppDependencies } from './setup_environment';
 
 const testBedConfig: TestBedConfig = {

diff --git a/...integration/helpers/setup_environment.tsx → ...integration/helpers/setup_environment.tsx b/...integration/helpers/setup_environment.tsx → ...integration/helpers/setup_environment.tsx
@@ -14,14 +14,14 @@ import {
   deprecationsServiceMock,
   docLinksServiceMock,
   notificationServiceMock,
-} from '../../../../../src/core/public/mocks';
-import { HttpSetup } from '../../../../../src/core/public';
+} from 'src/core/public/mocks';
+import { HttpSetup } from 'src/core/public';
 
-import { mockKibanaSemverVersion, UA_READONLY_MODE } from '../../common/constants';
-import { AppContextProvider } from '../../public/application/app_context';
+import { mockKibanaSemverVersion, UA_READONLY_MODE } from '../../../common/constants';
+import { AppContextProvider } from '../../../public/application/app_context';
+import { apiService } from '../../../public/application/lib/api';
+import { breadcrumbService } from '../../../public/application/lib/breadcrumbs';
 import { init as initHttpRequests } from './http_requests';
-import { apiService } from '../../public/application/lib/api';
-import { breadcrumbService } from '../../public/application/lib/breadcrumbs';
 
 const mockHttpClient = axios.create({ adapter: axiosXhrAdapter });
 

diff --git a/.../tests_client_integration/indices.test.ts → ...jest__/client_integration/indices.test.ts b/.../tests_client_integration/indices.test.ts → ...jest__/client_integration/indices.test.ts
@@ -6,8 +6,8 @@
  */
 
 import { act } from 'react-dom/test-utils';
-import { indexSettingDeprecations } from '../common/constants';
-import { MIGRATION_DEPRECATION_LEVEL } from '../common/types';
+import { indexSettingDeprecations } from '../../common/constants';
+import { MIGRATION_DEPRECATION_LEVEL } from '../../common/types';
 
 import { IndicesTestBed, setupIndicesPage, setupEnvironment } from './helpers';
 

diff --git a/...t/tests_client_integration/kibana.test.ts → ..._jest__/client_integration/kibana.test.ts b/...t/tests_client_integration/kibana.test.ts → ..._jest__/client_integration/kibana.test.ts
diff --git a/...tests_client_integration/overview.test.ts → ...est__/client_integration/overview.test.ts b/...tests_client_integration/overview.test.ts → ...est__/client_integration/overview.test.ts
@@ -8,7 +8,7 @@
 import type { DomainDeprecationDetails } from 'kibana/public';
 import { act } from 'react-dom/test-utils';
 import { deprecationsServiceMock } from 'src/core/public/mocks';
-import { UpgradeAssistantStatus } from '../common/types';
+import { UpgradeAssistantStatus } from '../../common/types';
 
 import { OverviewTestBed, setupOverviewPage, setupEnvironment } from './helpers';
 

diff --git a/x-pack/plugins/upgrade_assistant/tsconfig.json b/x-pack/plugins/upgrade_assistant/tsconfig.json
@@ -8,10 +8,10 @@
     "declarationMap": true
   },
   "include": [
+    "__jest__/**/*",
     "common/**/*",
     "public/**/*",
     "server/**/*",
-    "tests_client_integration/**/*",
     // have to declare *.json explicitly due to https://github.com/microsoft/TypeScript/issues/25636
     "public/**/*.json",
     "server/**/*.json"

diff --git a/..._integration/helpers/app_context.mock.tsx → ..._integration/helpers/app_context.mock.tsx b/..._integration/helpers/app_context.mock.tsx → ..._integration/helpers/app_context.mock.tsx
@@ -15,9 +15,9 @@ import {
   notificationServiceMock,
   httpServiceMock,
   scopedHistoryMock,
-} from '../../../../../src/core/public/mocks';
-import { AppContextProvider } from '../../public/application/app_context';
-import { LicenseStatus } from '../../common/types/license_status';
+} from '../../../../../../src/core/public/mocks';
+import { AppContextProvider } from '../../../public/application/app_context';
+import { LicenseStatus } from '../../../common/types/license_status';
 
 class MockTimeBuckets {
   setBounds(_domain: any) {

diff --git a/...ient_integration/helpers/body_response.ts → ...ient_integration/helpers/body_response.ts b/...ient_integration/helpers/body_response.ts → ...ient_integration/helpers/body_response.ts
diff --git a/...ient_integration/helpers/http_requests.ts → ...ient_integration/helpers/http_requests.ts b/...ient_integration/helpers/http_requests.ts → ...ient_integration/helpers/http_requests.ts
@@ -6,7 +6,7 @@
  */
 
 import sinon, { SinonFakeServer } from 'sinon';
-import { ROUTES } from '../../common/constants';
+import { ROUTES } from '../../../common/constants';
 
 const { API_ROOT } = ROUTES;
 

diff --git a/...tests_client_integration/helpers/index.ts → ...est__/client_integration/helpers/index.ts b/...tests_client_integration/helpers/index.ts → ...est__/client_integration/helpers/index.ts
diff --git a/...ent_integration/helpers/jest_constants.ts → ...ent_integration/helpers/jest_constants.ts b/...ent_integration/helpers/jest_constants.ts → ...ent_integration/helpers/jest_constants.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { getWatch } from '../../__fixtures__';
+import { getWatch } from '../../../__fixtures__';
 
 export const WATCH_ID = 'my-test-watch';
 

diff --git a/..._integration/helpers/setup_environment.ts → ..._integration/helpers/setup_environment.ts b/..._integration/helpers/setup_environment.ts → ..._integration/helpers/setup_environment.ts
@@ -8,7 +8,7 @@
 import axios from 'axios';
 import axiosXhrAdapter from 'axios/lib/adapters/xhr';
 import { init as initHttpRequests } from './http_requests';
-import { setHttpClient, setSavedObjectsClient } from '../../public/application/lib/api';
+import { setHttpClient, setSavedObjectsClient } from '../../../public/application/lib/api';
 
 const mockHttpClient = axios.create({ adapter: axiosXhrAdapter });
 mockHttpClient.interceptors.response.use(

diff --git a/...tion/helpers/watch_create_json.helpers.ts → ...tion/helpers/watch_create_json.helpers.ts b/...tion/helpers/watch_create_json.helpers.ts → ...tion/helpers/watch_create_json.helpers.ts
@@ -6,10 +6,10 @@
  */
 
 import { registerTestBed, TestBed, TestBedConfig } from '@kbn/test/jest';
+import { WatchEdit } from '../../../public/application/sections/watch_edit/components/watch_edit';
+import { registerRouter } from '../../../public/application/lib/navigation';
+import { ROUTES, WATCH_TYPES } from '../../../common/constants';
 import { withAppContext } from './app_context.mock';
-import { WatchEdit } from '../../public/application/sections/watch_edit/components/watch_edit';
-import { registerRouter } from '../../public/application/lib/navigation';
-import { ROUTES, WATCH_TYPES } from '../../common/constants';
 
 const testBedConfig: TestBedConfig = {
   memoryRouter: {

diff --git a/...helpers/watch_create_threshold.helpers.ts → ...helpers/watch_create_threshold.helpers.ts b/...helpers/watch_create_threshold.helpers.ts → ...helpers/watch_create_threshold.helpers.ts
@@ -6,9 +6,9 @@
  */
 
 import { registerTestBed, TestBed, TestBedConfig } from '@kbn/test/jest';
-import { WatchEdit } from '../../public/application/sections/watch_edit/components/watch_edit';
-import { registerRouter } from '../../public/application/lib/navigation';
-import { ROUTES, WATCH_TYPES } from '../../common/constants';
+import { WatchEdit } from '../../../public/application/sections/watch_edit/components/watch_edit';
+import { registerRouter } from '../../../public/application/lib/navigation';
+import { ROUTES, WATCH_TYPES } from '../../../common/constants';
 import { withAppContext } from './app_context.mock';
 
 const testBedConfig: TestBedConfig = {

diff --git a/...integration/helpers/watch_edit.helpers.ts → ...integration/helpers/watch_edit.helpers.ts b/...integration/helpers/watch_edit.helpers.ts → ...integration/helpers/watch_edit.helpers.ts
@@ -6,9 +6,9 @@
  */
 
 import { registerTestBed, TestBed, TestBedConfig } from '@kbn/test/jest';
-import { WatchEdit } from '../../public/application/sections/watch_edit/components/watch_edit';
-import { registerRouter } from '../../public/application/lib/navigation';
-import { ROUTES } from '../../common/constants';
+import { WatchEdit } from '../../../public/application/sections/watch_edit/components/watch_edit';
+import { registerRouter } from '../../../public/application/lib/navigation';
+import { ROUTES } from '../../../common/constants';
 import { WATCH_ID } from './jest_constants';
 import { withAppContext } from './app_context.mock';
 

diff --git a/...integration/helpers/watch_list.helpers.ts → ...integration/helpers/watch_list.helpers.ts b/...integration/helpers/watch_list.helpers.ts → ...integration/helpers/watch_list.helpers.ts
@@ -8,8 +8,8 @@
 import { act } from 'react-dom/test-utils';
 
 import { registerTestBed, findTestSubject, TestBed, TestBedConfig, nextTick } from '@kbn/test/jest';
-import { WatchList } from '../../public/application/sections/watch_list/components/watch_list';
-import { ROUTES, REFRESH_INTERVALS } from '../../common/constants';
+import { WatchList } from '../../../public/application/sections/watch_list/components/watch_list';
+import { ROUTES, REFRESH_INTERVALS } from '../../../common/constants';
 import { withAppContext } from './app_context.mock';
 
 const testBedConfig: TestBedConfig = {

diff --git a/...tegration/helpers/watch_status.helpers.ts → ...tegration/helpers/watch_status.helpers.ts b/...tegration/helpers/watch_status.helpers.ts → ...tegration/helpers/watch_status.helpers.ts
@@ -8,8 +8,8 @@
 import { act } from 'react-dom/test-utils';
 
 import { registerTestBed, findTestSubject, TestBed, TestBedConfig, delay } from '@kbn/test/jest';
-import { WatchStatus } from '../../public/application/sections/watch_status/components/watch_status';
-import { ROUTES } from '../../common/constants';
+import { WatchStatus } from '../../../public/application/sections/watch_status/components/watch_status';
+import { ROUTES } from '../../../common/constants';
 import { WATCH_ID } from './jest_constants';
 import { withAppContext } from './app_context.mock';
 

diff --git a/...ent_integration/watch_create_json.test.ts → ...ent_integration/watch_create_json.test.ts b/...ent_integration/watch_create_json.test.ts → ...ent_integration/watch_create_json.test.ts
@@ -7,8 +7,8 @@
 
 import { act } from 'react-dom/test-utils';
 
-import { getExecuteDetails } from '../__fixtures__';
-import { defaultWatch } from '../public/application/models/watch';
+import { getExecuteDetails } from '../../__fixtures__';
+import { defaultWatch } from '../../public/application/models/watch';
 import { setupEnvironment, pageHelpers, nextTick, wrapBodyResponse } from './helpers';
 import { WatchCreateJsonTestBed } from './helpers/watch_create_json.helpers';
 import { WATCH } from './helpers/jest_constants';

diff --git a/...tegration/watch_create_threshold.test.tsx → ...tegration/watch_create_threshold.test.tsx b/...tegration/watch_create_threshold.test.tsx → ...tegration/watch_create_threshold.test.tsx
@@ -9,6 +9,8 @@ import React from 'react';
 import { act } from 'react-dom/test-utils';
 import axiosXhrAdapter from 'axios/lib/adapters/xhr';
 import axios from 'axios';
+import { getExecuteDetails } from '../../__fixtures__';
+import { WATCH_TYPES } from '../../common/constants';
 import {
   setupEnvironment,
   pageHelpers,
@@ -17,8 +19,6 @@ import {
   unwrapBodyResponse,
 } from './helpers';
 import { WatchCreateThresholdTestBed } from './helpers/watch_create_threshold.helpers';
-import { getExecuteDetails } from '../__fixtures__';
-import { WATCH_TYPES } from '../common/constants';
 
 const WATCH_NAME = 'my_test_watch';
 
@@ -50,8 +50,8 @@ const WATCH_VISUALIZE_DATA = {
 
 const mockHttpClient = axios.create({ adapter: axiosXhrAdapter });
 
-jest.mock('../public/application/lib/api', () => {
-  const original = jest.requireActual('../public/application/lib/api');
+jest.mock('../../public/application/lib/api', () => {
+  const original = jest.requireActual('../../public/application/lib/api');
 
   return {
     ...original,

diff --git a/...sts_client_integration/watch_edit.test.ts → ...t__/client_integration/watch_edit.test.ts b/...sts_client_integration/watch_edit.test.ts → ...t__/client_integration/watch_edit.test.ts
@@ -10,16 +10,16 @@ import axiosXhrAdapter from 'axios/lib/adapters/xhr';
 import axios from 'axios';
 import { getRandomString } from '@kbn/test/jest';
 
-import { getWatch } from '../__fixtures__';
-import { defaultWatch } from '../public/application/models/watch';
+import { getWatch } from '../../__fixtures__';
+import { defaultWatch } from '../../public/application/models/watch';
 import { setupEnvironment, pageHelpers, nextTick, wrapBodyResponse } from './helpers';
 import { WatchEditTestBed } from './helpers/watch_edit.helpers';
 import { WATCH } from './helpers/jest_constants';
 
 const mockHttpClient = axios.create({ adapter: axiosXhrAdapter });
 
-jest.mock('../public/application/lib/api', () => {
-  const original = jest.requireActual('../public/application/lib/api');
+jest.mock('../../public/application/lib/api', () => {
+  const original = jest.requireActual('../../public/application/lib/api');
 
   return {
     ...original,

diff --git a/...sts_client_integration/watch_list.test.ts → ...t__/client_integration/watch_list.test.ts b/...sts_client_integration/watch_list.test.ts → ...t__/client_integration/watch_list.test.ts
@@ -6,10 +6,10 @@
  */
 
 import { act } from 'react-dom/test-utils';
-import * as fixtures from '../__fixtures__';
+import * as fixtures from '../../__fixtures__';
+import { ROUTES } from '../../common/constants';
 import { setupEnvironment, pageHelpers, getRandomString, findTestSubject } from './helpers';
 import { WatchListTestBed } from './helpers/watch_list.helpers';
-import { ROUTES } from '../common/constants';
 
 const { API_ROOT } = ROUTES;
 

diff --git a/...s_client_integration/watch_status.test.ts → ..._/client_integration/watch_status.test.ts b/...s_client_integration/watch_status.test.ts → ..._/client_integration/watch_status.test.ts
@@ -6,13 +6,12 @@
  */
 
 import { act } from 'react-dom/test-utils';
+import moment from 'moment';
+import { getWatchHistory } from '../../__fixtures__';
+import { ROUTES, WATCH_STATES, ACTION_STATES } from '../../common/constants';
 import { setupEnvironment, pageHelpers, nextTick } from './helpers';
 import { WatchStatusTestBed } from './helpers/watch_status.helpers';
 import { WATCH } from './helpers/jest_constants';
-import { getWatchHistory } from '../__fixtures__';
-import moment from 'moment';
-import { ROUTES } from '../common/constants';
-import { WATCH_STATES, ACTION_STATES } from '../common/constants';
 
 const { API_ROOT } = ROUTES;
 

diff --git a/x-pack/plugins/watcher/tsconfig.json b/x-pack/plugins/watcher/tsconfig.json
@@ -8,10 +8,10 @@
     "declarationMap": true
   },
   "include": [
+    "__jest__/**/*",
     "server/**/*",
     "public/**/*",
     "common/**/*",
-    "tests_client_integration/**/*",
     "__fixtures__/*",
     "../../../typings/**/*"
   ],
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,7 +5,7 @@ @@
      * 2.0.
      */
-    import { getWatch } from '../../__fixtures__';
+    import { getWatch } from '../../../__fixtures__';
     export const WATCH_ID = 'my-test-watch';
@@ Expand Down @@