Skip to content

feat: add SquashOption support to ProjectUpdate and mock #1079

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

Merged
Toa741 merged 2 commits into from
Apr 8, 2026
Merged

feat: add SquashOption support to ProjectUpdate and mock #1079

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
012c473
feat: add SquashOption support to ProjectUpdate and mock
jasonwoods-7 Apr 2, 2026
473a93c
Merge branch 'main' into feat/update-project-squash
Toa741 Apr 8, 2026
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
49 changes: 49 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 @@ -371,6 +371,55 @@ public async Task CreateAsync_WhenProjectNameOfDifferentCaseAlreadyExists_ItWork
Assert.That(newProject.Name, Is.EqualTo("NOT_DUPLICATE"));
}

[Test]
public async Task UpdateAsync_WhenSquashOptionIsProvided_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
{
SquashOption = SquashOption.Always,
});

// Assert
Assert.That(updated.SquashOption, Is.EqualTo(SquashOption.Always));
}

[Test]
public async Task UpdateAsync_WhenSquashOptionIsNotProvided_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 — update without specifying SquashOption
var updated = await projectClient.UpdateAsync(project.Id, new ProjectUpdate
{
Description = "updated",
});

// Assert
Assert.That(updated.SquashOption, Is.EqualTo(SquashOption.Never));
}

[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 @@ -383,6 +383,11 @@ public Models.Project Update(string id, ProjectUpdate projectUpdate)
project.Topics = projectUpdate.Topics.Where(t => !string.IsNullOrEmpty(t)).Distinct(StringComparer.Ordinal).ToArray();
}

if (projectUpdate.SquashOption.HasValue)
{
project.SquashOption = projectUpdate.SquashOption.Value;
}

return project.ToClientProject(Context.User);
}
}
Expand Down
3 changes: 3 additions & 0 deletions NGitLab.Mock/Project.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,8 @@ public string[] Tags

public string RunnersToken { get; internal set; }

public SquashOption SquashOption { get; set; }

public void Remove()
{
Group.Projects.Remove(this);
Expand Down Expand Up @@ -483,6 +485,7 @@ public Models.Project ToClientProject(User currentUser)
Statistics = Statistics,
TagList = Tags,
Topics = Topics,
SquashOption = new DynamicEnum<SquashOption>(SquashOption),
Mirror = Mirror,
MirrorUserId = MirrorUserId,
MirrorTriggerBuilds = MirrorTriggerBuilds,
Expand Down
2 changes: 2 additions & 0 deletions NGitLab.Mock/PublicAPI.Unshipped.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -956,6 +956,8 @@ NGitLab.Mock.Project.Repository.get -> NGitLab.Mock.Repository
NGitLab.Mock.Project.RepositoryAccessLevel.get -> NGitLab.Models.RepositoryAccessLevel
NGitLab.Mock.Project.RepositoryAccessLevel.set -> void
NGitLab.Mock.Project.RunnersToken.get -> string
NGitLab.Mock.Project.SquashOption.get -> NGitLab.Models.SquashOption
NGitLab.Mock.Project.SquashOption.set -> void
NGitLab.Mock.Project.SshUrl.get -> string
NGitLab.Mock.Project.Statistics.get -> NGitLab.Models.ProjectStatistics
NGitLab.Mock.Project.Statistics.set -> void
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 @@ -110,4 +110,7 @@ public sealed class ProjectUpdate

[JsonPropertyName("ci_default_git_depth")]
public int? CiDefaultGitDepth { get; set; }

[JsonPropertyName("squash_option")]
public SquashOption? SquashOption { get; set; }
}
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 @@ -4066,6 +4066,8 @@ NGitLab.Models.ProjectUpdate.SnippetsAccessLevel.get -> string
NGitLab.Models.ProjectUpdate.SnippetsAccessLevel.set -> void
NGitLab.Models.ProjectUpdate.SnippetsEnabled.get -> bool?
NGitLab.Models.ProjectUpdate.SnippetsEnabled.set -> void
NGitLab.Models.ProjectUpdate.SquashOption.get -> NGitLab.Models.SquashOption?
NGitLab.Models.ProjectUpdate.SquashOption.set -> void
NGitLab.Models.ProjectUpdate.TagList.get -> string[]
NGitLab.Models.ProjectUpdate.TagList.set -> void
NGitLab.Models.ProjectUpdate.Topics.get -> System.Collections.Generic.List<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 @@ -4067,6 +4067,8 @@ NGitLab.Models.ProjectUpdate.SnippetsAccessLevel.get -> string
NGitLab.Models.ProjectUpdate.SnippetsAccessLevel.set -> void
NGitLab.Models.ProjectUpdate.SnippetsEnabled.get -> bool?
NGitLab.Models.ProjectUpdate.SnippetsEnabled.set -> void
NGitLab.Models.ProjectUpdate.SquashOption.get -> NGitLab.Models.SquashOption?
NGitLab.Models.ProjectUpdate.SquashOption.set -> void
NGitLab.Models.ProjectUpdate.TagList.get -> string[]
NGitLab.Models.ProjectUpdate.TagList.set -> void
NGitLab.Models.ProjectUpdate.Topics.get -> System.Collections.Generic.List<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 @@ -4066,6 +4066,8 @@ NGitLab.Models.ProjectUpdate.SnippetsAccessLevel.get -> string
NGitLab.Models.ProjectUpdate.SnippetsAccessLevel.set -> void
NGitLab.Models.ProjectUpdate.SnippetsEnabled.get -> bool?
NGitLab.Models.ProjectUpdate.SnippetsEnabled.set -> void
NGitLab.Models.ProjectUpdate.SquashOption.get -> NGitLab.Models.SquashOption?
NGitLab.Models.ProjectUpdate.SquashOption.set -> void
NGitLab.Models.ProjectUpdate.TagList.get -> string[]
NGitLab.Models.ProjectUpdate.TagList.set -> void
NGitLab.Models.ProjectUpdate.Topics.get -> System.Collections.Generic.List<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 @@ -4067,6 +4067,8 @@ NGitLab.Models.ProjectUpdate.SnippetsAccessLevel.get -> string
NGitLab.Models.ProjectUpdate.SnippetsAccessLevel.set -> void
NGitLab.Models.ProjectUpdate.SnippetsEnabled.get -> bool?
NGitLab.Models.ProjectUpdate.SnippetsEnabled.set -> void
NGitLab.Models.ProjectUpdate.SquashOption.get -> NGitLab.Models.SquashOption?
NGitLab.Models.ProjectUpdate.SquashOption.set -> void
NGitLab.Models.ProjectUpdate.TagList.get -> string[]
NGitLab.Models.ProjectUpdate.TagList.set -> void
NGitLab.Models.ProjectUpdate.Topics.get -> System.Collections.Generic.List<string>
Expand Down
Loading