Fixed elastic indexing problem.

ocinbat · Nov 7, 2017 · 7addb8e · 7addb8e
1 parent 06fe701
commit 7addb8e
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 15 deletions.
diff --git a/lib/mochalastic.js b/lib/mochalastic.js
@@ -8,32 +8,38 @@ module.exports = mochalastic;
 function mochalastic(runner, options) {
   mocha.reporters.Base.call(this, runner);
   var reporterOptions = options.reporterOptions;
+  var currentDate = new Date().toISOString();
 
   validate(reporterOptions, 'host');
   validate(reporterOptions, 'port');
   validate(reporterOptions, 'protocol');
-  validate(reporterOptions, 'username');
-  validate(reporterOptions, 'password');
   validate(reporterOptions, 'project');
   validate(reporterOptions, 'suite');
 
   var self = this;
   var tests = [];
-  var client = new elasticsearch.Client({
+
+  var elasticConfig = {
     host: [{
       host: reporterOptions.host,
-      auth: reporterOptions.username + ':' + reporterOptions.password,
       protocol: reporterOptions.protocol,
       port: reporterOptions.port
     }],
     log: 'error'
-  });
+  };
+
+  if (reporterOptions.username && reporterOptions.password) {
+    elasticConfig.host[0].auth = reporterOptions.username + ':' + reporterOptions.password;
+  }
+
+  var client = new elasticsearch.Client(elasticConfig);
 
   var log = function log(testData) {
     client.create({
       index: 'test-data-index', // Get from config
-      type: 'mocha-test',
+      type: 'mocha-test-result',
       id: testData.id,
+      timestamp: testData.time,
       body: testData
     }, function (error, response) {
       console.log(error);
@@ -82,6 +88,7 @@ function mochalastic(runner, options) {
       currentRetry: test.currentRetry(),
       project: reporterOptions.project,
       suite: reporterOptions.suite,
+      time: currentDate,
       err: errorJSON(test.err || {})
     };
   }

diff --git a/package.json b/package.json
@@ -1,14 +1,14 @@
 {
   "name": "mochalastic",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "engines": {
     "node": ">=6.9.1"
   },
   "description": "mocha elasticsearch reporter.",
   "main": "./lib/mochalastic.js",
   "scripts": {
     "build": "babel src -d lib",
-    "test": "npm run build && mocha --reporter spec",
+    "test": "npm run build && mocha --reporter spec --no-exit",
     "cover": "istanbul cover node_modules/mocha/bin/_mocha -- -R spec test/*"
   },
   "repository": {

diff --git a/src/mochalastic.js b/src/mochalastic.js
@@ -13,33 +13,40 @@ function mochalastic(runner, options) {
   validate(reporterOptions, 'host');
   validate(reporterOptions, 'port');
   validate(reporterOptions, 'protocol');
-  validate(reporterOptions, 'username');
-  validate(reporterOptions, 'password');
   validate(reporterOptions, 'project');
   validate(reporterOptions, 'suite');
 
   var self = this;
   var tests = [];
-  var client = new elasticsearch.Client({
+
+  var elasticConfig = {
     host: [
       {
         host: reporterOptions.host,
-        auth: reporterOptions.username + ':' + reporterOptions.password,
         protocol: reporterOptions.protocol,
         port: reporterOptions.port
       }
     ],
     log: 'error'
-  });
+  };
+
+  if (reporterOptions.username && reporterOptions.password) {
+    elasticConfig.host[0].auth = reporterOptions.username + ':' + reporterOptions.password;
+  }
+
+  var client = new elasticsearch.Client(elasticConfig);
 
   var log = function (testData) {
     client.create({
       index: 'test-data-index', // Get from config
-      type: 'mocha-test',
+      type: 'mocha-test-result',
       id: testData.id,
+      timestamp: testData.time,
       body: testData
     }, function (error, response) {
-      console.log(error);
+      if (error) {
+        console.log(error);
+      }
     });
   };