Get PR number from TRAVIS

nickmerwin · Oct 14, 2016 · f94b647 · f94b647
1 parent cbb1e46
commit f94b647
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/lib/getOptions.js b/lib/getOptions.js
@@ -20,6 +20,7 @@ var getBaseOptions = function(cb){
   if (process.env.TRAVIS){
     options.service_name = 'travis-ci';
     options.service_job_id = process.env.TRAVIS_JOB_ID;
+    options.service_pull_request = process.env.TRAVIS_PULL_REQUEST;
     git_commit = 'HEAD';
     git_branch = process.env.TRAVIS_BRANCH;
   }

diff --git a/test/convertLcovToCoveralls.js b/test/convertLcovToCoveralls.js
@@ -8,7 +8,7 @@ logger = require('log-driver')({level : false});
 
 describe("convertLcovToCoveralls", function(){
   it ("should convert a simple lcov file", function(done){
-    process.env.TRAVIS_JOB_ID = -1;
+    delete process.env.TRAVIS;
     var lcovpath = __dirname + "/../fixtures/onefile.lcov";
     var input = fs.readFileSync(lcovpath, "utf8");
     var libpath = __dirname + "/../fixtures/lib";
@@ -23,7 +23,7 @@ describe("convertLcovToCoveralls", function(){
   });
 
   it ("should pass on all appropriate parameters from the environment", function(done){
-    process.env.TRAVIS_JOB_ID = -1;
+    delete process.env.TRAVIS;
     process.env.COVERALLS_GIT_COMMIT = "GIT_HASH";
     process.env.COVERALLS_GIT_BRANCH = "master";
     process.env.COVERALLS_SERVICE_NAME = "SERVICE_NAME";
@@ -47,7 +47,7 @@ describe("convertLcovToCoveralls", function(){
     });
   });
   it ("should work with a relative path as well", function(done){
-    process.env.TRAVIS_JOB_ID = -1;
+    delete process.env.TRAVIS;
     var lcovpath = __dirname + "/../fixtures/onefile.lcov";
     var input = fs.readFileSync(lcovpath, "utf8");
     var libpath = "fixtures/lib";
@@ -60,7 +60,7 @@ describe("convertLcovToCoveralls", function(){
   });
 
   it ("should convert absolute input paths to relative", function(done){
-    process.env.TRAVIS_JOB_ID = -1;
+    delete process.env.TRAVIS;
     var lcovpath = __dirname + "/../fixtures/istanbul.lcov";
     var input = fs.readFileSync(lcovpath, "utf8");
     var libpath = "/Users/deepsweet/Dropbox/projects/svgo/lib";
@@ -89,7 +89,7 @@ describe("convertLcovToCoveralls", function(){
   });
 
   it ("should ignore files that do not exists", function(done){
-    process.env.TRAVIS_JOB_ID = -1;
+    delete process.env.TRAVIS;
     var lcovpath = __dirname + "/../fixtures/istanbul.lcov";
     var input = fs.readFileSync(lcovpath, "utf8");
     var libpath = "/Users/deepsweet/Dropbox/projects/svgo/lib";

diff --git a/test/getOptions.js b/test/getOptions.js
@@ -285,9 +285,11 @@ var testServicePullRequest = function(sut, done){
 var testTravisCi = function(sut, done){
   process.env.TRAVIS = "TRUE";
   process.env.TRAVIS_JOB_ID = "1234";
+  process.env.TRAVIS_PULL_REQUEST = "123";
   sut(function(err, options){
     options.service_name.should.equal("travis-ci");
     options.service_job_id.should.equal("1234");
+    options.service_pull_request.should.equal("123");
     done();
   });
 };