diff options
| author | Josh Callender <[email protected]> | 2015-04-24 12:57:16 -0700 |
|---|---|---|
| committer | Josh Callender <[email protected]> | 2015-04-24 13:10:02 -0700 |
| commit | fba900513bb8653d8d83b7c35053be72d519d5d6 (patch) | |
| tree | ba157de6de2f00555550050b92d8b4affc58706a | |
| parent | 45ef2a5508ed4485a0ee15354dcb1e3829fa9a6e (diff) | |
| download | node-coveralls-fba900513bb8653d8d83b7c35053be72d519d5d6.tar.xz node-coveralls-fba900513bb8653d8d83b7c35053be72d519d5d6.zip | |
CI_PULL_REQUEST is just the url for the entire PR, have to split it and
grab the number there. CIRCLE_PR_NUMBER is only defined for forks.
| -rw-r--r-- | lib/getOptions.js | 6 | ||||
| -rw-r--r-- | test/getOptions.js | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/lib/getOptions.js b/lib/getOptions.js index 4289ad9..e729e53 100644 --- a/lib/getOptions.js +++ b/lib/getOptions.js @@ -35,7 +35,11 @@ var getBaseOptions = function(cb){ if (process.env.CIRCLECI){ options.service_name = 'circleci'; options.service_job_id = process.env.CIRCLE_BUILD_NUM; - options.service_pull_request = process.env.CI_PULL_REQUEST; + + 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 12505a1..05f9657 100644 --- a/test/getOptions.js +++ b/test/getOptions.js @@ -286,7 +286,7 @@ var testCircleCi = function(sut, done){ sut(function(err, options){ options.service_name.should.equal("circleci"); options.service_job_id.should.equal("1234"); - options.service_pull_request.should.equal('http://github.com/node-coveralls/pull/3'); + options.service_pull_request.should.equal('3'); options.git.should.eql({ head: { id: 'e3e3e3e3e3e3e3e3e', author_name: 'Unknown Author', |