Skip to content

Commit 2ca9d0b

Browse files
committed
fix: lint
1 parent 4a9f8bc commit 2ca9d0b

File tree

4 files changed

+56
-67
lines changed

4 files changed

+56
-67
lines changed

CHANGELOG.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
# CHANGELOG
2-
# v6.10.0 (2025-03-11)
3-
- Add custom webhook headers
42

53
## Next Release
64

75
- Minimum .NET Framework is now v4.7.2
6+
- Add custom webhook headers when creating/updating a webhook
87

98
## v6.9.0 (2024-11-19)
109

EasyPost.Compatibility.NetStandard/EasyPost.Compatibility.NetStandard.csproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,6 @@
1313

1414
<ItemGroup>
1515
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="[17.3.0, 18.0.0)" />
16-
<PackageReference Include="coverlet.collector" Version="[3.1.2, 4.0.0)">
17-
<PrivateAssets>all</PrivateAssets>
18-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
19-
</PackageReference>
2016
<PackageReference Include="xunit" Version="[2.4.2, 3.0.0)" />
2117
<PackageReference Include="xunit.runner.visualstudio" Version="[2.4.5, 3.0.0)">
2218
<PrivateAssets>all</PrivateAssets>

EasyPost.Compatibility.NetStandard/packages.lock.json

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,6 @@
22
"version": 1,
33
"dependencies": {
44
".NETStandard,Version=v2.0": {
5-
"coverlet.collector": {
6-
"type": "Direct",
7-
"requested": "[3.1.2, 4.0.0)",
8-
"resolved": "3.1.2",
9-
"contentHash": "wuLDIDKD5XMt0A7lE31JPenT7QQwZPFkP5rRpdJeblyXZ9MGLI8rYjvm5fvAKln+2/X+4IxxQDxBtwdrqKNLZw=="
10-
},
115
"Microsoft.NET.Test.Sdk": {
126
"type": "Direct",
137
"requested": "[17.3.0, 18.0.0)",

EasyPost.Tests/TestUtils.cs

Lines changed: 55 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -191,81 +191,81 @@ public class MockRequestMatchRules(Method method, string resourceRegex)
191191
{
192192
internal Method Method { get; set; } = method;
193193

194-
internal string ResourceRegex { get; set; } = resourceRegex;
195-
}
194+
internal string ResourceRegex { get; set; } = resourceRegex;
195+
}
196196

197-
public class MockRequestResponseInfo(HttpStatusCode statusCode, string? content = null, object? data = null)
197+
public class MockRequestResponseInfo(HttpStatusCode statusCode, string? content = null, object? data = null)
198198
{
199199
internal HttpStatusCode StatusCode { get; set; } = statusCode;
200200

201-
internal string? Content { get; set; } = content ?? JsonSerialization.ConvertObjectToJson(data);
202-
}
201+
internal string? Content { get; set; } = content ?? JsonSerialization.ConvertObjectToJson(data);
202+
}
203203

204-
public class MockRequest
205-
{
206-
public MockRequestMatchRules MatchRules { get; }
204+
public class MockRequest
205+
{
206+
public MockRequestMatchRules MatchRules { get; }
207207

208-
public MockRequestResponseInfo ResponseInfo { get; }
208+
public MockRequestResponseInfo ResponseInfo { get; }
209209

210-
internal MockRequest(MockRequestMatchRules matchRules, MockRequestResponseInfo responseInfo)
211-
{
212-
MatchRules = matchRules;
213-
ResponseInfo = responseInfo;
214-
}
215-
}
210+
internal MockRequest(MockRequestMatchRules matchRules, MockRequestResponseInfo responseInfo)
211+
{
212+
MatchRules = matchRules;
213+
ResponseInfo = responseInfo;
214+
}
215+
}
216216

217-
internal sealed class MockClient : Client
218-
{
219-
private readonly List<MockRequest> _mockRequests = new();
217+
internal sealed class MockClient : Client
218+
{
219+
private readonly List<MockRequest> _mockRequests = new();
220220

221221
#pragma warning disable CS1998
222-
public override async Task<HttpResponseMessage> ExecuteRequest(HttpRequestMessage request, CancellationToken cancellationToken)
222+
public override async Task<HttpResponseMessage> ExecuteRequest(HttpRequestMessage request, CancellationToken cancellationToken)
223223
#pragma warning restore CS1998
224-
{
225-
MockRequest? mockRequest = FindMatchingMockRequest(request);
224+
{
225+
MockRequest? mockRequest = FindMatchingMockRequest(request);
226226

227-
if (mockRequest == null)
228-
{
227+
if (mockRequest == null)
228+
{
229229
#pragma warning disable CA2201
230-
throw new Exception("No matching mock request found");
230+
throw new Exception("No matching mock request found");
231231
#pragma warning restore CA2201
232-
}
232+
}
233233

234-
return new HttpResponseMessage
235-
{
236-
Content = new StringContent(mockRequest.ResponseInfo.Content),
237-
StatusCode = mockRequest.ResponseInfo.StatusCode,
238-
};
239-
}
234+
return new HttpResponseMessage
235+
{
236+
Content = new StringContent(mockRequest.ResponseInfo.Content),
237+
StatusCode = mockRequest.ResponseInfo.StatusCode,
238+
};
239+
}
240240

241-
internal MockClient(EasyPostClient client) : base(new ClientConfiguration(client.ApiKeyInUse)
242-
{
243-
ApiBase = client.ApiBaseInUse,
244-
CustomHttpClient = client.CustomHttpClient,
245-
})
246-
{
247-
}
241+
internal MockClient(EasyPostClient client) : base(new ClientConfiguration(client.ApiKeyInUse)
242+
{
243+
ApiBase = client.ApiBaseInUse,
244+
CustomHttpClient = client.CustomHttpClient,
245+
})
246+
{
247+
}
248248

249-
internal void AddMockRequest(MockRequest mockRequest) => _mockRequests.Add(mockRequest);
249+
internal void AddMockRequest(MockRequest mockRequest) => _mockRequests.Add(mockRequest);
250250

251-
internal void AddMockRequests(IEnumerable<MockRequest> mockRequests) => _mockRequests.AddRange(mockRequests);
251+
internal void AddMockRequests(IEnumerable<MockRequest> mockRequests) => _mockRequests.AddRange(mockRequests);
252252

253-
private MockRequest? FindMatchingMockRequest(HttpRequestMessage request) => _mockRequests.FirstOrDefault(mock => mock.MatchRules.Method.HttpMethod == request.Method && EndpointMatches(request.RequestUri.AbsoluteUri, mock.MatchRules.ResourceRegex));
253+
private MockRequest? FindMatchingMockRequest(HttpRequestMessage request) => _mockRequests.FirstOrDefault(mock => mock.MatchRules.Method.HttpMethod == request.Method && EndpointMatches(request.RequestUri.AbsoluteUri, mock.MatchRules.ResourceRegex));
254254

255-
private static bool EndpointMatches(string endpoint, string pattern)
256-
{
257-
try
258-
{
259-
return Regex.IsMatch(endpoint,
260-
pattern,
261-
RegexOptions.Compiled | RegexOptions.CultureInvariant | RegexOptions.ExplicitCapture | RegexOptions.IgnoreCase | RegexOptions.Singleline,
262-
TimeSpan.FromMilliseconds(250));
263-
}
264-
catch (RegexMatchTimeoutException)
265-
{
266-
return false;
267-
}
268-
}
255+
private static bool EndpointMatches(string endpoint, string pattern)
256+
{
257+
try
258+
{
259+
return Regex.IsMatch(endpoint,
260+
pattern,
261+
RegexOptions.Compiled | RegexOptions.CultureInvariant | RegexOptions.ExplicitCapture | RegexOptions.IgnoreCase | RegexOptions.Singleline,
262+
TimeSpan.FromMilliseconds(250));
263+
}
264+
catch (RegexMatchTimeoutException)
265+
{
266+
return false;
269267
}
270268
}
269+
}
270+
}
271271
}

0 commit comments

Comments
 (0)