Imroving jsonReportIncludePattern usage

Author: glibas

bin/cli.js

@@ -1,4 +1,4 @@
-#!/usr/bin/env node
+#!/usr/bin/env node
 'use strict'
 const program = require('commander');
 const assertThat = require('../lib/assertthat-bdd');
@@ -51,7 +51,7 @@ const settings = {
     outputFolder: program.outputFolder || './features/',
     jql: program.jql || '',
     tags: program.tags || '',
-    jsonReportIncludePattern: program.jsonReportIncludePattern,
+    jsonReportIncludePattern: program.jsonReportIncludePattern || '.+.json',
     proxyURI: program.proxyURI || process.env.http_proxy,
 
 };

lib/assertthat-bdd.js

@@ -65,13 +65,18 @@ const downloadFeatures = function(settings, callback) {
 
 const uploadReports = async function(settings, callback) {
     const files = fs.readdirSync(settings.jsonReportFolder);
+    let jsonReportIncludePattern = ".+.json"
+    if(settings.jsonReportIncludePattern){
+      jsonReportIncludePattern = settings.jsonReportIncludePattern;
+    }
+    console.log('Using ' + jsonReportIncludePattern + ' when searching for cucumber.json files');
     let runId = -1;
     for(let i=0;i<files.length;i++){
         let filename=path.join(settings.jsonReportFolder,files[i]);
-        if (filename.indexOf('.json')>=0) {
-            console.log('sending file ' + filename + ' with runId ' + runId);
-           const res = sendReport(settings,filename,runId);
-           await res.then(res => { runId=JSON.parse(res.text).runId});
+        if (filename.indexOf('.json')>=0 && new RegExp(jsonReportIncludePattern, 'gi').test(files[i])) {
+          console.log('Sending file ' + filename + ' with runId ' + runId);
+          const res = sendReport(settings,filename,runId);
+          await res.then(res => { runId=JSON.parse(res.text).runId});
         }
     }
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@assertthat/assertthat-bdd",
-  "version": "1.9.2",
+  "version": "1.9.3",
   "description": "Node.js module for integration with AssertThat BDD Jira plugin",
   "main": "index.js",
   "scripts": {