From 3074ed4943673d922be88263e0f84fc583f03cfd Mon Sep 17 00:00:00 2001
From: shahzad <shahzad31comp@gmail.com>
Date: Thu, 16 Apr 2020 14:41:02 +0200
Subject: [PATCH] updated tests

---
 .../apis/uptime/rest/dynamic_settings.ts      |  8 ++++-
 .../test/functional/apps/uptime/settings.ts   | 36 ++++++++++++++++++-
 .../functional/services/uptime/settings.ts    | 33 +++++++++++++----
 3 files changed, 69 insertions(+), 8 deletions(-)

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
index f4dd7c244f8b5..a1b731169f0a0 100644
--- a/x-pack/test/api_integration/apis/uptime/rest/dynamic_settings.ts
+++ b/x-pack/test/api_integration/apis/uptime/rest/dynamic_settings.ts
@@ -18,7 +18,13 @@ export default function({ getService }: FtrProviderContext) {
     });
 
     it('can change the settings', async () => {
-      const newSettings = { heartbeatIndices: 'myIndex1*' };
+      const newSettings = {
+        heartbeatIndices: 'myIndex1*',
+        certificatesThresholds: {
+          errorState: 5,
+          warningState: 15,
+        },
+      };
       const postResponse = await supertest
         .post(`/api/uptime/dynamic_settings`)
         .set('kbn-xsrf', 'true')
diff --git a/x-pack/test/functional/apps/uptime/settings.ts b/x-pack/test/functional/apps/uptime/settings.ts
index 3294d928b61b3..64cfee50ac982 100644
--- a/x-pack/test/functional/apps/uptime/settings.ts
+++ b/x-pack/test/functional/apps/uptime/settings.ts
@@ -74,7 +74,41 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
       // Verify that the settings page shows the value we previously saved
       await settings.go();
       const fields = await settings.loadFields();
-      expect(fields).to.eql(newFieldValues);
+      expect(fields.heartbeatIndices).to.eql(newFieldValues.heartbeatIndices);
+    });
+
+    it('changing certificate expiration error threshold is reflected in settings page', async () => {
+      const settings = uptimeService.settings;
+
+      await settings.go();
+
+      const newErrorThreshold = '5';
+      await settings.changeErrorThresholdInput(newErrorThreshold);
+      await settings.apply();
+
+      await uptimePage.goToRoot();
+
+      // Verify that the settings page shows the value we previously saved
+      await settings.go();
+      const fields = await settings.loadFields();
+      expect(fields.certificatesThresholds.errorState).to.eql(newErrorThreshold);
+    });
+
+    it('changing certificate expiration warning threshold is reflected in settings page', async () => {
+      const settings = uptimeService.settings;
+
+      await settings.go();
+
+      const newWarningThreshold = '15';
+      await settings.changeWarningThresholdInput(newWarningThreshold);
+      await settings.apply();
+
+      await uptimePage.goToRoot();
+
+      // Verify that the settings page shows the value we previously saved
+      await settings.go();
+      const fields = await settings.loadFields();
+      expect(fields.certificatesThresholds.warningState).to.eql(newWarningThreshold);
     });
   });
 };
diff --git a/x-pack/test/functional/services/uptime/settings.ts b/x-pack/test/functional/services/uptime/settings.ts
index a64d39cd62a6d..14cab368b766a 100644
--- a/x-pack/test/functional/services/uptime/settings.ts
+++ b/x-pack/test/functional/services/uptime/settings.ts
@@ -10,20 +10,41 @@ export function UptimeSettingsProvider({ getService }: FtrProviderContext) {
   const testSubjects = getService('testSubjects');
   const retry = getService('retry');
 
+  const changeInputField = async (text: string, field: string) => {
+    const input = await testSubjects.find(field, 5000);
+    await input.clearValueWithKeyboard();
+    await input.type(text);
+  };
+
   return {
     go: async () => {
       await testSubjects.click('settings-page-link', 5000);
     },
+
     changeHeartbeatIndicesInput: async (text: string) => {
-      const input = await testSubjects.find('heartbeat-indices-input-loaded', 5000);
-      await input.clearValueWithKeyboard();
-      await input.type(text);
+      await changeInputField(text, 'heartbeat-indices-input-loaded');
+    },
+    changeErrorThresholdInput: async (text: string) => {
+      await changeInputField(text, 'error-state-threshold-input-loaded');
+    },
+    changeWarningThresholdInput: async (text: string) => {
+      await changeInputField(text, 'warning-state-threshold-input-loaded');
     },
     loadFields: async () => {
-      const input = await testSubjects.find('heartbeat-indices-input-loaded', 5000);
-      const heartbeatIndices = await input.getAttribute('value');
+      const indInput = await testSubjects.find('heartbeat-indices-input-loaded', 5000);
+      const errorInput = await testSubjects.find('error-state-threshold-input-loaded', 5000);
+      const warningInput = await testSubjects.find('warning-state-threshold-input-loaded', 5000);
+      const heartbeatIndices = await indInput.getAttribute('value');
+      const errorThreshold = await errorInput.getAttribute('value');
+      const warningThreshold = await warningInput.getAttribute('value');
 
-      return { heartbeatIndices };
+      return {
+        heartbeatIndices,
+        certificatesThresholds: {
+          errorState: errorThreshold,
+          warningState: warningThreshold,
+        },
+      };
     },
     applyButtonIsDisabled: async () => {
       return !!(await (await testSubjects.find('apply-settings-button')).getAttribute('disabled'));