fix(2029): Add prSource to prInfo return value (#154)

screwdriver-cd · Apr 17, 2020 · b49641b · b49641b
1 parent af36178
commit b49641b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/index.js b/index.js
@@ -1390,6 +1390,9 @@ class GithubScm extends Scm {
                     repo: scmInfo.repo
                 }
             });
+            const prSource = pullRequestInfo.data.head.repo.id === pullRequestInfo.data.base.repo.id
+                ? 'branch'
+                : 'fork';
 
             return {
                 name: `PR-${pullRequestInfo.data.number}`,
@@ -1402,7 +1405,8 @@ class GithubScm extends Scm {
                 createTime: pullRequestInfo.data.created_at,
                 userProfile: pullRequestInfo.data.user.html_url,
                 baseBranch: pullRequestInfo.data.base.ref,
-                mergeable: pullRequestInfo.data.mergeable
+                mergeable: pullRequestInfo.data.mergeable,
+                prSource
             };
         } catch (err) {
             logger.error('Failed to getPrInfo: ', err);

diff --git a/test/index.test.js b/test/index.test.js
@@ -2175,7 +2175,8 @@ jobs:
                         userProfile: 'https://github.com/octocat',
                         prBranchName: 'new-topic',
                         baseBranch: 'master',
-                        mergeable: true
+                        mergeable: true,
+                        prSource: 'branch'
                     }
                 );
                 assert.calledWith(githubMock.request, 'GET /repositories/:id', { id: '111' });
@@ -2212,7 +2213,8 @@ jobs:
                         userProfile: 'https://github.com/octocat',
                         prBranchName: 'new-topic',
                         baseBranch: 'master',
-                        mergeable: true
+                        mergeable: true,
+                        prSource: 'branch'
                     }
                 );
                 assert.notCalled(githubMock.request);