File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -24,10 +24,12 @@ env_pull.pull_request_id #=> 800
2424* Travis-ci
2525 * ` ENV['TRAVIS_PULL_REQUEST'] `
2626 * [ Environment Variables - Travis CI] ( http://docs.travis-ci.com/user/environment-variables/#Convenience-Variables )
27-
2827* CircleCI
2928 * ` ENV['CIRCLE_PR_NUMBER'] `
3029 * [ Environment variables - CircleCI] ( https://circleci.com/docs/environment-variables#building-pull-requests-that-come-from-forks )
30+ * Jenkins GitHub pull request builder plugin
31+ * ` ENV['ghprbPullId'] `
32+ * [ GitHub pull request builder plugin - Jenkins - Jenkins Wiki] ( https://wiki.jenkins-ci.org/display/JENKINS/GitHub+pull+request+builder+plugin#GitHubpullrequestbuilderplugin-EnvironmentVariables )
3133
3234
3335## Changelog
Original file line number Diff line number Diff line change @@ -11,6 +11,8 @@ def fetch_pull_request_id
1111 ENV [ 'TRAVIS_PULL_REQUEST' ] . to_i
1212 elsif ENV [ 'CIRCLE_PR_NUMBER' ]
1313 ENV [ 'CIRCLE_PR_NUMBER' ] . to_i
14+ elsif ENV [ 'ghprbPullId' ]
15+ ENV [ 'ghprbPullId' ] . to_i
1416 end
1517 end
1618
Original file line number Diff line number Diff line change @@ -3,13 +3,16 @@ module TestHelper
33 def stash_env_pull_request
44 @original_travis_pull_request = ENV [ 'TRAVIS_PULL_REQUEST' ]
55 @original_circle_pr_number = ENV [ 'CIRCLE_PR_NUMBER' ]
6+ @original_ghprb_pull_id = ENV [ 'ghprbPullId' ]
67 ENV . delete 'TRAVIS_PULL_REQUEST'
78 ENV . delete 'CIRCLE_PR_NUMBER'
9+ ENV . delete 'ghprbPullId'
810 end
911
1012 def restore_env_pull_request
1113 ENV [ 'TRAVIS_PULL_REQUEST' ] = @original_travis_pull_request
1214 ENV [ 'CIRCLE_PR_NUMBER' ] = @original_circle_pr_number
15+ ENV [ 'ghprbPullId' ] = @original_ghprb_pull_id
1316 end
1417 end
1518end
Original file line number Diff line number Diff line change @@ -68,5 +68,27 @@ def self.shutdown
6868 end
6969 end
7070 end
71+
72+ sub_test_case 'Jenkins GitHub pull request builder plugin' do
73+ pull_id = 800
74+ setup do
75+ ENV [ 'ghprbPullId' ] = pull_id . to_s
76+ end
77+
78+ teardown do
79+ ENV . delete 'ghprbPullId'
80+ end
81+
82+ test '#pull_request?' do
83+ assert do
84+ EnvPullRequest . new . pull_request? == true
85+ end
86+ end
87+ test '#pull_request_id' do
88+ assert do
89+ EnvPullRequest . new . pull_request_id == pull_id
90+ end
91+ end
92+ end
7193 end
7294end
You can’t perform that action at this time.
0 commit comments