jlengrand/github-api
1
0
Fork 0
mirror of https://github.com/jlengrand/github-api.git synced 2026-03-23 00:11:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

address review comments in supporting updating content with sha

Browse Source
This commit is contained in:
Sharath
2018-06-12 18:20:47 -07:00
parent f68a85056e
commit 2fcfb2f67d
3 changed files with 160 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/test/java/org/kohsuke/github/PullRequestTest.java
View File

@@ -105,6 +105,7 @@ public class PullRequestTest extends AbstractGitHubApiTestBase {
String name = rnd.next();
GHRef masterRef = getRepository().getRef("heads/master");
GHRef branchRef = getRepository().createRef("refs/heads/" + name, masterRef.getObject().getSha());
getRepository().createContent(name, name, name, name);
Thread.sleep(1000);
GHPullRequest p = getRepository().createPullRequest(name, name, "master", "## test squash");
@@ -112,6 +113,28 @@ public class PullRequestTest extends AbstractGitHubApiTestBase {
p.merge("squash merge", null, GHPullRequest.MergeMethod.SQUASH);
branchRef.delete();
}
@Test
public void testUpdateContentSquashMerge() throws Exception {
String name = rnd.next();
GHRef masterRef = getRepository().getRef("heads/master");
GHRef branchRef = getRepository().createRef("refs/heads/" + name, masterRef.getObject().getSha());
GHContentUpdateResponse response = getRepository().createContent(name, name, name, name);
Thread.sleep(1000);
GHContentUpdateRequest updateRequest = GHContentUpdateRequest.getBuilder()
.content(name + name)
.path(name)
.branch(name)
.commitMessage(name)
.sha(response.getContent().getSha())
.build();
getRepository().createContent(updateRequest);
GHPullRequest p = getRepository().createPullRequest(name, name, "master", "## test squash");
Thread.sleep(1000);
p.merge("squash merge", null, GHPullRequest.MergeMethod.SQUASH);
branchRef.delete();
}
@Test
// Requires push access to the test repo to pass