Skip to content
Merged
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
8 changes: 4 additions & 4 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,21 @@
<CentralPackageTransitivePinningEnabled>false</CentralPackageTransitivePinningEnabled>
</PropertyGroup>
<ItemGroup>
<PackageVersion Include="coverlet.collector" Version="10.0.0" />
<PackageVersion Include="coverlet.collector" Version="10.0.1" />
<PackageVersion Include="Docker.DotNet" Version="3.125.15" />
<PackageVersion Include="DotNet.ReproducibleBuilds" Version="2.0.2" />
<PackageVersion Include="LibGit2Sharp" Version="0.30.0" />
<PackageVersion Include="Meziantou.Analyzer" Version="3.0.98" />
<PackageVersion Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="3.3.4" />
<PackageVersion Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="10.0.300" />
<PackageVersion Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.3.4" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.4.0" />
<PackageVersion Include="Microsoft.Playwright" Version="1.59.0" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.6.0" />
<PackageVersion Include="Microsoft.Playwright" Version="1.60.0" />
<PackageVersion Include="MinVer" Version="7.0.0" />
<PackageVersion Include="NeoSmart.AsyncLock" Version="3.2.1" />
<PackageVersion Include="NSubstitute" Version="5.3.0" />
<PackageVersion Include="NuGet.Versioning" Version="7.6.0" />
<PackageVersion Include="NUnit" Version="4.5.1" />
<PackageVersion Include="NUnit" Version="4.6.1" />
<PackageVersion Include="NUnit.Analyzers" Version="4.14.0" />
<PackageVersion Include="NUnit3TestAdapter" Version="6.2.0" />
<PackageVersion Include="Polly" Version="8.6.6" />
Expand Down
5 changes: 3 additions & 2 deletions NGitLab.Mock.Tests/FileTests.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using System.IO;
using System;
using System.IO;
using System.Threading.Tasks;
using NGitLab.Models;
using NUnit.Framework;
Expand Down Expand Up @@ -37,7 +38,7 @@ await filesClient.GetRawAsync(fileToLookUp, async stream =>
}
else
{
Assert.ThrowsAsync<GitLabException>(async () => await filesClient.GetRawAsync(fileToLookUp, _ => Task.CompletedTask).ConfigureAwait(false));
Assert.ThrowsAsync<GitLabException>((Func<Task>)(async () => await filesClient.GetRawAsync(fileToLookUp, _ => Task.CompletedTask).ConfigureAwait(false)));
}
}
}
16 changes: 8 additions & 8 deletions NGitLab.Mock.Tests/GitLabClientMockTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,11 @@ public void Test_can_get_project_client(Func<IGitLabClient, ProjectId, object> g

var client = server.CreateClient();

Assert.Multiple(() =>
Assert.Multiple((Action)(() =>
{
Assert.That(getClient(client, 1), Is.Not.Null);
Assert.That(getClient(client, "test-group/test-project"), Is.Not.Null);
});
}));
}

[TestCaseSource(nameof(GroupClientTestCases))]
Expand All @@ -79,11 +79,11 @@ public void Test_can_get_group_client(Func<IGitLabClient, GroupId, object> getCl

var client = server.CreateClient();

Assert.Multiple(() =>
Assert.Multiple((Action)(() =>
{
Assert.That(getClient(client, 1), Is.Not.Null);
Assert.That(getClient(client, "parent-group/test-group"), Is.Not.Null);
});
}));
}

[Test]
Expand All @@ -106,11 +106,11 @@ public void Test_getting_MergeRequestClient_for_group_is_not_implemented()

var client = server.CreateClient();

Assert.Multiple(() =>
Assert.Multiple((Action)(() =>
{
Assert.Throws<NotImplementedException>(() => client.GetGroupMergeRequest(1));
Assert.Throws<NotImplementedException>(() => client.GetGroupMergeRequest("parent-group/test-group"));
});
Assert.Throws<NotImplementedException>((Action)(() => client.GetGroupMergeRequest(1)));
Assert.Throws<NotImplementedException>((Action)(() => client.GetGroupMergeRequest("parent-group/test-group")));
}));
}

private static IEnumerable<MethodInfo> GetMethods<TParameter>()
Expand Down
62 changes: 31 additions & 31 deletions NGitLab.Mock.Tests/GroupsMockTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ public void Test_get_groups_with_top_level_only_ignores_subgroups()
using var server = CreateGroupHierarchy();

var client = server.CreateClient("user1");
var groups = client.Groups.GetAsync(new Models.GroupQuery { TopLevelOnly = true });
var groups = client.Groups.GetAsync(new GroupQuery { TopLevelOnly = true });

var expected = new string[] { "user1", "tlg" };
Assert.That(groups.AsEnumerable().Select(g => g.FullPath), Is.EquivalentTo(expected));
Expand All @@ -85,11 +85,11 @@ public async Task Test_page_groups_first_page()
(var page, var total) = await client.Groups.PageAsync(new(page: 1, perPage: 3));

var expected = new string[] { "user1", "tlg", "tlg/sg1" };
Assert.Multiple(() =>
Assert.Multiple((Action)(() =>
{
Assert.That(page.Select(g => g.FullPath), Is.EquivalentTo(expected));
Assert.That(total, Is.EqualTo(6));
});
}));
}

[Test]
Expand All @@ -101,11 +101,11 @@ public async Task Test_page_groups_last_page()
(var page, var total) = await client.Groups.PageAsync(new(page: 2, perPage: 4));

var expected = new string[] { "tlg/sg2", "tlg/sg2/sg2_1" };
Assert.Multiple(() =>
Assert.Multiple((Action)(() =>
{
Assert.That(page.Select(g => g.FullPath), Is.EquivalentTo(expected));
Assert.That(total, Is.EqualTo(6));
});
}));
}

[Test]
Expand All @@ -124,7 +124,7 @@ public void Test_page_groups_with_invalid_perpage_throws()
{
using var server = CreateGroupHierarchy();
var client = server.CreateClient("user1");
Assert.ThrowsAsync<GitLabException>(() => client.Groups.PageAsync(new(perPage: 0)));
Assert.ThrowsAsync<GitLabException>((Func<Task>)(() => client.Groups.PageAsync(new(perPage: 0))));
}

[Test]
Expand All @@ -141,7 +141,7 @@ public void Test_get_subgroups_by_id()
.BuildServer();

var client = server.CreateClient("user1");
var group = client.Groups.GetSubgroupsByIdAsync(12, new Models.SubgroupQuery { });
var group = client.Groups.GetSubgroupsByIdAsync(12, new SubgroupQuery { });

Assert.That(group.Count(), Is.EqualTo(2), "Subgroups found are invalid");
}
Expand All @@ -160,7 +160,7 @@ public void Test_get_subgroups_by_fullpath()
.BuildServer();

var client = server.CreateClient("user1");
var group = client.Groups.GetSubgroupsByFullPathAsync("parentgroup1", new Models.SubgroupQuery { });
var group = client.Groups.GetSubgroupsByFullPathAsync("parentgroup1", new SubgroupQuery { });

Assert.That(group.Count(), Is.EqualTo(2), "Subgroups found are invalid");
}
Expand All @@ -171,7 +171,7 @@ public void Test_get_subgroups_descendants_by_fullpath()
using var server = CreateGroupHierarchy();

var client = server.CreateClient("user1");
var group = client.Groups.GetSubgroupsByFullPathAsync("tlg", new Models.SubgroupQuery { IncludeDescendants = true });
var group = client.Groups.GetSubgroupsByFullPathAsync("tlg", new SubgroupQuery { IncludeDescendants = true });

var expected = new string[] { "tlg/sg1", "tlg/sg1/sg1_1", "tlg/sg2", "tlg/sg2/sg2_1" };
Assert.That(group.AsEnumerable().Select(g => g.FullPath), Is.EquivalentTo(expected));
Expand All @@ -183,7 +183,7 @@ public void Test_get_subgroups_descendants_by_id()
using var server = CreateGroupHierarchy();

var client = server.CreateClient("user1");
var group = client.Groups.GetSubgroupsByIdAsync(1, new Models.SubgroupQuery { IncludeDescendants = true });
var group = client.Groups.GetSubgroupsByIdAsync(1, new SubgroupQuery { IncludeDescendants = true });

var expected = new string[] { "tlg/sg1", "tlg/sg1/sg1_1", "tlg/sg2", "tlg/sg2/sg2_1" };
Assert.That(group.AsEnumerable().Select(g => g.FullPath), Is.EquivalentTo(expected));
Expand All @@ -195,7 +195,7 @@ public void Test_get_subgroups_descendants_of_subgroup_by_fullpath()
using var server = CreateGroupHierarchy();

var client = server.CreateClient("user1");
var group = client.Groups.GetSubgroupsAsync("tlg/sg2", new Models.SubgroupQuery { IncludeDescendants = true });
var group = client.Groups.GetSubgroupsAsync("tlg/sg2", new SubgroupQuery { IncludeDescendants = true });

var expected = new string[] { "tlg/sg2/sg2_1" };
Assert.That(group.AsEnumerable().Select(g => g.FullPath), Is.EquivalentTo(expected));
Expand All @@ -207,7 +207,7 @@ public void Test_get_subgroups_descendants_of_subgroup_by_id()
using var server = CreateGroupHierarchy();

var client = server.CreateClient("user1");
var group = client.Groups.GetSubgroupsAsync(2, new Models.SubgroupQuery { IncludeDescendants = true });
var group = client.Groups.GetSubgroupsAsync(2, new SubgroupQuery { IncludeDescendants = true });

var expected = new string[] { "tlg/sg1/sg1_1" };
Assert.That(group.AsEnumerable().Select(g => g.FullPath), Is.EquivalentTo(expected));
Expand All @@ -219,14 +219,14 @@ public async Task Test_page_subgroups_with_descendants_first_page()
using var server = CreateGroupHierarchy();

var client = server.CreateClient("user1");
(var page, var total) = await client.Groups.PageSubgroupsAsync("tlg", new(page: 1, perPage: 3, new Models.SubgroupQuery { IncludeDescendants = true }));
(var page, var total) = await client.Groups.PageSubgroupsAsync("tlg", new(page: 1, perPage: 3, new SubgroupQuery { IncludeDescendants = true }));

var expected = new string[] { "tlg/sg1", "tlg/sg1/sg1_1", "tlg/sg2" };
Assert.Multiple(() =>
Assert.Multiple((Action)(() =>
{
Assert.That(page.Select(g => g.FullPath), Is.EquivalentTo(expected));
Assert.That(total, Is.EqualTo(4));
});
}));
}

[Test]
Expand All @@ -235,14 +235,14 @@ public async Task Test_page_subgroups_with_descendants_last_page()
using var server = CreateGroupHierarchy();

var client = server.CreateClient("user1");
(var page, var total) = await client.Groups.PageSubgroupsAsync(1, new(page: 2, perPage: 3, new Models.SubgroupQuery { IncludeDescendants = true }));
(var page, var total) = await client.Groups.PageSubgroupsAsync(1, new(page: 2, perPage: 3, new SubgroupQuery { IncludeDescendants = true }));

var expected = new string[] { "tlg/sg2/sg2_1" };
Assert.Multiple(() =>
Assert.Multiple((Action)(() =>
{
Assert.That(page.Select(g => g.FullPath), Is.EquivalentTo(expected));
Assert.That(total, Is.EqualTo(4));
});
}));
}

[Test]
Expand All @@ -251,13 +251,13 @@ public async Task Test_page_subgroups_with_descendants_after_last_page()
using var server = CreateGroupHierarchy();

var client = server.CreateClient("user1");
(var page, var total) = await client.Groups.PageSubgroupsAsync(1, new(page: 100, perPage: 3, new Models.SubgroupQuery { IncludeDescendants = true }));
(var page, var total) = await client.Groups.PageSubgroupsAsync(1, new(page: 100, perPage: 3, new SubgroupQuery { IncludeDescendants = true }));

Assert.Multiple(() =>
Assert.Multiple((Action)(() =>
{
Assert.That(page.Select(g => g.FullPath), Is.Empty);
Assert.That(total, Is.EqualTo(4));
});
}));
}

[Test]
Expand All @@ -276,7 +276,7 @@ public void Test_page_subgroups_with_invalid_perpage_throws()
{
using var server = CreateGroupHierarchy();
var client = server.CreateClient("user1");
Assert.ThrowsAsync<GitLabException>(() => client.Groups.PageSubgroupsAsync(1, new(page: 1, perPage: 0)));
Assert.ThrowsAsync<GitLabException>((Func<Task>)(() => client.Groups.PageSubgroupsAsync(1, new(page: 1, perPage: 0))));
}

[Test]
Expand All @@ -288,11 +288,11 @@ public async Task Test_page_projects_first_page()
(var page, var total) = await client.Groups.PageProjectsAsync("tlg", new(page: 1, perPage: 1000));

var expected = new string[] { "tlg/p1" };
Assert.Multiple(() =>
Assert.Multiple((Action)(() =>
{
Assert.That(page.Select(p => p.PathWithNamespace), Is.EquivalentTo(expected));
Assert.That(total, Is.EqualTo(1));
});
}));
}

[Test]
Expand All @@ -304,11 +304,11 @@ public async Task Test_page_projects_in_subgroup()
(var page, var total) = await client.Groups.PageProjectsAsync("tlg/sg1", new(page: 2, perPage: 1));

var expected = new string[] { "tlg/sg1/p3" };
Assert.Multiple(() =>
Assert.Multiple((Action)(() =>
{
Assert.That(page.Select(p => p.PathWithNamespace), Is.EquivalentTo(expected));
Assert.That(total, Is.EqualTo(2));
});
}));
}

[Test]
Expand All @@ -319,11 +319,11 @@ public async Task Test_page_projects_in_subgroup_with_no_projects()
var client = server.CreateClient("user1");
(var page, var total) = await client.Groups.PageProjectsAsync("tlg/sg2", new());

Assert.Multiple(() =>
Assert.Multiple((Action)(() =>
{
Assert.That(page.Select(p => p.PathWithNamespace), Is.Empty);
Assert.That(total, Is.EqualTo(0));
});
}));
}

[Test]
Expand All @@ -335,11 +335,11 @@ public async Task Test_page_projects_in_subgroup_with_descendants()
(var page, var total) = await client.Groups.PageProjectsAsync("tlg", new(query: new() { IncludeSubGroups = true }));

var expected = new string[] { "p1", "p2", "p3" };
Assert.Multiple(() =>
Assert.Multiple((Action)(() =>
{
Assert.That(page.Select(p => p.Name), Is.EquivalentTo(expected));
Assert.That(total, Is.EqualTo(3));
});
}));
}

[Test]
Expand Down Expand Up @@ -417,7 +417,7 @@ public async Task Test_group_created_at_date()
var client = server.CreateClient("user1");

var t1 = DateTime.UtcNow;
var group = await client.Groups.CreateAsync(new Models.GroupCreate
var group = await client.Groups.CreateAsync(new GroupCreate
{
Name = "Foo",
Path = "foo",
Expand Down
5 changes: 3 additions & 2 deletions NGitLab.Mock.Tests/IssuesMockTests.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using System.Linq;
using System;
using System.Linq;
using NGitLab.Mock.Config;
using NGitLab.Models;
using NUnit.Framework;
Expand Down Expand Up @@ -53,7 +54,7 @@ public void Test_issues_assignee_not_throwing_when_assignees_is_null()
.BuildServer();

var client = server.CreateClient();
Assert.DoesNotThrow(() => client.Issues.Get(new IssueQuery { Scope = "assigned_to_me" }).ToArray());
Assert.DoesNotThrow((Action)(() => client.Issues.Get(new IssueQuery { Scope = "assigned_to_me" }).ToArray()));
}

[Test]
Expand Down
8 changes: 4 additions & 4 deletions NGitLab.Mock.Tests/MergeRequestsMockTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -197,11 +197,11 @@ public void Test_merge_request_with_non_conflicting_rebase_needed_and_merge_meth
var maintainerClient = server.CreateClient("maintainer");

// Act/Assert
var exception = Assert.Throws<GitLabException>(() => maintainerClient.GetMergeRequest(mr.Project.Id).Accept(mr.Iid, new MergeRequestMerge
var exception = Assert.Throws<GitLabException>((Action)(() => maintainerClient.GetMergeRequest(mr.Project.Id).Accept(mr.Iid, new MergeRequestMerge
{
MergeWhenPipelineSucceeds = mr.HeadPipeline != null,
ShouldRemoveSourceBranch = true,
}));
})));
Assert.That(exception.StatusCode, Is.EqualTo(HttpStatusCode.MethodNotAllowed));
Assert.That(exception.Message.Equals("The MR cannot be merged with method 'ff': the source branch must first be rebased", StringComparison.Ordinal), Is.True);

Expand Down Expand Up @@ -253,11 +253,11 @@ public void Test_merge_request_with_conflicts_cannot_be_accepted(bool sourceProj
var maintainerClient = server.CreateClient("maintainer");

// Act/Assert
var exception = Assert.Throws<GitLabException>(() => maintainerClient.GetMergeRequest(mr.Project.Id).Accept(mr.Iid, new MergeRequestMerge
var exception = Assert.Throws<GitLabException>((Action)(() => maintainerClient.GetMergeRequest(mr.Project.Id).Accept(mr.Iid, new MergeRequestMerge
{
MergeWhenPipelineSucceeds = mr.HeadPipeline != null,
ShouldRemoveSourceBranch = true,
}));
})));
Assert.That(exception.StatusCode, Is.EqualTo(HttpStatusCode.NotAcceptable));
Assert.That(exception.Message.Equals("The merge request has some conflicts and cannot be merged", StringComparison.Ordinal), Is.True);

Expand Down
Loading
Loading