From 2114c0c6e6d5d9085ec8af19acbe7a0786baa248 Mon Sep 17 00:00:00 2001 From: Bogdan Date: Sun, 26 Apr 2026 19:22:41 +0300 Subject: [PATCH] Switch integration tests to v5 API --- .../Client/SeriesClient.cs | 2 +- .../GenericApiFixture.cs | 47 ------------------- .../HttpLogFixture.cs | 10 ++-- .../IntegrationTestBase.cs | 2 +- 4 files changed, 7 insertions(+), 54 deletions(-) delete mode 100644 src/NzbDrone.Integration.Test/GenericApiFixture.cs diff --git a/src/NzbDrone.Integration.Test/Client/SeriesClient.cs b/src/NzbDrone.Integration.Test/Client/SeriesClient.cs index 281012ff1..ac009c309 100644 --- a/src/NzbDrone.Integration.Test/Client/SeriesClient.cs +++ b/src/NzbDrone.Integration.Test/Client/SeriesClient.cs @@ -23,7 +23,7 @@ public List Editor(SeriesEditorResource series) { var request = BuildRequest("editor"); request.AddJsonBody(series); - return Put>(request); + return Put>(request, HttpStatusCode.OK); } public SeriesResource Get(string slug, HttpStatusCode statusCode = HttpStatusCode.OK) diff --git a/src/NzbDrone.Integration.Test/GenericApiFixture.cs b/src/NzbDrone.Integration.Test/GenericApiFixture.cs deleted file mode 100644 index ba02a515c..000000000 --- a/src/NzbDrone.Integration.Test/GenericApiFixture.cs +++ /dev/null @@ -1,47 +0,0 @@ -using System.Net; -using FluentAssertions; -using NUnit.Framework; -using RestSharp; - -namespace NzbDrone.Integration.Test -{ - [TestFixture] - public class GenericApiFixture : IntegrationTest - { - [TestCase("application/json")] - [TestCase("text/html, application/json")] - [TestCase("application/xml, application/json")] - [TestCase("text/html, */*")] - [TestCase("*/*")] - [TestCase("")] - public void should_get_json_with_accept_header(string header) - { - var request = new RestRequest("system/status") - { - RequestFormat = DataFormat.None - }; - request.AddHeader("Accept", header); - - var response = RestClient.Execute(request); - - response.StatusCode.Should().Be(HttpStatusCode.OK); - response.ContentType.Should().Be("application/json; charset=utf-8"); - } - - [TestCase("application/xml")] - [TestCase("text/html")] - [TestCase("application/junk")] - public void should_get_unacceptable_with_accept_header(string header) - { - var request = new RestRequest("system/status") - { - RequestFormat = DataFormat.None - }; - request.AddHeader("Accept", header); - - var response = RestClient.Execute(request); - - response.StatusCode.Should().Be(HttpStatusCode.NotAcceptable); - } - } -} diff --git a/src/NzbDrone.Integration.Test/HttpLogFixture.cs b/src/NzbDrone.Integration.Test/HttpLogFixture.cs index 2f94979e9..27994841a 100644 --- a/src/NzbDrone.Integration.Test/HttpLogFixture.cs +++ b/src/NzbDrone.Integration.Test/HttpLogFixture.cs @@ -16,20 +16,20 @@ public void should_log_on_error() config.LogLevel = "Trace"; HostConfig.Put(config); - var resultGet = Series.All(); + Series.All(); var logFile = "sonarr.trace.txt"; var logLines = Logs.GetLogFileLines(logFile); - var resultPost = Series.InvalidPost(new SeriesResource()); + Series.InvalidPost(new SeriesResource()); // Skip 2 and 1 to ignore the logs endpoint logLines = Logs.GetLogFileLines(logFile).Skip(logLines.Length + 2).ToArray(); Array.Resize(ref logLines, logLines.Length - 1); - logLines.Should().Contain(v => v.Contains("|Trace|Http|Req") && v.Contains("/api/v3/series/")); - logLines.Should().Contain(v => v.Contains("|Trace|Http|Res") && v.Contains("/api/v3/series/: 400.BadRequest")); - logLines.Should().Contain(v => v.Contains("|Debug|Api|") && v.Contains("/api/v3/series/: 400.BadRequest")); + logLines.Should().Contain(v => v.Contains("|Trace|Http|Req") && v.Contains("/api/v5/series/")); + logLines.Should().Contain(v => v.Contains("|Trace|Http|Res") && v.Contains("/api/v5/series/: 400.BadRequest")); + logLines.Should().Contain(v => v.Contains("|Debug|Api|") && v.Contains("/api/v5/series/: 400.BadRequest")); } } } diff --git a/src/NzbDrone.Integration.Test/IntegrationTestBase.cs b/src/NzbDrone.Integration.Test/IntegrationTestBase.cs index c9786bdd3..5e0acb8f2 100644 --- a/src/NzbDrone.Integration.Test/IntegrationTestBase.cs +++ b/src/NzbDrone.Integration.Test/IntegrationTestBase.cs @@ -99,7 +99,7 @@ public void SmokeTestSetup() protected virtual void InitRestClients() { - RestClient = new RestClient(RootUrl + "api/v3/"); + RestClient = new RestClient(RootUrl + "api/v5/"); RestClient.AddDefaultHeader("Authentication", ApiKey); RestClient.AddDefaultHeader("X-Api-Key", ApiKey);