Skip to content

Commit b55c922

Browse files
authored
Merge pull request #294 from bitwiseman/task/github-api-1.109
Upgrade github-api to 1.110
2 parents 28f9a64 + 49b07a9 commit b55c922

File tree

4 files changed

+6
-7
lines changed

4 files changed

+6
-7
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
<dependency>
4747
<groupId>org.jenkins-ci.plugins</groupId>
4848
<artifactId>github-api</artifactId>
49-
<version>1.106</version>
49+
<version>1.110</version>
5050
</dependency>
5151
<!-- TODO: after upgrading jenkins.version >= 2.171, migrate dependency -->
5252
<dependency>

src/test/java/org/jenkinsci/plugins/github_branch_source/GithubSCMSourceTagsTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ public void testExistingMultipleTagsIteratorGHExceptionOnHasNextAndDoesNotHaveOn
264264
GitHubSCMSourceRequest request = context.newRequest(new GitHubSCMSource("cloudbeers", "yolo", null, false), null);
265265
GHRepository repoSpy = Mockito.spy(repo);
266266
PagedIterable<GHRef> iterableSpy = (PagedIterable<GHRef>)Mockito.mock(PagedIterable.class);
267-
Mockito.when(repoSpy.listRefs("tags")).thenReturn(iterableSpy);
267+
Mockito.when(repoSpy.listRefs("tags")).thenReturn(iterableSpy).thenCallRealMethod();
268268

269269
PagedIterator<GHRef> iteratorSpy = (PagedIterator<GHRef>)Mockito.mock(PagedIterator.class);
270270
Mockito.when(iterableSpy.iterator()).thenReturn(iteratorSpy);

src/test/resources/api/__files/body-orgs-cloudbeers-teams-AHFpl.json renamed to src/test/resources/api/__files/body-orgs-cloudbeers-teams-justice-league-AHFpl.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
[{
1+
{
22
"id": 1,
33
"node_id": "MDQ6VGVhbTE=",
44
"url": "https://api.github.com/teams/1",
@@ -10,5 +10,4 @@
1010
"members_url": "https://api.github.com/teams/1/members{/member}",
1111
"repositories_url": "https://api.github.com/teams/1/repos",
1212
"parent": null
13-
}
14-
]
13+
}

src/test/resources/api/mappings/mapping-body-orgs-cloudbeers-teams-AHFpl.json renamed to src/test/resources/api/mappings/mapping-body-orgs-cloudbeers-teams-justice-league-AHFpl.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
22
"request" : {
3-
"url" : "/orgs/cloudbeers/teams",
3+
"url" : "/orgs/cloudbeers/teams/justice-league",
44
"method" : "GET"
55
},
66
"response" : {
77
"status" : 200,
8-
"bodyFileName" : "body-orgs-cloudbeers-teams-AHFpl.json",
8+
"bodyFileName" : "body-orgs-cloudbeers-teams-justice-league-AHFpl.json",
99
"headers" : {
1010
"Server" : "GitHub.com",
1111
"Date" : "Wed, 07 Dec 2016 23:37:43 GMT",

0 commit comments

Comments
 (0)