diff --git a/src/Crowdin.Api/Branches/BranchMergeStatus.cs b/src/Crowdin.Api/Branches/BranchMergeStatus.cs index 10ca35d6..05accce8 100644 --- a/src/Crowdin.Api/Branches/BranchMergeStatus.cs +++ b/src/Crowdin.Api/Branches/BranchMergeStatus.cs @@ -40,6 +40,8 @@ public class AttributesData [JsonProperty("deleteAfterMerge")] public bool DeleteAfterMerge { get; set; } + [JsonProperty("acceptSourceChanges")] + public bool AcceptSourceChanges { get; set; } } } } \ No newline at end of file diff --git a/src/Crowdin.Api/Branches/MergeBranchRequest.cs b/src/Crowdin.Api/Branches/MergeBranchRequest.cs index c9976e6d..763639b4 100644 --- a/src/Crowdin.Api/Branches/MergeBranchRequest.cs +++ b/src/Crowdin.Api/Branches/MergeBranchRequest.cs @@ -15,5 +15,7 @@ public class MergeBranchRequest [JsonProperty("dryRun")] public bool? DryRun { get; set; } + [JsonProperty("acceptSourceChanges")] + public bool? AcceptSourceChanges { get; set; } } } \ No newline at end of file diff --git a/tests/Crowdin.Api.UnitTesting/Resources/Branches.Designer.cs b/tests/Crowdin.Api.UnitTesting/Resources/Branches.Designer.cs index 84f91a01..954ed34b 100644 --- a/tests/Crowdin.Api.UnitTesting/Resources/Branches.Designer.cs +++ b/tests/Crowdin.Api.UnitTesting/Resources/Branches.Designer.cs @@ -108,7 +108,8 @@ internal static string Request_EditBranch { /// Looks up a localized string similar to { /// "deleteAfterMerge": true, /// "sourceBranchId": 8, - /// "dryRun": true + /// "dryRun": true, + /// "acceptSourceChanges": true ///}. /// internal static string Request_MergeBranch { diff --git a/tests/Crowdin.Api.UnitTesting/Resources/Branches.resx b/tests/Crowdin.Api.UnitTesting/Resources/Branches.resx index 15b9a8d4..2073097b 100644 --- a/tests/Crowdin.Api.UnitTesting/Resources/Branches.resx +++ b/tests/Crowdin.Api.UnitTesting/Resources/Branches.resx @@ -1,25 +1,124 @@ - - - - - - - - text/microsoft-resx - - - 1.3 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - { + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + { "data": [ { "data": { @@ -37,15 +136,15 @@ "limit": 25 } } - - - { + + + { "name": "develop-master", "title": "Master branch" } - - - { + + + { "data": { "id": 34, "projectId": 2, @@ -55,9 +154,9 @@ "updatedAt": "2019-09-19T13:25:27+00:00" } } - - - [ + + + [ { "path": "/name", "op": "replace", @@ -69,15 +168,15 @@ "value": "Master branch" } ] - - - { + + + { "name": "develop-master", "title": "Master branch" } - - - { + + + { "data": { "identifier": "50fb3506-4127-4ba8-8296-f97dc7e3e0c3", "status": "finished", @@ -89,16 +188,17 @@ "finishedAt": "2019-09-23T11:26:54+00:00" } } - - - { + + + { "deleteAfterMerge": true, "sourceBranchId": 8, - "dryRun": true + "dryRun": true, + "acceptSourceChanges": true } - - - { + + + { "data": { "identifier": "50fb3506-4127-4ba8-8296-f97dc7e3e0c3", "status": "finished", @@ -113,9 +213,9 @@ "finishedAt": "2019-09-23T11:26:54+00:00" } } - - - { + + + { "data": { "status": "merged", "sourceBranchId": 100, @@ -129,5 +229,5 @@ } } } - + \ No newline at end of file diff --git a/tests/Crowdin.Api.UnitTesting/Tests/Branches/BranchesOperationsApiTests.cs b/tests/Crowdin.Api.UnitTesting/Tests/Branches/BranchesOperationsApiTests.cs index 1f02849c..448b4055 100644 --- a/tests/Crowdin.Api.UnitTesting/Tests/Branches/BranchesOperationsApiTests.cs +++ b/tests/Crowdin.Api.UnitTesting/Tests/Branches/BranchesOperationsApiTests.cs @@ -111,7 +111,8 @@ public async Task MergeBranch() { DeleteAfterMerge = true, SourceBranchId = 8, - DryRun = true + DryRun = true, + AcceptSourceChanges = true }; string actualRequestJson = JsonConvert.SerializeObject(request, JsonSettings); @@ -226,6 +227,7 @@ private static void Assert_BranchMergeStatus(BranchMergeStatus? status) ArgumentNullException.ThrowIfNull(status.Attributes); Assert.Equal(38, attributes.SourceBranchId); Assert.False(attributes.DeleteAfterMerge); + Assert.False(attributes.AcceptSourceChanges); DateTimeOffset date = DateTimeOffset.Parse("2019-09-23T11:26:54+00:00"); Assert.Equal(date, status.CreatedAt);