added support for GitLab Merge Request IID

nickmerwin · Oct 10, 2019 · 2ed185c · 2ed185c
1 parent 1e09691
commit 2ed185c
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,4 +5,5 @@ coverage.json
 npm-debug.log
 
 # Webstorm IDE
-.idea
+.idea
+.DS_Store
diff --git a/lib/getOptions.js b/lib/getOptions.js
@@ -79,6 +79,7 @@ var getBaseOptions = function(cb){
     options.service_name = 'gitlab-ci';
     options.service_job_number = process.env.CI_BUILD_NAME;
     options.service_job_id = process.env.CI_BUILD_ID;
+    options.service_pull_request = process.env.CI_MERGE_REQUEST_IID;
     git_commit = process.env.CI_BUILD_REF;
     git_branch = process.env.CI_BUILD_REF_NAME;
   }

diff --git a/package.json b/package.json
@@ -5,7 +5,7 @@
     "coverage",
     "coveralls"
   ],
-  "version": "3.0.6",
+  "version": "3.0.7",
   "bugs": {
     "url": "https://github.com/nickmerwin/node-coveralls/issues"
   },

diff --git a/test/getOptions.js b/test/getOptions.js
@@ -437,9 +437,11 @@ var testGitlab = function(sut, done) {
   process.env.CI_BUILD_ID = "1234";
   process.env.CI_BUILD_REF = "e3e3e3e3e3e3e3e3e";
   process.env.CI_BUILD_REF_NAME = "feature";
+  process.env.CI_MERGE_REQUEST_IID = "1";
   sut(function(err, options){
     options.service_name.should.equal("gitlab-ci");
     options.service_job_id.should.equal("1234");
+    options.service_pull_request.should.equal("1");
     options.git.should.eql({ head:
                                { id: 'e3e3e3e3e3e3e3e3e',
                                  author_name: 'Unknown Author',
@@ -495,7 +497,7 @@ var testBuildkite = function(sut, done) {
   });
 };
 
-    
+
 var testSemaphore = function(sut, done) {
   process.env.SEMAPHORE = true;
   process.env.SEMAPHORE_BUILD_NUMBER = '1234';