diff --git a/src/main/java/com/crowdin/client/branches/model/BranchMergeStatus.java b/src/main/java/com/crowdin/client/branches/model/BranchMergeStatus.java index 55b1bbdb5..bb3ff770c 100644 --- a/src/main/java/com/crowdin/client/branches/model/BranchMergeStatus.java +++ b/src/main/java/com/crowdin/client/branches/model/BranchMergeStatus.java @@ -21,5 +21,6 @@ public static class Attributes { private Integer sourceBranchId; private Boolean deleteAfterMerge; + private Boolean acceptSourceChanges; } } diff --git a/src/main/java/com/crowdin/client/branches/model/MergeBranchRequest.java b/src/main/java/com/crowdin/client/branches/model/MergeBranchRequest.java index 0761d1b91..c52d16c59 100644 --- a/src/main/java/com/crowdin/client/branches/model/MergeBranchRequest.java +++ b/src/main/java/com/crowdin/client/branches/model/MergeBranchRequest.java @@ -8,4 +8,5 @@ public class MergeBranchRequest { private Boolean deleteAfterMerge; private Long sourceBranchId; private Boolean dryRun; + private Boolean acceptSourceChanges; } diff --git a/src/test/java/com/crowdin/client/branches/BranchesApiTest.java b/src/test/java/com/crowdin/client/branches/BranchesApiTest.java index 440435108..a195487a2 100644 --- a/src/test/java/com/crowdin/client/branches/BranchesApiTest.java +++ b/src/test/java/com/crowdin/client/branches/BranchesApiTest.java @@ -12,6 +12,7 @@ import java.util.List; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; class BranchesApiTest extends TestClient { @@ -56,9 +57,11 @@ public void mergeBranchTest() { request.setDeleteAfterMerge(true); request.setSourceBranchId(sourceBranchId); request.setDryRun(false); + request.setAcceptSourceChanges(true); ResponseObject response = this.getBranchesApi().mergeBranch(projectId, id, request); assertEquals(response.getData().getIdentifier(), mergeId); + assertTrue(response.getData().getAttributes().getAcceptSourceChanges()); } @Test diff --git a/src/test/resources/api/branches/branchMergeStatus.json b/src/test/resources/api/branches/branchMergeStatus.json index 138c5e461..4539d9b0b 100644 --- a/src/test/resources/api/branches/branchMergeStatus.json +++ b/src/test/resources/api/branches/branchMergeStatus.json @@ -5,7 +5,8 @@ "progress": 100, "attributes": { "sourceBranchId": 8, - "deleteAfterMerge": false + "deleteAfterMerge": false, + "acceptSourceChanges": true }, "createdAt": "2019-09-23T11:26:54+00:00", "updatedAt": "2019-09-23T11:26:54+00:00", diff --git a/src/test/resources/api/branches/mergeBranchRequest.json b/src/test/resources/api/branches/mergeBranchRequest.json index 1727b97fd..2305f67d8 100644 --- a/src/test/resources/api/branches/mergeBranchRequest.json +++ b/src/test/resources/api/branches/mergeBranchRequest.json @@ -1,5 +1,6 @@ { "deleteAfterMerge": true, "sourceBranchId": 8, - "dryRun": false + "dryRun": false, + "acceptSourceChanges": true }