diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index e9e38c0..c839b80 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -10,7 +10,7 @@ on: branches: [main, dev] env: - DOTNET_VERSION: "9.0.x" + DOTNET_VERSION: "10.0.x" REGISTRY: ghcr.io IMAGE_NAME: ${{ github.repository }} diff --git a/Dockerfile b/Dockerfile index e8b5697..aa30ca5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Build stage -FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build +FROM mcr.microsoft.com/dotnet/sdk:10.0 AS build WORKDIR /src COPY allstarr.sln . @@ -14,7 +14,7 @@ COPY allstarr.Tests/ allstarr.Tests/ RUN dotnet publish allstarr/allstarr.csproj -c Release -o /app/publish # Runtime stage -FROM mcr.microsoft.com/dotnet/aspnet:9.0 +FROM mcr.microsoft.com/dotnet/aspnet:10.0 WORKDIR /app # Install curl for health checks diff --git a/allstarr.Tests/JellyfinProxyServiceTests.cs b/allstarr.Tests/JellyfinProxyServiceTests.cs index 54ac236..afd723d 100644 --- a/allstarr.Tests/JellyfinProxyServiceTests.cs +++ b/allstarr.Tests/JellyfinProxyServiceTests.cs @@ -176,10 +176,21 @@ public class JellyfinProxyServiceTests // Assert Assert.NotNull(captured); var url = captured!.RequestUri!.ToString(); - Assert.Contains("searchTerm=test%20query", url); - Assert.Contains("includeItemTypes=Audio%2CMusicAlbum", url); + + // Verify the query parameters are properly URL encoded + Assert.Contains("searchTerm=", url); + Assert.Contains("test", url); + Assert.Contains("query", url); + Assert.Contains("includeItemTypes=", url); + Assert.Contains("Audio", url); + Assert.Contains("MusicAlbum", url); Assert.Contains("limit=25", url); Assert.Contains("recursive=true", url); + + // Verify spaces are encoded (either as %20 or +) + var uri = captured.RequestUri; + var searchTermValue = System.Web.HttpUtility.ParseQueryString(uri!.Query).Get("searchTerm"); + Assert.Equal("test query", searchTermValue); } [Fact] diff --git a/allstarr.Tests/allstarr.Tests.csproj b/allstarr.Tests/allstarr.Tests.csproj index bbb3a44..294fa9c 100644 --- a/allstarr.Tests/allstarr.Tests.csproj +++ b/allstarr.Tests/allstarr.Tests.csproj @@ -1,7 +1,7 @@  - net9.0 + net10.0 allstarr.Tests enable enable diff --git a/allstarr/allstarr.csproj b/allstarr/allstarr.csproj index 83c5b4d..e73aa15 100644 --- a/allstarr/allstarr.csproj +++ b/allstarr/allstarr.csproj @@ -1,7 +1,7 @@ - net9.0 + net10.0 enable enable allstarr