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

Merge pull request #333

Browse Source
This commit is contained in:
Kohsuke Kawaguchi
2017-09-09 12:17:39 -07:00
parent f721e053f1 9012820c03
commit ccfe3ad4f7
3 changed files with 35 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -99,6 +99,19 @@ public class PullRequestTest extends AbstractGitHubApiTestBase {
fail();
}
@Test
public void testSquashMerge() throws Exception {
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");
Thread.sleep(1000);
p.merge("squash merge", null, GHPullRequest.MergeMethod.SQUASH);
branchRef.delete();
}
@Test
// Requires push access to the test repo to pass
public void setLabels() throws Exception {