Fix failing test

elastic · Aug 1, 2018 · 9841b57 · 9841b57
1 parent bef1ba1
commit 9841b57
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 12 deletions.
diff --git a/src/server/status/lib/get_kibana_info_for_stats.js b/src/server/status/lib/get_kibana_info_for_stats.js
@@ -41,6 +41,6 @@ export function getKibanaInfoForStats(server, kbnServer) {
     transport_address: `${config.get('server.host')}:${config.get('server.port')}`,
     version: kbnServer.version.replace(snapshotRegex, ''),
     snapshot: snapshotRegex.test(kbnServer.version),
-    status: get(status, 'overall.state')
+    status: get(status, 'overall.id')
   };
 }
diff --git a/src/server/status/server_status.test.js b/src/server/status/server_status.test.js
@@ -24,6 +24,7 @@ import * as states from './states';
 import Status from './status';
 import ServerStatus from './server_status';
 
+
 describe('ServerStatus class', function () {
   const plugin = { id: 'name', version: '1.2.3' };
 
@@ -93,13 +94,13 @@ describe('ServerStatus class', function () {
     it('considers each status to produce a summary', function () {
       const status = serverStatus.createForPlugin(plugin);
 
-      expect(serverStatus.overall().state).toBe('uninitialized');
+      expect(serverStatus.overall().id).toBe('uninitialized');
 
       const match = function (overall, state) {
-        expect(overall).toHaveProperty('state', state.id);
-        expect(overall).toHaveProperty('title', state.title);
-        expect(overall).toHaveProperty('icon', state.icon);
-        expect(state.nicknames).toContain(overall.nickname);
+        expect(overall).toHaveProperty('id', state.id);
+        expect(overall).toHaveProperty('state.title', state.title);
+        expect(overall).toHaveProperty('state.uiColor', state.uiColor);
+        expect(state.nicknames).toContain(overall.state.nickname);
       };
 
       status.green();
@@ -133,9 +134,12 @@ describe('ServerStatus class', function () {
       expect(json.statuses).toHaveLength(3);
 
       const out = status => find(json.statuses, { id: status.id });
-      expect(out(service)).toHaveProperty('state', 'green');
-      expect(out(p1)).toHaveProperty('state', 'yellow');
-      expect(out(p2)).toHaveProperty('state', 'red');
+      expect(out(service)).toHaveProperty('state.message', 'Green');
+      expect(out(service)).toHaveProperty('state.uiColor', 'secondary');
+      expect(out(p1)).toHaveProperty('state.message', 'Yellow');
+      expect(out(p1)).toHaveProperty('state.uiColor', 'warning');
+      expect(out(p2)).toHaveProperty('state.message', 'Red');
+      expect(out(p2)).toHaveProperty('state.uiColor', 'danger');
     });
   });
 

diff --git a/src/server/status/status.js b/src/server/status/status.js
@@ -56,6 +56,7 @@ export default class Status extends EventEmitter {
     return {
       id: this.id,
       state: {
+        id: this.state,
         message: this.message,
         uiColor: states.get(this.state).uiColor,
       },

diff --git a/test/api_integration/apis/status/status.js b/test/api_integration/apis/status/status.js
@@ -36,13 +36,16 @@ export default function ({ getService }) {
           expect(body.version.build_number).to.be.a('number');
 
           expect(body.status.overall).to.be.an('object');
-          expect(body.status.overall.state).to.be('green');
+          expect(body.status.overall.id).to.be('green');
+          expect(body.status.overall.state).to.be.an('object');
+          expect(body.status.overall.state.title).to.be('Green');
 
           expect(body.status.statuses).to.be.an('array');
           const kibanaPlugin = body.status.statuses.find(s => {
             return s.id.indexOf('plugin:kibana') === 0;
           });
-          expect(kibanaPlugin.state).to.be('green');
+          expect(kibanaPlugin.state).to.be.an('object');
+          expect(kibanaPlugin.state.id).to.be('green');
 
           expect(body.metrics.collection_interval_in_millis).to.be.a('number');
 

diff --git a/test/common/services/kibana_server/status.js b/test/common/services/kibana_server/status.js
@@ -39,6 +39,6 @@ export class KibanaServerStatus {
 
   async getOverallState() {
     const status = await this.get();
-    return status.status.overall.state;
+    return status.status.overall.id;
   }
 }