aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorNick Merwin <[email protected]>2015-12-10 12:57:05 -0800
committerNick Merwin <[email protected]>2015-12-10 12:57:05 -0800
commitb9c366a4d1eafce5d2c9cdf93ebd2a7b0eec574d (patch)
tree3cf9b8e7296ca7d07ac7faa36fd2fd489241db83 /test
parent1b4d0a06585ee37a21551fe533e200a84a3ccd4f (diff)
parentfba900513bb8653d8d83b7c35053be72d519d5d6 (diff)
downloadnode-coveralls-b9c366a4d1eafce5d2c9cdf93ebd2a7b0eec574d.tar.xz
node-coveralls-b9c366a4d1eafce5d2c9cdf93ebd2a7b0eec574d.zip
merge conflict
Diffstat (limited to 'test')
-rw-r--r--test/getOptions.js2
1 files changed, 2 insertions, 0 deletions
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',