Skip to content

Commit b8ad489

Browse files
author
sunghyo-jung
committed
Rollback field name, add mapping files
`delete_branch_on_merge` is field of github repository, So use it as same literal (ref. https://developer.github.com/v3/repos/) Use `getRepository` instead of `getTempRepository` at GHRepositoryTest
1 parent 77754b7 commit b8ad489

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

src/main/java/org/kohsuke/github/GHRepository.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ public class GHRepository extends GHObject {
8383
private boolean allow_merge_commit;
8484
private boolean allow_rebase_merge;
8585

86-
private boolean deleteBranchOnMerge;
86+
private boolean delete_branch_on_merge;
8787

8888
@JsonProperty("private")
8989
private boolean _private;
@@ -615,7 +615,7 @@ public boolean isAllowRebaseMerge() {
615615
* @return the boolean
616616
*/
617617
public boolean isDeleteBranchOnMerge() {
618-
return deleteBranchOnMerge;
618+
return delete_branch_on_merge;
619619
}
620620

621621
/**

src/test/java/org/kohsuke/github/GHRepositoryTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -312,13 +312,13 @@ public void setMergeOptions() throws IOException {
312312

313313
@Test
314314
public void getDeleteBranchOnMerge() throws IOException {
315-
GHRepository r = getTempRepository();
315+
GHRepository r = getRepository();
316316
assertNotNull(r.isDeleteBranchOnMerge());
317317
}
318318

319319
@Test
320320
public void setDeleteBranchOnMerge() throws IOException {
321-
GHRepository r = getTempRepository();
321+
GHRepository r = getRepository();
322322

323323
// enable auto delete
324324
r.deleteBranchOnMerge(true);

0 commit comments

Comments
 (0)