Fixing tests

test/unit/server/lib/status/index.js

@@ -37,9 +37,7 @@ describe('lib/status/index.js', function () {
 
   it('should serialize the statuses when toJSON is called', function () {
     status.createStatus(plugin);
-    expect(JSON.stringify(status)).to.eql(JSON.stringify({
-      test: { state: 'yellow', message: 'Initializing' }
-    }));
+    expect(JSON.stringify(status)).to.eql(JSON.stringify(status.data));
   });
 
 });

test/unit/server/plugins/elasticsearch/routes.js

@@ -1,6 +1,6 @@
 var root = require('requirefrom')('');
 var expect = require('expect.js');
-var kibana = root('src/server');
+var Kibana = root('src/server');
 var findPort = root('test/utils/find_port');
 root('test/utils/ensure_elasticsearch');
 var util = require('util');
@@ -13,8 +13,9 @@ describe('plugins/elasticsearch', function () {
 
     beforeEach(function () {
       return findPort(7000, 8000).then(function (port) {
-        config = { 'kibana.server.port': port, 'logging.quiet': true };
-        return kibana.start(config).then(function (_server) {
+        config = { 'kibana.server.port': port, 'logging.quiet': true};
+        var kibana = new Kibana(config);
+        return kibana.listen().then(function (_server) {
           server = _server;
         });
       });
@@ -47,11 +48,6 @@ describe('plugins/elasticsearch', function () {
       url: '/elasticsearch/'
     });
 
-    testRoute({
-      method: 'GET',
-      url: '/elasticsearch/.kibana'
-    });
-
     testRoute({
       method: 'POST',
       url: '/elasticsearch/.kibana',
@@ -59,6 +55,11 @@ describe('plugins/elasticsearch', function () {
       statusCode: 201
     });
 
+    testRoute({
+      method: 'GET',
+      url: '/elasticsearch/.kibana'
+    });
+
     testRoute({
       method: 'POST',
       url: '/elasticsearch/.kibana/_bulk',

test/utils/ensure_elasticsearch.js

@@ -6,7 +6,7 @@ var libesvm = require('libesvm');
 function startEs() {
   var options = {
     version: '1.4.4',
-    directory: path.join(__dirname, '..', '..', '..', '..', '..', '..', 'esvm'),
+    directory: path.join(__dirname, '..', '..', 'esvm'),
     config: {
       'cluster.name': 'test',
       'network.host': '127.0.0.1'