Fix/improve broken types/unit/integration/api tests.

elastic · Apr 21, 2020 · 7d2bf4c · 7d2bf4c
1 parent 674857e
commit 7d2bf4c
Show file tree

Hide file tree

Showing 13 changed files with 64 additions and 61 deletions.
diff --git a/.../uptime/public/components/settings/__tests__/__snapshots__/certificate_form.test.tsx.snap b/.../uptime/public/components/settings/__tests__/__snapshots__/certificate_form.test.tsx.snap
diff --git a/...gins/uptime/public/components/settings/__tests__/__snapshots__/indices_form.test.tsx.snap b/...gins/uptime/public/components/settings/__tests__/__snapshots__/indices_form.test.tsx.snap
diff --git a/x-pack/legacy/plugins/uptime/public/components/settings/certificate_form.tsx b/x-pack/legacy/plugins/uptime/public/components/settings/certificate_form.tsx
@@ -89,15 +89,15 @@ export const CertificateExpirationForm: React.FC<SettingsFormProps> = ({
           <EuiFlexGroup>
             <EuiFlexItem grow={2}>
               <EuiFieldNumber
-                data-test-subj={`error-state-threshold-input-${dss.loading ? 'loading' : 'loaded'}`}
+                data-test-subj={`expiration-threshold-input-${dss.loading ? 'loading' : 'loaded'}`}
                 fullWidth
                 disabled={isDisabled}
                 isLoading={dss.loading}
                 value={formFields?.certificatesThresholds?.expiration || ''}
                 onChange={({ currentTarget: { value } }: any) =>
                   onChange({
                     certificatesThresholds: {
-                      expiration: value === '' ? undefined : Number(value),
+                      expiration: Number(value),
                     },
                   })
                 }
@@ -137,9 +137,7 @@ export const CertificateExpirationForm: React.FC<SettingsFormProps> = ({
           <EuiFlexGroup>
             <EuiFlexItem grow={2}>
               <EuiFieldNumber
-                data-test-subj={`warning-state-threshold-input-${
-                  dss.loading ? 'loading' : 'loaded'
-                }`}
+                data-test-subj={`age-threshold-input-${dss.loading ? 'loading' : 'loaded'}`}
                 fullWidth
                 disabled={isDisabled}
                 isLoading={dss.loading}

diff --git a/x-pack/legacy/plugins/uptime/public/state/selectors/__tests__/index.test.ts b/x-pack/legacy/plugins/uptime/public/state/selectors/__tests__/index.test.ts
@@ -6,6 +6,7 @@
 
 import { getBasePath, isIntegrationsPopupOpen } from '../index';
 import { AppState } from '../../../state';
+import { DYNAMIC_SETTINGS_DEFAULTS } from '../../../../common/constants';
 
 describe('state selectors', () => {
   const state: AppState = {
@@ -20,6 +21,7 @@ describe('state selectors', () => {
       loading: false,
     },
     dynamicSettings: {
+      settings: DYNAMIC_SETTINGS_DEFAULTS,
       loading: false,
     },
     monitor: {

diff --git a/x-pack/plugins/uptime/server/lib/alerts/__tests__/status_check.test.ts b/x-pack/plugins/uptime/server/lib/alerts/__tests__/status_check.test.ts
@@ -16,7 +16,7 @@ import { AlertType } from '../../../../../alerting/server';
 import { IRouter } from 'kibana/server';
 import { UMServerLibs } from '../../lib';
 import { UptimeCoreSetup } from '../../adapters';
-import { defaultDynamicSettings } from '../../../../../../legacy/plugins/uptime/common/runtime_types';
+import { DYNAMIC_SETTINGS_DEFAULTS } from '../../../../../../legacy/plugins/uptime/common/constants';
 import { alertsMock, AlertServicesMock } from '../../../../../alerting/server/mocks';
 
 /**
@@ -52,7 +52,7 @@ const mockOptions = (
     id: '',
     type: '',
     references: [],
-    attributes: defaultDynamicSettings,
+    attributes: DYNAMIC_SETTINGS_DEFAULTS,
   });
   return {
     params,
@@ -89,8 +89,8 @@ describe('status check alert', () => {
             "callES": [MockFunction],
             "dynamicSettings": Object {
               "certificatesThresholds": Object {
-                "errorState": 7,
-                "warningState": 30,
+                "age": 365,
+                "expiration": 7,
               },
               "heartbeatIndices": "heartbeat-8*",
             },
@@ -136,8 +136,8 @@ describe('status check alert', () => {
             "callES": [MockFunction],
             "dynamicSettings": Object {
               "certificatesThresholds": Object {
-                "errorState": 7,
-                "warningState": 30,
+                "age": 365,
+                "expiration": 7,
               },
               "heartbeatIndices": "heartbeat-8*",
             },

diff --git a/x-pack/plugins/uptime/server/lib/requests/__tests__/get_latest_monitor.test.ts b/x-pack/plugins/uptime/server/lib/requests/__tests__/get_latest_monitor.test.ts
@@ -5,14 +5,14 @@
  */
 
 import { getLatestMonitor } from '../get_latest_monitor';
-import { defaultDynamicSettings } from '../../../../../../legacy/plugins/uptime/common/runtime_types';
+import { DYNAMIC_SETTINGS_DEFAULTS } from '../../../../../../legacy/plugins/uptime/common/constants';
 
 describe('getLatestMonitor', () => {
   let expectedGetLatestSearchParams: any;
   let mockEsSearchResult: any;
   beforeEach(() => {
     expectedGetLatestSearchParams = {
-      index: defaultDynamicSettings.heartbeatIndices,
+      index: DYNAMIC_SETTINGS_DEFAULTS.heartbeatIndices,
       body: {
         query: {
           bool: {
@@ -64,7 +64,7 @@ describe('getLatestMonitor', () => {
     const mockEsClient = jest.fn(async (_request: any, _params: any) => mockEsSearchResult);
     const result = await getLatestMonitor({
       callES: mockEsClient,
-      dynamicSettings: defaultDynamicSettings,
+      dynamicSettings: DYNAMIC_SETTINGS_DEFAULTS,
       dateStart: 'now-1h',
       dateEnd: 'now',
       monitorId: 'testMonitor',

diff --git a/x-pack/plugins/uptime/server/lib/requests/__tests__/get_monitor_charts.test.ts b/x-pack/plugins/uptime/server/lib/requests/__tests__/get_monitor_charts.test.ts
@@ -7,7 +7,7 @@
 import { set } from 'lodash';
 import mockChartsData from './monitor_charts_mock.json';
 import { getMonitorDurationChart } from '../get_monitor_duration';
-import { defaultDynamicSettings } from '../../../../../../legacy/plugins/uptime/common/runtime_types';
+import { DYNAMIC_SETTINGS_DEFAULTS } from '../../../../../../legacy/plugins/uptime/common/constants';
 
 describe('ElasticsearchMonitorsAdapter', () => {
   it('getMonitorChartsData will provide expected filters', async () => {
@@ -16,7 +16,7 @@ describe('ElasticsearchMonitorsAdapter', () => {
     const search = searchMock.bind({});
     await getMonitorDurationChart({
       callES: search,
-      dynamicSettings: defaultDynamicSettings,
+      dynamicSettings: DYNAMIC_SETTINGS_DEFAULTS,
       monitorId: 'fooID',
       dateStart: 'now-15m',
       dateEnd: 'now',
@@ -39,7 +39,7 @@ describe('ElasticsearchMonitorsAdapter', () => {
     expect(
       await getMonitorDurationChart({
         callES: search,
-        dynamicSettings: defaultDynamicSettings,
+        dynamicSettings: DYNAMIC_SETTINGS_DEFAULTS,
         monitorId: 'id',
         dateStart: 'now-15m',
         dateEnd: 'now',

diff --git a/x-pack/plugins/uptime/server/lib/requests/__tests__/get_monitor_status.test.ts b/x-pack/plugins/uptime/server/lib/requests/__tests__/get_monitor_status.test.ts
@@ -7,7 +7,7 @@
 import { elasticsearchServiceMock } from '../../../../../../../src/core/server/mocks';
 import { getMonitorStatus } from '../get_monitor_status';
 import { ScopedClusterClient } from 'src/core/server/elasticsearch';
-import { defaultDynamicSettings } from '../../../../../../legacy/plugins/uptime/common/runtime_types';
+import { DYNAMIC_SETTINGS_DEFAULTS } from '../../../../../../legacy/plugins/uptime/common/constants';
 
 interface BucketItemCriteria {
   monitor_id: string;
@@ -103,7 +103,7 @@ describe('getMonitorStatus', () => {
     }`;
     await getMonitorStatus({
       callES,
-      dynamicSettings: defaultDynamicSettings,
+      dynamicSettings: DYNAMIC_SETTINGS_DEFAULTS,
       filters: exampleFilter,
       locations: [],
       numTimes: 5,
@@ -206,7 +206,7 @@ describe('getMonitorStatus', () => {
     const [callES, esMock] = setupMock([]);
     await getMonitorStatus({
       callES,
-      dynamicSettings: defaultDynamicSettings,
+      dynamicSettings: DYNAMIC_SETTINGS_DEFAULTS,
       locations: ['fairbanks', 'harrisburg'],
       numTimes: 1,
       timerange: {
@@ -329,7 +329,7 @@ describe('getMonitorStatus', () => {
     };
     const result = await getMonitorStatus({
       callES,
-      dynamicSettings: defaultDynamicSettings,
+      dynamicSettings: DYNAMIC_SETTINGS_DEFAULTS,
       ...clientParameters,
     });
     expect(esMock.callAsCurrentUser).toHaveBeenCalledTimes(1);
@@ -494,7 +494,7 @@ describe('getMonitorStatus', () => {
     const [callES] = setupMock(criteria);
     const result = await getMonitorStatus({
       callES,
-      dynamicSettings: defaultDynamicSettings,
+      dynamicSettings: DYNAMIC_SETTINGS_DEFAULTS,
       locations: [],
       numTimes: 5,
       timerange: {

diff --git a/x-pack/plugins/uptime/server/lib/requests/__tests__/get_ping_histogram.test.ts b/x-pack/plugins/uptime/server/lib/requests/__tests__/get_ping_histogram.test.ts
@@ -5,7 +5,7 @@
  */
 
 import { getPingHistogram } from '../get_ping_histogram';
-import { defaultDynamicSettings } from '../../../../../../legacy/plugins/uptime/common/runtime_types';
+import { DYNAMIC_SETTINGS_DEFAULTS } from '../../../../../../legacy/plugins/uptime/common/constants';
 
 describe('getPingHistogram', () => {
   const standardMockResponse: any = {
@@ -59,7 +59,7 @@ describe('getPingHistogram', () => {
 
     const result = await getPingHistogram({
       callES: mockEsClient,
-      dynamicSettings: defaultDynamicSettings,
+      dynamicSettings: DYNAMIC_SETTINGS_DEFAULTS,
       from: 'now-15m',
       to: 'now',
       filters: null,
@@ -78,7 +78,7 @@ describe('getPingHistogram', () => {
 
     const result = await getPingHistogram({
       callES: mockEsClient,
-      dynamicSettings: defaultDynamicSettings,
+      dynamicSettings: DYNAMIC_SETTINGS_DEFAULTS,
       from: 'now-15m',
       to: 'now',
       filters: null,
@@ -140,7 +140,7 @@ describe('getPingHistogram', () => {
 
     const result = await getPingHistogram({
       callES: mockEsClient,
-      dynamicSettings: defaultDynamicSettings,
+      dynamicSettings: DYNAMIC_SETTINGS_DEFAULTS,
       from: '1234',
       to: '5678',
       filters: JSON.stringify(searchFilter),
@@ -196,7 +196,7 @@ describe('getPingHistogram', () => {
     const filters = `{"bool":{"must":[{"simple_query_string":{"query":"http"}}]}}`;
     const result = await getPingHistogram({
       callES: mockEsClient,
-      dynamicSettings: defaultDynamicSettings,
+      dynamicSettings: DYNAMIC_SETTINGS_DEFAULTS,
       from: 'now-15m',
       to: 'now',
       filters,
@@ -213,7 +213,7 @@ describe('getPingHistogram', () => {
     mockEsClient.mockReturnValue(standardMockResponse);
     const result = await getPingHistogram({
       callES: mockEsClient,
-      dynamicSettings: defaultDynamicSettings,
+      dynamicSettings: DYNAMIC_SETTINGS_DEFAULTS,
       from: '1234',
       to: '5678',
       filters: '',
@@ -234,7 +234,7 @@ describe('getPingHistogram', () => {
 
     const result = await getPingHistogram({
       callES: mockEsClient,
-      dynamicSettings: defaultDynamicSettings,
+      dynamicSettings: DYNAMIC_SETTINGS_DEFAULTS,
       from: '1234',
       to: '5678',
       filters: '',

diff --git a/x-pack/plugins/uptime/server/lib/requests/__tests__/get_pings.test.ts b/x-pack/plugins/uptime/server/lib/requests/__tests__/get_pings.test.ts
@@ -6,7 +6,7 @@
 
 import { getPings } from '../get_pings';
 import { set } from 'lodash';
-import { defaultDynamicSettings } from '../../../../../../legacy/plugins/uptime/common/runtime_types';
+import { DYNAMIC_SETTINGS_DEFAULTS } from '../../../../../../legacy/plugins/uptime/common/constants';
 
 describe('getAll', () => {
   let mockEsSearchResult: any;
@@ -62,7 +62,7 @@ describe('getAll', () => {
       },
     };
     expectedGetAllParams = {
-      index: defaultDynamicSettings.heartbeatIndices,
+      index: DYNAMIC_SETTINGS_DEFAULTS.heartbeatIndices,
       body: {
         query: {
           bool: {
@@ -88,7 +88,7 @@ describe('getAll', () => {
     mockEsClient.mockReturnValue(mockEsSearchResult);
     const result = await getPings({
       callES: mockEsClient,
-      dynamicSettings: defaultDynamicSettings,
+      dynamicSettings: DYNAMIC_SETTINGS_DEFAULTS,
       dateRange: { from: 'now-1h', to: 'now' },
       sort: 'asc',
       size: 12,
@@ -110,7 +110,7 @@ describe('getAll', () => {
     mockEsClient.mockReturnValue(mockEsSearchResult);
     await getPings({
       callES: mockEsClient,
-      dynamicSettings: defaultDynamicSettings,
+      dynamicSettings: DYNAMIC_SETTINGS_DEFAULTS,
       dateRange: { from: 'now-1h', to: 'now' },
       sort: 'asc',
       size: 12,
@@ -166,7 +166,7 @@ describe('getAll', () => {
     mockEsClient.mockReturnValue(mockEsSearchResult);
     await getPings({
       callES: mockEsClient,
-      dynamicSettings: defaultDynamicSettings,
+      dynamicSettings: DYNAMIC_SETTINGS_DEFAULTS,
       dateRange: { from: 'now-1h', to: 'now' },
       size: 12,
     });
@@ -220,7 +220,7 @@ describe('getAll', () => {
     mockEsClient.mockReturnValue(mockEsSearchResult);
     await getPings({
       callES: mockEsClient,
-      dynamicSettings: defaultDynamicSettings,
+      dynamicSettings: DYNAMIC_SETTINGS_DEFAULTS,
       dateRange: { from: 'now-1h', to: 'now' },
       sort: 'desc',
     });
@@ -274,7 +274,7 @@ describe('getAll', () => {
     mockEsClient.mockReturnValue(mockEsSearchResult);
     await getPings({
       callES: mockEsClient,
-      dynamicSettings: defaultDynamicSettings,
+      dynamicSettings: DYNAMIC_SETTINGS_DEFAULTS,
       dateRange: { from: 'now-1h', to: 'now' },
       monitorId: 'testmonitorid',
     });
@@ -333,7 +333,7 @@ describe('getAll', () => {
     mockEsClient.mockReturnValue(mockEsSearchResult);
     await getPings({
       callES: mockEsClient,
-      dynamicSettings: defaultDynamicSettings,
+      dynamicSettings: DYNAMIC_SETTINGS_DEFAULTS,
       dateRange: { from: 'now-1h', to: 'now' },
       status: 'down',
     });

diff --git a/x-pack/test/api_integration/apis/uptime/rest/dynamic_settings.ts b/x-pack/test/api_integration/apis/uptime/rest/dynamic_settings.ts
@@ -5,24 +5,27 @@
  */
 
 import expect from '@kbn/expect';
+import { isRight } from 'fp-ts/lib/Either';
 import { FtrProviderContext } from '../../../ftr_provider_context';
-import { defaultDynamicSettings } from '../../../../../legacy/plugins/uptime/common/runtime_types/dynamic_settings';
+import { DYNAMIC_SETTINGS_DEFAULTS } from '../../../../../legacy/plugins/uptime/common/constants';
+import { DynamicSettingsType } from '../../../../../legacy/plugins/uptime/common/runtime_types';
 
 export default function({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
 
   describe('dynamic settings', () => {
     it('returns the defaults when no user settings have been saved', async () => {
       const apiResponse = await supertest.get(`/api/uptime/dynamic_settings`);
-      expect(apiResponse.body).to.eql(defaultDynamicSettings as any);
+      expect(apiResponse.body).to.eql(DYNAMIC_SETTINGS_DEFAULTS);
+      expect(isRight(DynamicSettingsType.decode(apiResponse.body))).to.be.ok();
     });
 
     it('can change the settings', async () => {
       const newSettings = {
         heartbeatIndices: 'myIndex1*',
         certificatesThresholds: {
-          errorState: 5,
-          warningState: 15,
+          expiration: 5,
+          age: 15,
         },
       };
       const postResponse = await supertest
@@ -35,6 +38,7 @@ export default function({ getService }: FtrProviderContext) {
 
       const getResponse = await supertest.get(`/api/uptime/dynamic_settings`);
       expect(getResponse.body).to.eql(newSettings);
+      expect(isRight(DynamicSettingsType.decode(getResponse.body))).to.be.ok();
     });
   });
 }