Skip to content

Rename client integration test folders #100119

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alisonelizabeth merged 5 commits into from
May 20, 2021
Merged

Rename client integration test folders #100119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ebb2d15
rename client integration test folder
alisonelizabeth May 14, 2021
aefa317
update tsconfig
alisonelizabeth May 14, 2021
704376f
update import paths
alisonelizabeth May 14, 2021
5ea3823
update mocks
alisonelizabeth May 17, 2021
4b63e8a
Merge branch 'master' into update_test_folders
kibanamachine May 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions ...ient_integration/helpers/http_requests.ts → ...ient_integration/helpers/http_requests.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) => {
Expand Down
0 ...tests_client_integration/helpers/index.ts → ...est__/client_integration/helpers/index.ts
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...nt_integration/helpers/indices.helpers.ts → ...nt_integration/helpers/indices.helpers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down
2 changes: 1 addition & 1 deletion ...ent_integration/helpers/kibana.helpers.ts → ...ent_integration/helpers/kibana.helpers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down
2 changes: 1 addition & 1 deletion ...t_integration/helpers/overview.helpers.ts → ...t_integration/helpers/overview.helpers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down
12 changes: 6 additions & 6 deletions ...integration/helpers/setup_environment.tsx → ...integration/helpers/setup_environment.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 });

Expand Down
4 changes: 2 additions & 2 deletions .../tests_client_integration/indices.test.ts → ...jest__/client_integration/indices.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
0 ...t/tests_client_integration/kibana.test.ts → ..._jest__/client_integration/kibana.test.ts
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...tests_client_integration/overview.test.ts → ...est__/client_integration/overview.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/upgrade_assistant/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions ..._integration/helpers/app_context.mock.tsx → ..._integration/helpers/app_context.mock.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
0 ...ient_integration/helpers/body_response.ts → ...ient_integration/helpers/body_response.ts
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...ient_integration/helpers/http_requests.ts → ...ient_integration/helpers/http_requests.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*/

import sinon, { SinonFakeServer } from 'sinon';
import { ROUTES } from '../../common/constants';
import { ROUTES } from '../../../common/constants';

const { API_ROOT } = ROUTES;

Expand Down
0 ...tests_client_integration/helpers/index.ts → ...est__/client_integration/helpers/index.ts
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...ent_integration/helpers/jest_constants.ts → ...ent_integration/helpers/jest_constants.ts
View file
Open in desktop
Original file line number Diff 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
2 changes: 1 addition & 1 deletion ..._integration/helpers/setup_environment.ts → ..._integration/helpers/setup_environment.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
6 changes: 3 additions & 3 deletions ...tion/helpers/watch_create_json.helpers.ts → ...tion/helpers/watch_create_json.helpers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand Down
6 changes: 3 additions & 3 deletions ...helpers/watch_create_threshold.helpers.ts → ...helpers/watch_create_threshold.helpers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down
6 changes: 3 additions & 3 deletions ...integration/helpers/watch_edit.helpers.ts → ...integration/helpers/watch_edit.helpers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
4 changes: 2 additions & 2 deletions ...integration/helpers/watch_list.helpers.ts → ...integration/helpers/watch_list.helpers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down
4 changes: 2 additions & 2 deletions ...tegration/helpers/watch_status.helpers.ts → ...tegration/helpers/watch_status.helpers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
4 changes: 2 additions & 2 deletions ...ent_integration/watch_create_json.test.ts → ...ent_integration/watch_create_json.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
8 changes: 4 additions & 4 deletions ...tegration/watch_create_threshold.test.tsx → ...tegration/watch_create_threshold.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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';

Expand Down Expand Up @@ -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,
Expand Down
8 changes: 4 additions & 4 deletions ...sts_client_integration/watch_edit.test.ts → ...t__/client_integration/watch_edit.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions ...sts_client_integration/watch_list.test.ts → ...t__/client_integration/watch_list.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
7 changes: 3 additions & 4 deletions ...s_client_integration/watch_status.test.ts → ..._/client_integration/watch_status.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/watcher/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
"declarationMap": true
},
"include": [
"__jest__/**/*",
"server/**/*",
"public/**/*",
"common/**/*",
"tests_client_integration/**/*",
"__fixtures__/*",
"../../../typings/**/*"
],
Expand Down