Skip to content

Fix: ProtectBranchRequest #235

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.

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
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@ public sealed class ProtectBranchRequest
/// <param name="unprotectAccessLevel">Access levels allowed to unprotect.</param>
public ProtectBranchRequest(
string name,
ProtectedRefAccessLevels? pushAccessLevel = ProtectedRefAccessLevels.MaintainerAccess,
ProtectedRefAccessLevels? mergeAccessLevel = ProtectedRefAccessLevels.MaintainerAccess,
ProtectedRefAccessLevels? unprotectAccessLevel = ProtectedRefAccessLevels.MaintainerAccess)
ProtectedRefAccessLevels pushAccessLevel = ProtectedRefAccessLevels.MaintainerAccess,
ProtectedRefAccessLevels mergeAccessLevel = ProtectedRefAccessLevels.MaintainerAccess,
ProtectedRefAccessLevels unprotectAccessLevel = ProtectedRefAccessLevels.MaintainerAccess)
{
Guard.NotEmpty(name, nameof(name));

PushAccessLevel = pushAccessLevel.ToString();
MergeAccessLevel = mergeAccessLevel.ToString();
UnprotectAccessLevel = unprotectAccessLevel.ToString();
Name = name;
PushAccessLevel = pushAccessLevel;
MergeAccessLevel = mergeAccessLevel;
UnprotectAccessLevel = unprotectAccessLevel;
}

/// <summary>
Expand All @@ -40,18 +40,18 @@ public ProtectBranchRequest(
/// Access levels allowed to push (defaults: 40, maintainer access level).
/// </summary>
[JsonProperty("push_access_level")]
public string PushAccessLevel { get; set; }
public ProtectedRefAccessLevels PushAccessLevel { get; set; }

/// <summary>
/// Access levels allowed to merge (defaults: 40, maintainer access level).
/// </summary>
[JsonProperty("merge_access_level")]
public string MergeAccessLevel { get; set; }
public ProtectedRefAccessLevels MergeAccessLevel { get; set; }

/// <summary>
/// Access levels allowed to unprotect (defaults: 40, maintainer access level).
/// </summary>
[JsonProperty("unprotect_access_level")]
public string UnprotectAccessLevel { get; set; }
public ProtectedRefAccessLevels UnprotectAccessLevel { get; set; }
}
}
70 changes: 70 additions & 0 deletions test/GitLabApiClient.Test/BranchesClientTest.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
using System.Threading.Tasks;
using FluentAssertions;
using GitLabApiClient.Internal.Queries;
using GitLabApiClient.Models.Branches.Requests;
using GitLabApiClient.Models.Branches.Responses;
using Xunit;
using static GitLabApiClient.Test.Utilities.GitLabApiHelper;

namespace GitLabApiClient.Test
{
[Trait("Category", "LinuxIntegration")]
[Collection("GitLabContainerFixture")]
public class BranchesClientTest
{
private readonly BranchClient _sut = new BranchClient(
GetFacade(), new BranchQueryBuilder());

[Fact]
public async Task CreatedBranchCanBeDeleted()
{
//arrange
const string name = "Title1";
const string source = "main";
var createdBranch = await _sut.CreateAsync(TestProjectId, new Models.Branches.Requests.CreateBranchRequest(name, source));

//act
await _sut.DeleteBranch(TestProjectTextId, createdBranch.Name);

//assert
var deletedBranch = await _sut.GetAsync(TestProjectId, name);
createdBranch.Should().Match<Branch>(i =>
i.Name == "Title1");

deletedBranch.Should().BeNull();
}

[Fact]
public async Task CreatedBranchCanBeProtected()
{
//arrange
const string name = "Title2";
const string source = "main";
var createdBranch = await _sut.CreateAsync(TestProjectId, new Models.Branches.Requests.CreateBranchRequest(name, source));

//act
var protectedBranch = await _sut.ProtectBranchAsync(TestProjectId, new ProtectBranchRequest(name));

//assert
protectedBranch.Should().Match<ProtectedBranch>(i => i.Name == name);
}

[Fact]
public async Task CreatedBranchCanBeUnprotected()
{
//arrange
const string name = "Title3";
const string source = "main";
var createdBranch = await _sut.CreateAsync(TestProjectId, new Models.Branches.Requests.CreateBranchRequest(name, source));

//act
var protectedBranch = await _sut.ProtectBranchAsync(TestProjectId, new ProtectBranchRequest(name));
await _sut.UnprotectBranchAsync(TestProjectId, name);

//assert
protectedBranch.Should().Match<ProtectedBranch>(i => i.Name == name);
var unprotectedBranch = await _sut.GetProtectedBranchesAsync(TestProjectId, name);
unprotectedBranch.Should().BeNull();
}
}
}