fix tests

elastic · Mar 30, 2020 · 4a8238f · 4a8238f
1 parent 56345e1
commit 4a8238f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
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
@@ -43,7 +43,7 @@ describe('getLatestMonitor', () => {
         hits: [
           {
             _source: {
-              '@timestamp': 123456,
+              timestamp: 123456,
               monitor: {
                 id: 'testMonitor',
               },
@@ -63,6 +63,7 @@ describe('getLatestMonitor', () => {
       dateEnd: 'now',
       monitorId: 'testMonitor',
     });
+
     expect(result.timestamp).toBe(123456);
     expect(result.monitor).not.toBeFalsy();
     expect(result?.monitor?.id).toBe('testMonitor');

diff --git a/x-pack/plugins/uptime/server/lib/requests/get_latest_monitor.ts b/x-pack/plugins/uptime/server/lib/requests/get_latest_monitor.ts
@@ -54,9 +54,10 @@ export const getLatestMonitor: UMElasticsearchQueryFn<GetLatestMonitorParams, Pi
 
   const result = await callES('search', params);
   const ping: any = result.hits?.hits?.[0] ?? {};
+  const { '@timestamp': timestamp, ...monitorResult } = ping?._source ?? {};
 
   return {
-    ...ping?._source,
-    timestamp: ping?._source?.['@timestamp'],
+    timestamp,
+    ...monitorResult,
   };
 };
diff --git a/x-pack/test/api_integration/apis/uptime/rest/fixtures/monitor_latest_status.json b/x-pack/test/api_integration/apis/uptime/rest/fixtures/monitor_latest_status.json
@@ -1,12 +1,12 @@
 {
+  "timestamp": "2019-09-11T03:40:34.371Z",
   "observer": {
     "geo": {
       "name": "mpls",
       "location": "37.926868, -78.024902"
     },
     "hostname": "avc-x1x"
   },
-  "@timestamp": "2019-09-11T03:40:34.371Z",
   "monitor": {
     "duration": {
       "us": 24627
@@ -25,6 +25,5 @@
     "domain": "localhost",
     "query": "r=200x1",
     "full": "http://localhost:5678/pattern?r=200x1"
-  },
-  "timestamp": "2019-09-11T03:40:34.371Z"
+  }
 }