Add Jira server integration

Author: glibas

README.md

@@ -23,6 +23,7 @@ Available parameters:
   -V, --version                             output the version number
   -a, --accessKey [ASSERTTHAT_ACCESS_KEY]   Access key
   -s, --secretKey [ASSERTTHAT_SECRET_KEY]   Secret key
+  -u, --jiraServerUrl [URL]                 Jira server URL e.g https://mycompanyjira.com
   -f, --features                            Download features
   -r, --report                              Upload report
   -i, --projectId <ID>                      Jira project id
@@ -56,7 +57,8 @@ var assertThat = require('assertthat-bdd');
 assertThat.downloadFeatures({
   "projectId": PROJECT_ID,
   "accessKey": "ASSERTTHAT_ACCESS_KEY",
-  "secretKey": "ASSERTTHAT_SECRET_KEY"
+  "secretKey": "ASSERTTHAT_SECRET_KEY",
+  "jiraServerUrl": "Jira server URL." //Omit if using Jira Cloud
 }, function() {
   // some optional callback code
 });
@@ -67,6 +69,7 @@ Available parameters:
 ```
   -a, --accessKey [ASSERTTHAT_ACCESS_KEY]   Access key
   -s, --secretKey [ASSERTTHAT_SECRET_KEY]   Secret key
+  -u, --jiraServerUrl [URL]                 Jira server URL e.g https://mycompanyjira.com
   -i, --projectId <ID>                      Jira project id
   -m, --mode <mode>                         Features to download (default: "automated")
   -o, --outputFolder [FOLDER PATH]          Jira project id
@@ -82,7 +85,8 @@ var assertThat = require('assertthat-bdd');
 assertThat.uploadReports({
   "projectId": PROJECT_ID,
   "accessKey": "ASSERTTHAT_ACCESS_KEY",
-  "secretKey": "ASSERTTHAT_SECRET_KEY"
+  "secretKey": "ASSERTTHAT_SECRET_KEY",
+  "jiraServerUrl": "Jira server URL." //Omit if using Jira Cloud
 }, function() {
    // some optional callback code
 });

bin/cli.js

@@ -9,6 +9,7 @@ program
   .version('1.2.0')
   .option('-a, --accessKey [ASSERTTHAT_ACCESS_KEY]', 'Access key')
   .option('-s, --secretKey [ASSERTTHAT_SECRET_KEY]', 'Secret key')
+  .option('-u, --jiraServerUrl [URL]', 'Jira server URL e.g https://mycompanyjira.com')
   .option('-f, --features', 'Download features')
   .option('-r, --report', 'Upload report')
   .option('-i, --projectId <ID>', 'Jira project id')
@@ -35,6 +36,7 @@ var settings = {
     projectId: program.projectId,
     accessKey: program.accessKey || process.env.ASSERTTHAT_ACCESS_KEY,
     secretKey: program.secretKey || process.env.ASSERTTHAT_SECRET_KEY,
+    jiraServerUrl: program.jiraServerUrl,
     jsonReportFolder: program.jsonReportFolder || './reports/',
     mode: program.mode,
     metadata: program.metadata || '',

lib/assertthat-bdd.js

@@ -8,7 +8,10 @@ const fs = require('fs');
 var path = require('path')
 
 var downloadFeatures = function(settings, callback) {
-    const featuresUrl = "https://bdd.assertthat.app/rest/api/1/project/" + settings.projectId + "/features"
+    var featuresUrl = "https://bdd.assertthat.app/rest/api/1/project/" + settings.projectId + "/features"
+    if(settings.jiraServerUrl){
+        featuresUrl = settings.jiraServerUrl+"/rest/assertthat/latest/project/"+settings.projectId+"/client/features"
+    }
     if (!fs.existsSync(settings.outputFolder)){
         fs.mkdirSync(settings.outputFolder);
     }
@@ -64,7 +67,10 @@ var uploadReports = async function(settings, callback) {
 };
 
 async function sendReport(settings, filename, runId){
-    const reportUrl = "https://bdd.assertthat.app/rest/api/1/project/" + settings.projectId + "/report"
+    var reportUrl = "https://bdd.assertthat.app/rest/api/1/project/" + settings.projectId + "/report"
+    if(settings.jiraServerUrl){
+        reportUrl = settings.jiraServerUrl+"/rest/assertthat/latest/project/"+settings.projectId+"/client/report"
+    }
     const req =  request.post(reportUrl)
     var newRunId = runId;
     if(settings.proxyURI){

package-lock.json

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