Skip to content

feat(project-client): support updating merge method property #1128

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jasonwoods-7 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat(project-client): support updating merge method property #1128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 55 additions & 0 deletions NGitLab.Mock.Tests/ProjectsMockTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -420,6 +420,61 @@ public async Task UpdateAsync_WhenSquashOptionIsNotProvided_ItRetainsExistingVal
Assert.That(updated.SquashOption, Is.EqualTo(SquashOption.Never));
}

[Test]
public async Task UpdateAsync_WhenMergeMethodIsProvided_ItIsUpdated()
{
// Arrange
using var server = new GitLabConfig()
.WithUser("Test", isDefault: true)
.WithProjectOfFullPath("Test/MyProject")
.BuildServer();

var projectClient = server.CreateClient().Projects;
var project = await projectClient.GetAsync("Test/MyProject");

// Act
var updated = await projectClient.UpdateAsync(
project.Id,
new ProjectUpdate
{
MergeMethod = "ff",
});

// Assert
Assert.That(updated.MergeMethod, Is.EqualTo("ff"));
}

[Test]
public async Task UpdateAsync_WhenMergeMethodIsNotProvided_ItRetainsExistingValue()
{
// Arrange
using var server = new GitLabConfig()
.WithUser("Test", isDefault: true)
.WithProjectOfFullPath("Test/MyProject")
.BuildServer();

var projectClient = server.CreateClient().Projects;
var project = await projectClient.GetAsync("Test/MyProject");

await projectClient.UpdateAsync(
project.Id,
new ProjectUpdate
{
SquashOption = SquashOption.Never,
});

// Act
var updated = await projectClient.UpdateAsync(
project.Id,
new ProjectUpdate
{
Description = "updated",
});

// Assert
Assert.That(updated.MergeMethod, Is.Null);
}

[Test]
public void UpdateAsync_WhenProjectNotFound_ItThrows()
{
Expand Down
5 changes: 5 additions & 0 deletions NGitLab.Mock/Clients/ProjectClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,6 +423,11 @@ public Models.Project Update(string id, ProjectUpdate projectUpdate)
project.SquashOption = projectUpdate.SquashOption.Value;
}

if (projectUpdate.MergeMethod is not null)
{
project.MergeMethod = projectUpdate.MergeMethod;
}

return project.ToClientProject(Context.User);
}
}
Expand Down
3 changes: 3 additions & 0 deletions NGitLab/Models/ProjectUpdate.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@ public sealed class ProjectUpdate
[JsonPropertyName("issues_access_level")]
public string IssuesAccessLevel { get; set; }

[JsonPropertyName("merge_method")]
public string MergeMethod { get; set; }

[JsonPropertyName("merge_pipelines_enabled")]
public bool MergePipelinesEnabled { get; set; }

Expand Down
2 changes: 2 additions & 0 deletions NGitLab/PublicAPI/net10.0/PublicAPI.Unshipped.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4056,6 +4056,8 @@ NGitLab.Models.ProjectUpdate.JobsEnabled.get -> bool?
NGitLab.Models.ProjectUpdate.JobsEnabled.set -> void
NGitLab.Models.ProjectUpdate.LfsEnabled.get -> bool?
NGitLab.Models.ProjectUpdate.LfsEnabled.set -> void
NGitLab.Models.ProjectUpdate.MergeMethod.get -> string
NGitLab.Models.ProjectUpdate.MergeMethod.set -> void
NGitLab.Models.ProjectUpdate.MergePipelinesEnabled.get -> bool
NGitLab.Models.ProjectUpdate.MergePipelinesEnabled.set -> void
NGitLab.Models.ProjectUpdate.MergeRequestsAccessLevel.get -> string
Expand Down
2 changes: 2 additions & 0 deletions NGitLab/PublicAPI/net472/PublicAPI.Unshipped.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4057,6 +4057,8 @@ NGitLab.Models.ProjectUpdate.JobsEnabled.get -> bool?
NGitLab.Models.ProjectUpdate.JobsEnabled.set -> void
NGitLab.Models.ProjectUpdate.LfsEnabled.get -> bool?
NGitLab.Models.ProjectUpdate.LfsEnabled.set -> void
NGitLab.Models.ProjectUpdate.MergeMethod.get -> string
NGitLab.Models.ProjectUpdate.MergeMethod.set -> void
NGitLab.Models.ProjectUpdate.MergePipelinesEnabled.get -> bool
NGitLab.Models.ProjectUpdate.MergePipelinesEnabled.set -> void
NGitLab.Models.ProjectUpdate.MergeRequestsAccessLevel.get -> string
Expand Down
2 changes: 2 additions & 0 deletions NGitLab/PublicAPI/net8.0/PublicAPI.Unshipped.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4056,6 +4056,8 @@ NGitLab.Models.ProjectUpdate.JobsEnabled.get -> bool?
NGitLab.Models.ProjectUpdate.JobsEnabled.set -> void
NGitLab.Models.ProjectUpdate.LfsEnabled.get -> bool?
NGitLab.Models.ProjectUpdate.LfsEnabled.set -> void
NGitLab.Models.ProjectUpdate.MergeMethod.get -> string
NGitLab.Models.ProjectUpdate.MergeMethod.set -> void
NGitLab.Models.ProjectUpdate.MergePipelinesEnabled.get -> bool
NGitLab.Models.ProjectUpdate.MergePipelinesEnabled.set -> void
NGitLab.Models.ProjectUpdate.MergeRequestsAccessLevel.get -> string
Expand Down
2 changes: 2 additions & 0 deletions NGitLab/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4057,6 +4057,8 @@ NGitLab.Models.ProjectUpdate.JobsEnabled.get -> bool?
NGitLab.Models.ProjectUpdate.JobsEnabled.set -> void
NGitLab.Models.ProjectUpdate.LfsEnabled.get -> bool?
NGitLab.Models.ProjectUpdate.LfsEnabled.set -> void
NGitLab.Models.ProjectUpdate.MergeMethod.get -> string
NGitLab.Models.ProjectUpdate.MergeMethod.set -> void
NGitLab.Models.ProjectUpdate.MergePipelinesEnabled.get -> bool
NGitLab.Models.ProjectUpdate.MergePipelinesEnabled.set -> void
NGitLab.Models.ProjectUpdate.MergeRequestsAccessLevel.get -> string
Expand Down
Loading