diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 09c9e6c..82e9181 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -56,15 +56,15 @@ jobs: uses: rocklan/dotnet-tests-report@master with: project_path: .\src\scissors.sln - report_name: http_request_interceptor_test_report - report_title: HttpRequestInterceptor Tests Report + report_name: scissors_test_report + report_title: Scissors Tests Report github_token: ${{ secrets.GITHUB_TOKEN }} - gist_name: http_request_interceptor_tests.md + gist_name: scissors_tests.md gist_badge_label: 'Tests passed: %Counters_passed%/%Counters_total%' gist_token: ${{ secrets.GIST_TOKEN }} set_check_status_from_test_outcome: true fail_build_on_failed_tests: true - extra_test_parameters: '--configuration release --collect:"XPlat Code Coverage" --settings .\src\HttpRequestInterceptor.Test\runsettings.xml' + extra_test_parameters: '--configuration release --collect:"XPlat Code Coverage" --settings .\src\Scissors.Test\runsettings.xml' - name: Sonar End env: @@ -76,6 +76,6 @@ jobs: if: github.ref == 'refs/heads/branch-zero' shell: pwsh run: | - cd src\HttpRequestInterceptor + cd src\Scissors dotnet pack --configuration Release dotnet nuget push ".\bin\Release\*.nupkg" --source "https://nuget.pkg.github.com/MirzaMerdovic/index.json" --api-key "${{ secrets.SCISSORS_PAT }}" diff --git a/CHANGELOG.md b/CHANGELOG.md index 05ef598..3d2e948 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -31,4 +31,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [1.0.1] ### Changes -- Switched from Nuget package source to GitHub \ No newline at end of file +- Switched from Nuget package source to GitHub +- Renamed project to Scissors.HttpRequestInterceptor.* + +## [2.0.0] +### Changes +- Changed namespace from Scissors.HttpRequestInterceptor to Scissors +- Renamed RequestsInterceptor to HttpRequestInterceptor +- Renamed HttpInterceptorOptions to HttpRequestInterceptorOptions \ No newline at end of file diff --git a/src/HttpRequestInterceptor.Test/ComplexRoutes/ComplexRouteFixture.cs b/src/Scissors.Test/ComplexRoutes/ComplexRouteFixture.cs similarity index 83% rename from src/HttpRequestInterceptor.Test/ComplexRoutes/ComplexRouteFixture.cs rename to src/Scissors.Test/ComplexRoutes/ComplexRouteFixture.cs index 4151588..ee665e5 100644 --- a/src/HttpRequestInterceptor.Test/ComplexRoutes/ComplexRouteFixture.cs +++ b/src/Scissors.Test/ComplexRoutes/ComplexRouteFixture.cs @@ -1,8 +1,8 @@ using System.Collections.Generic; -using static Scissors.HttpRequestInterceptor.Test.InMemoryConfigurationWriter; +using static Scissors.Test.InMemoryConfigurationWriter; -namespace Scissors.HttpRequestInterceptor.Test.ComplexRoutes +namespace Scissors.Test.ComplexRoutes { public sealed class ComplexRouteFixture : TestFixture { diff --git a/src/HttpRequestInterceptor.Test/ComplexRoutes/ComplexRouteTests.cs b/src/Scissors.Test/ComplexRoutes/ComplexRouteTests.cs similarity index 95% rename from src/HttpRequestInterceptor.Test/ComplexRoutes/ComplexRouteTests.cs rename to src/Scissors.Test/ComplexRoutes/ComplexRouteTests.cs index 150b436..5abac5a 100644 --- a/src/HttpRequestInterceptor.Test/ComplexRoutes/ComplexRouteTests.cs +++ b/src/Scissors.Test/ComplexRoutes/ComplexRouteTests.cs @@ -3,7 +3,7 @@ using System.Threading.Tasks; using Xunit; -namespace Scissors.HttpRequestInterceptor.Test.ComplexRoutes +namespace Scissors.Test.ComplexRoutes { public sealed class ComplexRouteTests : IClassFixture { diff --git a/src/HttpRequestInterceptor.Test/HostRoutes/HostRouteFixture.cs b/src/Scissors.Test/HostRoutes/HostRouteFixture.cs similarity index 83% rename from src/HttpRequestInterceptor.Test/HostRoutes/HostRouteFixture.cs rename to src/Scissors.Test/HostRoutes/HostRouteFixture.cs index 4dfe010..205f307 100644 --- a/src/HttpRequestInterceptor.Test/HostRoutes/HostRouteFixture.cs +++ b/src/Scissors.Test/HostRoutes/HostRouteFixture.cs @@ -1,6 +1,6 @@ -using static Scissors.HttpRequestInterceptor.Test.InMemoryConfigurationWriter; +using static Scissors.Test.InMemoryConfigurationWriter; -namespace Scissors.HttpRequestInterceptor.Test.HostRoutes +namespace Scissors.Test.HostRoutes { public sealed class HostRouteFixture : TestFixture { diff --git a/src/HttpRequestInterceptor.Test/HostRoutes/HostRouteTests.cs b/src/Scissors.Test/HostRoutes/HostRouteTests.cs similarity index 95% rename from src/HttpRequestInterceptor.Test/HostRoutes/HostRouteTests.cs rename to src/Scissors.Test/HostRoutes/HostRouteTests.cs index 9c4074f..deac1db 100644 --- a/src/HttpRequestInterceptor.Test/HostRoutes/HostRouteTests.cs +++ b/src/Scissors.Test/HostRoutes/HostRouteTests.cs @@ -5,7 +5,7 @@ using System.Threading.Tasks; using Xunit; -namespace Scissors.HttpRequestInterceptor.Test.HostRoutes +namespace Scissors.Test.HostRoutes { public class HostRouteTests : IClassFixture { diff --git a/src/HttpRequestInterceptor.Test/InMemoryConfigurationWriter.cs b/src/Scissors.Test/InMemoryConfigurationWriter.cs similarity index 68% rename from src/HttpRequestInterceptor.Test/InMemoryConfigurationWriter.cs rename to src/Scissors.Test/InMemoryConfigurationWriter.cs index b39107c..6ea8e4e 100644 --- a/src/HttpRequestInterceptor.Test/InMemoryConfigurationWriter.cs +++ b/src/Scissors.Test/InMemoryConfigurationWriter.cs @@ -1,12 +1,12 @@ using System.Collections.Generic; -namespace Scissors.HttpRequestInterceptor.Test +namespace Scissors.Test { internal static class InMemoryConfigurationWriter { private const string Column = ":"; private const string Headers = "Headers"; - private const string SectionName = nameof(HttpInterceptorOptions) + Column; + private const string SectionName = nameof(HttpRequestInterceptorOptions) + Column; // HttpInterceptorOptions:0: private static string BasePath(int index) => $"{SectionName}{index}{Column}"; @@ -16,34 +16,34 @@ internal static class InMemoryConfigurationWriter // HttpInterceptorOptions:0:MethodName public static KeyValuePair BuildMethodNamePair(int index, string value) => - new($"{BasePath(index)}{nameof(HttpInterceptorOptions.MethodName)}", value); + new($"{BasePath(index)}{nameof(HttpRequestInterceptorOptions.MethodName)}", value); // HttpInterceptorOptions:0:Host public static KeyValuePair BuildHostPair(int index, string value) => - new($"{BasePath(index)}{nameof(HttpInterceptorOptions.Host)}", value); + new($"{BasePath(index)}{nameof(HttpRequestInterceptorOptions.Host)}", value); // HttpInterceptorOptions:0:Path public static KeyValuePair BuildPathPair(int index, string value) => - new($"{BasePath(index)}{nameof(HttpInterceptorOptions.Path)}", value); + new($"{BasePath(index)}{nameof(HttpRequestInterceptorOptions.Path)}", value); // HttpInterceptorOptions:0:ResponseStatusCode public static KeyValuePair BuildReturnStatusCodePair(int index, string value) => - new($"{BasePath(index)}{nameof(HttpInterceptorOptions.ResponseStatusCode)}", value); + new($"{BasePath(index)}{nameof(HttpRequestInterceptorOptions.ResponseStatusCode)}", value); // HttpInterceptorOptions:0:ResponseJsonContent public static KeyValuePair BuildReturnJsonContentPair(int index, string value) => - new($"{BasePath(index)}{nameof(HttpInterceptorOptions.ResponseJsonContent)}", value); + new($"{BasePath(index)}{nameof(HttpRequestInterceptorOptions.ResponseJsonContent)}", value); // HttpInterceptorOptions:0:Rank public static KeyValuePair BuildRankPair(int index, string value) => - new($"{BasePath(index)}{nameof(HttpInterceptorOptions.Rank)}", value); + new($"{BasePath(index)}{nameof(HttpRequestInterceptorOptions.Rank)}", value); // HttpInterceptorOptions:0:Headers:0:Name public static KeyValuePair BuildResponseHeaderNamePair(int parentIndex, int index, string value) => - new($"{BasePath(parentIndex)}{BaseHeaderPath(index)}{nameof(HttpInterceptorOptions.HttpResponseHeader.Name)}", value); + new($"{BasePath(parentIndex)}{BaseHeaderPath(index)}{nameof(HttpRequestInterceptorOptions.HttpResponseHeader.Name)}", value); // HttpInterceptorOptions:0:Headers:0:Value public static KeyValuePair BuildResponseHeaderValuePair(int parentIndex, int index, string value) => - new($"{BasePath(parentIndex)}{BaseHeaderPath(index)}{nameof(HttpInterceptorOptions.HttpResponseHeader.Value)}", value); + new($"{BasePath(parentIndex)}{BaseHeaderPath(index)}{nameof(HttpRequestInterceptorOptions.HttpResponseHeader.Value)}", value); } } diff --git a/src/HttpRequestInterceptor.Test/RankedRoutes/RankedRouteFixture.cs b/src/Scissors.Test/RankedRoutes/RankedRouteFixture.cs similarity index 89% rename from src/HttpRequestInterceptor.Test/RankedRoutes/RankedRouteFixture.cs rename to src/Scissors.Test/RankedRoutes/RankedRouteFixture.cs index 0c7aba5..34f9c77 100644 --- a/src/HttpRequestInterceptor.Test/RankedRoutes/RankedRouteFixture.cs +++ b/src/Scissors.Test/RankedRoutes/RankedRouteFixture.cs @@ -1,6 +1,6 @@ -using static Scissors.HttpRequestInterceptor.Test.InMemoryConfigurationWriter; +using static Scissors.Test.InMemoryConfigurationWriter; -namespace Scissors.HttpRequestInterceptor.Test.RankedRoutes +namespace Scissors.Test.RankedRoutes { public class RankedRouteFixture : TestFixture { diff --git a/src/HttpRequestInterceptor.Test/RankedRoutes/RankedRouteTests.cs b/src/Scissors.Test/RankedRoutes/RankedRouteTests.cs similarity index 96% rename from src/HttpRequestInterceptor.Test/RankedRoutes/RankedRouteTests.cs rename to src/Scissors.Test/RankedRoutes/RankedRouteTests.cs index fad78b3..abc79e7 100644 --- a/src/HttpRequestInterceptor.Test/RankedRoutes/RankedRouteTests.cs +++ b/src/Scissors.Test/RankedRoutes/RankedRouteTests.cs @@ -4,7 +4,7 @@ using System.Threading.Tasks; using Xunit; -namespace Scissors.HttpRequestInterceptor.Test.RankedRoutes +namespace Scissors.Test.RankedRoutes { public sealed class RankedRouteTests : IClassFixture { diff --git a/src/HttpRequestInterceptor.Test/ResponseContents/ResponseContentFixture.cs b/src/Scissors.Test/ResponseContents/ResponseContentFixture.cs similarity index 87% rename from src/HttpRequestInterceptor.Test/ResponseContents/ResponseContentFixture.cs rename to src/Scissors.Test/ResponseContents/ResponseContentFixture.cs index 0e043ae..c0b3e6a 100644 --- a/src/HttpRequestInterceptor.Test/ResponseContents/ResponseContentFixture.cs +++ b/src/Scissors.Test/ResponseContents/ResponseContentFixture.cs @@ -1,6 +1,6 @@ -using static Scissors.HttpRequestInterceptor.Test.InMemoryConfigurationWriter; +using static Scissors.Test.InMemoryConfigurationWriter; -namespace Scissors.HttpRequestInterceptor.Test.ResponseContents +namespace Scissors.Test.ResponseContents { public sealed class ResponseContentFixture : TestFixture { diff --git a/src/HttpRequestInterceptor.Test/ResponseContents/ResponseContentTests.cs b/src/Scissors.Test/ResponseContents/ResponseContentTests.cs similarity index 97% rename from src/HttpRequestInterceptor.Test/ResponseContents/ResponseContentTests.cs rename to src/Scissors.Test/ResponseContents/ResponseContentTests.cs index 0fa7387..43c15d5 100644 --- a/src/HttpRequestInterceptor.Test/ResponseContents/ResponseContentTests.cs +++ b/src/Scissors.Test/ResponseContents/ResponseContentTests.cs @@ -7,7 +7,7 @@ using System.Threading.Tasks; using Xunit; -namespace Scissors.HttpRequestInterceptor.Test.ResponseContents +namespace Scissors.Test.ResponseContents { public class ResponseContentTests : IClassFixture { diff --git a/src/HttpRequestInterceptor.Test/ResponseStatuses/ResponseStatusFixture.cs b/src/Scissors.Test/ResponseStatuses/ResponseStatusFixture.cs similarity index 93% rename from src/HttpRequestInterceptor.Test/ResponseStatuses/ResponseStatusFixture.cs rename to src/Scissors.Test/ResponseStatuses/ResponseStatusFixture.cs index eedb0c7..edcd786 100644 --- a/src/HttpRequestInterceptor.Test/ResponseStatuses/ResponseStatusFixture.cs +++ b/src/Scissors.Test/ResponseStatuses/ResponseStatusFixture.cs @@ -1,6 +1,6 @@ -using static Scissors.HttpRequestInterceptor.Test.InMemoryConfigurationWriter; +using static Scissors.Test.InMemoryConfigurationWriter; -namespace Scissors.HttpRequestInterceptor.Test.ResponseStatuses +namespace Scissors.Test.ResponseStatuses { public sealed class ResponseStatusFixture : TestFixture { diff --git a/src/HttpRequestInterceptor.Test/ResponseStatuses/ResponseStatusTests.cs b/src/Scissors.Test/ResponseStatuses/ResponseStatusTests.cs similarity index 95% rename from src/HttpRequestInterceptor.Test/ResponseStatuses/ResponseStatusTests.cs rename to src/Scissors.Test/ResponseStatuses/ResponseStatusTests.cs index cef459f..531d293 100644 --- a/src/HttpRequestInterceptor.Test/ResponseStatuses/ResponseStatusTests.cs +++ b/src/Scissors.Test/ResponseStatuses/ResponseStatusTests.cs @@ -1,7 +1,7 @@ using System.Threading.Tasks; using Xunit; -namespace Scissors.HttpRequestInterceptor.Test.ResponseStatuses +namespace Scissors.Test.ResponseStatuses { public sealed class ResponseStatusTests : IClassFixture { diff --git a/src/HttpRequestInterceptor.Test/Scissors.HttpRequestInterceptor.Test.csproj b/src/Scissors.Test/Scissors.Test.csproj similarity index 96% rename from src/HttpRequestInterceptor.Test/Scissors.HttpRequestInterceptor.Test.csproj rename to src/Scissors.Test/Scissors.Test.csproj index 1d1ef27..df8d6f5 100644 --- a/src/HttpRequestInterceptor.Test/Scissors.HttpRequestInterceptor.Test.csproj +++ b/src/Scissors.Test/Scissors.Test.csproj @@ -28,6 +28,7 @@ + diff --git a/src/HttpRequestInterceptor.Test/SimpleRoutes/SimpleRouteFixture.cs b/src/Scissors.Test/SimpleRoutes/SimpleRouteFixture.cs similarity index 86% rename from src/HttpRequestInterceptor.Test/SimpleRoutes/SimpleRouteFixture.cs rename to src/Scissors.Test/SimpleRoutes/SimpleRouteFixture.cs index b94bb28..fe72542 100644 --- a/src/HttpRequestInterceptor.Test/SimpleRoutes/SimpleRouteFixture.cs +++ b/src/Scissors.Test/SimpleRoutes/SimpleRouteFixture.cs @@ -1,8 +1,8 @@ using System.Collections.Generic; -using static Scissors.HttpRequestInterceptor.Test.InMemoryConfigurationWriter; +using static Scissors.Test.InMemoryConfigurationWriter; -namespace Scissors.HttpRequestInterceptor.Test.SimpleRoutes +namespace Scissors.Test.SimpleRoutes { public sealed class SimpleRouteFixture : TestFixture { diff --git a/src/HttpRequestInterceptor.Test/SimpleRoutes/SimpleRouteTests.cs b/src/Scissors.Test/SimpleRoutes/SimpleRouteTests.cs similarity index 96% rename from src/HttpRequestInterceptor.Test/SimpleRoutes/SimpleRouteTests.cs rename to src/Scissors.Test/SimpleRoutes/SimpleRouteTests.cs index b01fe48..7f53d7e 100644 --- a/src/HttpRequestInterceptor.Test/SimpleRoutes/SimpleRouteTests.cs +++ b/src/Scissors.Test/SimpleRoutes/SimpleRouteTests.cs @@ -3,7 +3,7 @@ using System.Threading.Tasks; using Xunit; -namespace Scissors.HttpRequestInterceptor.Test.SimpleRoutes +namespace Scissors.Test.SimpleRoutes { public class SimpleRouteTests : IClassFixture { diff --git a/src/HttpRequestInterceptor.Test/TestFixture.cs b/src/Scissors.Test/TestFixture.cs similarity index 81% rename from src/HttpRequestInterceptor.Test/TestFixture.cs rename to src/Scissors.Test/TestFixture.cs index 2784186..0b849f0 100644 --- a/src/HttpRequestInterceptor.Test/TestFixture.cs +++ b/src/Scissors.Test/TestFixture.cs @@ -5,7 +5,7 @@ using System.Collections.ObjectModel; using System.Net.Http; -namespace Scissors.HttpRequestInterceptor.Test +namespace Scissors.Test { public abstract class TestFixture : IDisposable { @@ -24,7 +24,7 @@ protected TestFixture(List> configurationPairs) _factory = _provider.GetRequiredService(); } - public HttpClient GetClient() => _factory.CreateClient("test"); + public HttpClient GetClient() => _factory.CreateClient("scissors"); private static ServiceProvider BuildServiceProvider(IEnumerable> configurationPairs) { @@ -34,17 +34,17 @@ private static ServiceProvider BuildServiceProvider(IEnumerable>(configuration.GetSection("HttpInterceptorOptions")); + services.Configure>(configuration.GetSection(nameof(HttpRequestInterceptorOptions))); - services.AddTransient(); + services.AddTransient(); - services.AddHttpClient("test", c => + services.AddHttpClient("scissors", c => { c.BaseAddress = new Uri(BaseUrl); c.Timeout = TimeSpan.FromSeconds(1); - c.DefaultRequestHeaders.Add("User-Agent", "RequestInterceptorTests"); + c.DefaultRequestHeaders.Add("User-Agent", "Scissors"); }) - .AddHttpMessageHandler(); + .AddHttpMessageHandler(); return services.BuildServiceProvider(); } diff --git a/src/HttpRequestInterceptor.Test/runsettings.xml b/src/Scissors.Test/runsettings.xml similarity index 100% rename from src/HttpRequestInterceptor.Test/runsettings.xml rename to src/Scissors.Test/runsettings.xml diff --git a/src/HttpRequestInterceptor/Extensions.cs b/src/Scissors/Extensions.cs similarity index 82% rename from src/HttpRequestInterceptor/Extensions.cs rename to src/Scissors/Extensions.cs index f596666..d383f9c 100644 --- a/src/HttpRequestInterceptor/Extensions.cs +++ b/src/Scissors/Extensions.cs @@ -5,11 +5,11 @@ using System.Net.Http; using System.Text; -namespace Scissors.HttpRequestInterceptor +namespace Scissors { internal static class Extensions { - private static readonly Dictionary> _handlers = new Dictionary> + private static readonly Dictionary> _handlers = new Dictionary> { [HttpStatusCode.BadRequest] = x => x.CreateMessage(HttpStatusCode.BadRequest), [HttpStatusCode.Unauthorized] = x => x.CreateMessage(HttpStatusCode.Unauthorized), @@ -25,7 +25,7 @@ internal static class Extensions [HttpStatusCode.Created] = x => x.CreateMessage(HttpStatusCode.Created) }; - internal static HttpResponseMessage TryCreateResponse(this HttpInterceptorOptions options) + internal static HttpResponseMessage TryCreateResponse(this HttpRequestInterceptorOptions options) { if (_handlers.TryGetValue((HttpStatusCode)options.ResponseStatusCode, out var handler)) return handler(options); @@ -33,7 +33,7 @@ internal static HttpResponseMessage TryCreateResponse(this HttpInterceptorOption throw new NotSupportedException($"Response status: {options.ResponseStatusCode} is not supported."); } - private static HttpResponseMessage CreateMessage(this HttpInterceptorOptions options, HttpStatusCode statusCode) + private static HttpResponseMessage CreateMessage(this HttpRequestInterceptorOptions options, HttpStatusCode statusCode) { var message = new HttpResponseMessage(statusCode); @@ -45,9 +45,9 @@ private static HttpResponseMessage CreateMessage(this HttpInterceptorOptions opt return message.AddResponseHeaders(options.Headers); } - private static HttpResponseMessage AddResponseHeaders(this HttpResponseMessage message, Collection headers) + private static HttpResponseMessage AddResponseHeaders(this HttpResponseMessage message, Collection headers) { - foreach (HttpInterceptorOptions.HttpResponseHeader header in headers) + foreach (HttpRequestInterceptorOptions.HttpResponseHeader header in headers) { message.Headers.Add(header.Name, header.Value); } diff --git a/src/HttpRequestInterceptor/RequestInterceptor.cs b/src/Scissors/HttpRequestInterceptor.cs similarity index 85% rename from src/HttpRequestInterceptor/RequestInterceptor.cs rename to src/Scissors/HttpRequestInterceptor.cs index f3e9973..0fee094 100644 --- a/src/HttpRequestInterceptor/RequestInterceptor.cs +++ b/src/Scissors/HttpRequestInterceptor.cs @@ -6,20 +6,20 @@ using System.Threading; using System.Threading.Tasks; -namespace Scissors.HttpRequestInterceptor +namespace Scissors { - public sealed class RequestsInterceptor : DelegatingHandler + public sealed class HttpRequestInterceptor : DelegatingHandler { private const string Slash = "/"; private const string WildCard = "*"; private static readonly char[] _splitter = Slash.ToCharArray(); - private readonly Collection _options; + private readonly Collection _options; - public RequestsInterceptor(IOptions> options) + public HttpRequestInterceptor(IOptions> options) { - _options = options?.Value ?? new Collection(); + _options = options?.Value ?? new Collection(); } protected override async Task SendAsync(HttpRequestMessage request, CancellationToken cancellationToken) @@ -38,7 +38,7 @@ protected override async Task SendAsync(HttpRequestMessage return await base.SendAsync(request, cancellationToken).ConfigureAwait(false); } - private static bool IsConfigurationMatch(HttpInterceptorOptions option, Uri requestUri) + private static bool IsConfigurationMatch(HttpRequestInterceptorOptions option, Uri requestUri) { var host = requestUri.Host; var pathAndQuery = requestUri.PathAndQuery; diff --git a/src/HttpRequestInterceptor/HttpInterceptorOptions.cs b/src/Scissors/HttpRequestInterceptorOptions.cs similarity index 95% rename from src/HttpRequestInterceptor/HttpInterceptorOptions.cs rename to src/Scissors/HttpRequestInterceptorOptions.cs index a7ca5f1..bf11c60 100644 --- a/src/HttpRequestInterceptor/HttpInterceptorOptions.cs +++ b/src/Scissors/HttpRequestInterceptorOptions.cs @@ -1,8 +1,8 @@ using System.Collections.ObjectModel; -namespace Scissors.HttpRequestInterceptor +namespace Scissors { - public class HttpInterceptorOptions + public class HttpRequestInterceptorOptions { /// /// Gets or sets the host value diff --git a/src/HttpRequestInterceptor/Scissors.HttpRequestInterceptor.csproj b/src/Scissors/Scissors.csproj similarity index 96% rename from src/HttpRequestInterceptor/Scissors.HttpRequestInterceptor.csproj rename to src/Scissors/Scissors.csproj index 8c37ded..19cd574 100644 --- a/src/HttpRequestInterceptor/Scissors.HttpRequestInterceptor.csproj +++ b/src/Scissors/Scissors.csproj @@ -3,7 +3,7 @@ netstandard2.0 Scissors - 1.0.1 + 2.0.0 Mirza Merdovic Highly configurable implementation of DelegatingHandler that can be used for mocking the behavior of requests sent to specific routes. https://github.com/MirzaMerdovic/scissors diff --git a/src/WebApiExample/Startup.cs b/src/WebApiExample/Startup.cs index 6471f91..4e08c10 100644 --- a/src/WebApiExample/Startup.cs +++ b/src/WebApiExample/Startup.cs @@ -3,7 +3,7 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; -using Scissors.HttpRequestInterceptor; +using Scissors; using System; using System.Collections.ObjectModel; @@ -20,16 +20,16 @@ public Startup(IConfiguration configuration) public void ConfigureServices(IServiceCollection services) { - services.Configure>(Configuration.GetSection("HttpInterceptorOptions")); + services.Configure>(Configuration.GetSection("HttpInterceptorOptions")); - services.AddTransient(); + services.AddTransient(); services.AddHttpClient( x => { x.BaseAddress = new Uri("http://localhost:5000"); x.DefaultRequestHeaders.Add("User-Agent", "RequestInterceptorTests"); - }).AddHttpMessageHandler(); + }).AddHttpMessageHandler(); services.AddTransient(); diff --git a/src/WebApiExample/WebApiExample.csproj b/src/WebApiExample/WebApiExample.csproj index 85a413f..54955c5 100644 --- a/src/WebApiExample/WebApiExample.csproj +++ b/src/WebApiExample/WebApiExample.csproj @@ -30,6 +30,7 @@ + diff --git a/src/WebApiExample/appsettings.json b/src/WebApiExample/appsettings.json index 1797fbb..da2c16f 100644 --- a/src/WebApiExample/appsettings.json +++ b/src/WebApiExample/appsettings.json @@ -5,7 +5,7 @@ } }, - "HttpInterceptorOptions": [ + "HttpRequestInterceptorOptions": [ { "MethodName": "GET", "Host": "*", diff --git a/src/scissors.sln b/src/scissors.sln index d3ff267..097eae9 100644 --- a/src/scissors.sln +++ b/src/scissors.sln @@ -3,9 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.29025.244 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Scissors.HttpRequestInterceptor", "HttpRequestInterceptor\Scissors.HttpRequestInterceptor.csproj", "{C6B41C18-4541-4137-9034-C4D82BBD126B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Scissors", "Scissors\Scissors.csproj", "{C6B41C18-4541-4137-9034-C4D82BBD126B}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Scissors.HttpRequestInterceptor.Test", "HttpRequestInterceptor.Test\Scissors.HttpRequestInterceptor.Test.csproj", "{BC25FBA6-B5EC-4B52-B404-B9F6DC73300A}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Scissors.Test", "Scissors.Test\Scissors.Test.csproj", "{BC25FBA6-B5EC-4B52-B404-B9F6DC73300A}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{77EAA1C9-182B-4141-8F9C-2D3118762238}" ProjectSection(SolutionItems) = preProject