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
2 changes: 2 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,3 +50,5 @@ updates:
- "Microsoft.Playwright"
- "NSubstitute"
- "*NUnit*"
exclude-patterns:
- "NUnit.Analyzers"
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@ jobs:
# Available tags: https://hub.docker.com/r/gitlab/gitlab-ee/tags
gitlab:
- "gitlab/gitlab-ee:15.11.9-ee.0"
- "gitlab/gitlab-ee:16.11.4-ee.0"
- "gitlab/gitlab-ee:17.0.2-ee.0"
- "gitlab/gitlab-ee:16.11.10-ee.0"
- "gitlab/gitlab-ee:17.0.8-ee.0"
configuration: [Release]
fail-fast: false
services:
Expand Down
2 changes: 1 addition & 1 deletion NGitLab.Tests/Docker/GitLabDockerContainer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public class GitLabDockerContainer
/// <para>Keep in sync with .github/workflows/ci.yml, use the lowest supported version</para>
/// <para>List of available versions: https://hub.docker.com/r/gitlab/gitlab-ee/tags/</para>
/// </remarks>
private const string LocalGitLabDockerVersion = "15.11.9-ee.0";
private const string LocalGitLabDockerVersion = "16.11.10-ee.0";

/// <summary>
/// Resolved GitLab version taken from the help page once logged in
Expand Down
4 changes: 2 additions & 2 deletions NGitLab.Tests/Docker/GitLabTestContext.cs
Original file line number Diff line number Diff line change
Expand Up @@ -315,10 +315,10 @@ public bool IsGitLabMajorVersion(int major)
return NuGetVersion.TryParse(gitLabVersion, out var nuGetVersion) && nuGetVersion.Major == major;
}

public void ReportTestAsInconclusiveIfGitLabVersionOutOfRange(VersionRange versionRange)
public void IgnoreTestIfGitLabVersionOutOfRange(VersionRange versionRange)
{
if (!IsGitLabVersionInRange(versionRange, out var gitLabVersion))
Assert.Inconclusive($"Test supported by GitLab '{versionRange}', but currently running against '{gitLabVersion}'");
Assert.Ignore($"Test supported by GitLab '{versionRange}', but currently running against '{gitLabVersion}'");
}

private IGitLabClient CreateClient(string token)
Expand Down
2 changes: 1 addition & 1 deletion NGitLab.Tests/MergeRequest/MergeRequestClientTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ public async Task Test_merge_request_approvers()
using var context = await GitLabTestContext.CreateAsync();

// https://about.gitlab.com/releases/2021/04/22/gitlab-13-11-released/#removal-of-merge-request-approvers-endpoint-in-favor-of-approval-rules-api
context.ReportTestAsInconclusiveIfGitLabVersionOutOfRange(VersionRange.Parse("[,13.11)"));
context.IgnoreTestIfGitLabVersionOutOfRange(VersionRange.Parse("[,13.11)"));

var (project, mergeRequest) = context.CreateMergeRequest();
var mergeRequestClient = context.Client.GetMergeRequest(project.Id);
Expand Down
2 changes: 1 addition & 1 deletion NGitLab.Tests/PipelineTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,7 @@ public async Task Test_update_pipeline_metadata()
using var context = await GitLabTestContext.CreateAsync();

// The "Update pipeline metadata" was added in GitLab 16, the earliest available docs that include the API is for version 16.11
context.ReportTestAsInconclusiveIfGitLabVersionOutOfRange(VersionRange.Parse("[16.11,)"));
context.IgnoreTestIfGitLabVersionOutOfRange(VersionRange.Parse("[16.11,)"));

var project = context.CreateProject();
var pipelineClient = context.Client.GetPipelines(project.Id);
Expand Down
2 changes: 1 addition & 1 deletion NGitLab.Tests/ProjectLevelApprovalRulesClientTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public class ProjectLevelApprovalRulesClientTests
public async Task SetUp()
{
context = await GitLabTestContext.CreateAsync();
context.ReportTestAsInconclusiveIfGitLabVersionOutOfRange(SupportedVersionRange);
context.IgnoreTestIfGitLabVersionOutOfRange(SupportedVersionRange);
}

[TearDown]
Expand Down
26 changes: 0 additions & 26 deletions NGitLab.Tests/Utils.cs

This file was deleted.

Loading