diff options
| author | Nick Merwin <[email protected]> | 2015-12-10 12:57:05 -0800 |
|---|---|---|
| committer | Nick Merwin <[email protected]> | 2015-12-10 12:57:05 -0800 |
| commit | b9c366a4d1eafce5d2c9cdf93ebd2a7b0eec574d (patch) | |
| tree | 3cf9b8e7296ca7d07ac7faa36fd2fd489241db83 | |
| parent | 1b4d0a06585ee37a21551fe533e200a84a3ccd4f (diff) | |
| parent | fba900513bb8653d8d83b7c35053be72d519d5d6 (diff) | |
| download | node-coveralls-b9c366a4d1eafce5d2c9cdf93ebd2a7b0eec574d.tar.xz node-coveralls-b9c366a4d1eafce5d2c9cdf93ebd2a7b0eec574d.zip | |
merge conflict
| -rw-r--r-- | lib/convertLcovToCoveralls.js | 5 | ||||
| -rw-r--r-- | lib/getOptions.js | 5 | ||||
| -rw-r--r-- | test/getOptions.js | 2 |
3 files changed, 9 insertions, 3 deletions
diff --git a/lib/convertLcovToCoveralls.js b/lib/convertLcovToCoveralls.js index 896462e..a86dc4e 100644 --- a/lib/convertLcovToCoveralls.js +++ b/lib/convertLcovToCoveralls.js @@ -31,7 +31,7 @@ var convertLcovToCoveralls = function(input, options, cb){ if (err){ logger.error("error from lcovParse: ", err); logger.error("input: ", input); - return cb(err); + return cb(err); } var postJson = { source_files : [] @@ -48,7 +48,7 @@ var convertLcovToCoveralls = function(input, options, cb){ if (options.service_job_id){ postJson.service_job_id = options.service_job_id; } - if (options.service_pull_request){ + if (options.service_pull_request) { postJson.service_pull_request = options.service_pull_request; } if (options.repo_token) { @@ -114,4 +114,3 @@ example output from lcov parser: }, */ - diff --git a/lib/getOptions.js b/lib/getOptions.js index 350af68..144d0ad 100644 --- a/lib/getOptions.js +++ b/lib/getOptions.js @@ -42,6 +42,11 @@ var getBaseOptions = function(cb){ if (process.env.CIRCLECI){ options.service_name = 'circleci'; options.service_job_id = process.env.CIRCLE_BUILD_NUM; + + if (process.env.CI_PULL_REQUEST) { + var pr = process.env.CI_PULL_REQUEST.split('/pull/'); + options.service_pull_request = pr[1]; + } git_commit = process.env.CIRCLE_SHA1; git_branch = process.env.CIRCLE_BRANCH; } diff --git a/test/getOptions.js b/test/getOptions.js index ac26caf..0943fe1 100644 --- a/test/getOptions.js +++ b/test/getOptions.js @@ -301,9 +301,11 @@ var testCircleCi = function(sut, done){ process.env.CIRCLE_BRANCH = "master"; process.env.CIRCLE_BUILD_NUM = "1234"; process.env.CIRCLE_SHA1 = "e3e3e3e3e3e3e3e3e"; + process.env.CI_PULL_REQUEST = 'http://github.com/node-coveralls/pull/3'; sut(function(err, options){ options.service_name.should.equal("circleci"); options.service_job_id.should.equal("1234"); + options.service_pull_request.should.equal('3'); options.git.should.eql({ head: { id: 'e3e3e3e3e3e3e3e3e', author_name: 'Unknown Author', |