From 2b73f98c58cd3996cfb933aa144b554d8e4f635c Mon Sep 17 00:00:00 2001
From: David Herges <dherges@users.noreply.github.com>
Date: Thu, 31 Aug 2017 18:21:40 +0200
Subject: [PATCH] fix: use `iid` for gitlab api v4 in findPr (#756)
GitLab 9.5 deprecates api v3 and `iid` must now be used for MRs
---
lib/api/gitlab.js | 2 +-
test/api/gitlab.spec.js | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/lib/api/gitlab.js b/lib/api/gitlab.js
index 2094654479..8eeb9a1a3d 100644
--- a/lib/api/gitlab.js
+++ b/lib/api/gitlab.js
@@ -319,7 +319,7 @@ async function findPr(branchName, prTitle, state = 'all') {
) {
pr = result;
// GitHub uses number, GitLab uses iid
- pr.number = pr.id;
+ pr.number = config.apiVersion === 'v3' ? pr.id : pr.iid;
pr.body = pr.description;
pr.displayNumber = `Merge Request #${pr.iid}`;
if (pr.state !== 'opened') {
diff --git a/test/api/gitlab.spec.js b/test/api/gitlab.spec.js
index 581ef8b846..33691c42b6 100644
--- a/test/api/gitlab.spec.js
+++ b/test/api/gitlab.spec.js
@@ -482,11 +482,11 @@ describe('api/gitlab', () => {
body: [
{
source_branch: 'some-branch',
- id: 1,
+ iid: 1,
},
{
source_branch: 'some-branch',
- id: 2,
+ iid: 2,
title: 'foo',
},
],
@@ -499,11 +499,11 @@ describe('api/gitlab', () => {
body: [
{
source_branch: 'some-branch',
- id: 1,
+ iid: 1,
},
{
source_branch: 'some-branch',
- id: 2,
+ iid: 2,
},
],
});
--
GitLab