Skip to content

Commit

Permalink
Merge branch 'release/0.104.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
@Jericho
Jericho committed Jan 19, 2024
2 parents fe220c4 + 16cb62c commit 07850ea
Show file tree
Hide file tree
Showing 54 changed files with 752 additions and 438 deletions.
4 changes: 2 additions & 2 deletions Source/StrongGrid.Benchmark/StrongGrid.Benchmark.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="BenchmarkDotNet" Version="0.13.5" />
<PackageReference Include="RichardSzalay.MockHttp" Version="6.0.0" />
<PackageReference Include="BenchmarkDotNet" Version="0.13.12" />
<PackageReference Include="RichardSzalay.MockHttp" Version="7.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions Source/StrongGrid.IntegrationTests/StrongGrid.IntegrationTests.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Logzio.DotNet.NLog" Version="1.0.16" />
<PackageReference Include="Logzio.DotNet.NLog" Version="1.1.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
<PackageReference Include="NLog.Extensions.Logging" Version="5.2.2" />
<PackageReference Include="NLog.Extensions.Logging" Version="5.3.8" />
</ItemGroup>

<ItemGroup>
Expand Down
29 changes: 29 additions & 0 deletions Source/StrongGrid.IntegrationTests/Tests/EngagementQuality.cs
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
using System;
using System.IO;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;

namespace StrongGrid.IntegrationTests.Tests
{
public class EngagementQuality : IIntegrationTest
{
public Task RunAsync(IBaseClient client, TextWriter log, CancellationToken cancellationToken)
{
return RunAsync((IClient)client, log, cancellationToken);
}

public async Task RunAsync(IClient client, TextWriter log, CancellationToken cancellationToken)
{
if (cancellationToken.IsCancellationRequested) return;

await log.WriteLineAsync("\n***** ENGAGEMENT QUALITY *****\n").ConfigureAwait(false);

var startDate = DateTime.UtcNow.AddDays(-89); // The SendGrid API restricts the start date to 90 days in the past
var endDate = DateTime.UtcNow;

var metrics = await client.EngagementQuality.GetScoresAsync(startDate, endDate, null, cancellationToken).ConfigureAwait(false);
await log.WriteLineAsync($"Retrieved {metrics.Count()} engagement metrics").ConfigureAwait(false);
}
}
}
1 change: 1 addition & 0 deletions Source/StrongGrid.IntegrationTests/TestsRunner.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ public async Task<int> RunAsync()
typeof(ContactsAndCustomFields),
typeof(Designs),
typeof(EmailActivities),
typeof(EngagementQuality),
typeof(EmailValidation),
typeof(GlobalSuppressions),
typeof(InvalidEmails),
Expand Down
14 changes: 7 additions & 7 deletions Source/StrongGrid.UnitTests/Resources/AccessManagementTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ public async Task GetAccessHistory()
var accessManagement = new AccessManagement(client);

// Act
var result = await accessManagement.GetAccessHistoryAsync(20, null, CancellationToken.None).ConfigureAwait(false);
var result = await accessManagement.GetAccessHistoryAsync(20, null, CancellationToken.None);

// Assert
result.ShouldNotBeNull();
Expand All @@ -142,7 +142,7 @@ public async Task GetWhitelistedIpAddresses()
var accessManagement = new AccessManagement(client);

// Act
var result = await accessManagement.GetWhitelistedIpAddressesAsync(null, CancellationToken.None).ConfigureAwait(false);
var result = await accessManagement.GetWhitelistedIpAddressesAsync(null, CancellationToken.None);

// Assert
result.ShouldNotBeNull();
Expand All @@ -162,7 +162,7 @@ public async Task AddIpAddressToWhitelist()
var accessManagement = new AccessManagement(client);

// Act
var result = await accessManagement.AddIpAddressToWhitelistAsync(ip, null, CancellationToken.None).ConfigureAwait(false);
var result = await accessManagement.AddIpAddressToWhitelistAsync(ip, null, CancellationToken.None);

// Assert
result.ShouldNotBeNull();
Expand All @@ -181,7 +181,7 @@ public async Task AddIpAddressesToWhitelist()
var accessManagement = new AccessManagement(client);

// Act
var result = await accessManagement.AddIpAddressesToWhitelistAsync(ips, null, CancellationToken.None).ConfigureAwait(false);
var result = await accessManagement.AddIpAddressesToWhitelistAsync(ips, null, CancellationToken.None);

// Assert
result.ShouldNotBeNull();
Expand All @@ -201,7 +201,7 @@ public async Task RemoveIpAddressFromWhitelistAsync()
var accessManagement = new AccessManagement(client);

// Act
await accessManagement.RemoveIpAddressFromWhitelistAsync(id, null, CancellationToken.None).ConfigureAwait(false);
await accessManagement.RemoveIpAddressFromWhitelistAsync(id, null, CancellationToken.None);

// Assert
}
Expand All @@ -219,7 +219,7 @@ public async Task RemoveIpAddressesFromWhitelistAsync()
var accessManagement = new AccessManagement(client);

// Act
await accessManagement.RemoveIpAddressesFromWhitelistAsync(ids, null, CancellationToken.None).ConfigureAwait(false);
await accessManagement.RemoveIpAddressesFromWhitelistAsync(ids, null, CancellationToken.None);

// Assert
}
Expand All @@ -239,7 +239,7 @@ public async Task GetWhitelistedIpAddressAsync()
var accessManagement = new AccessManagement(client);

// Act
var result = await accessManagement.GetWhitelistedIpAddressAsync(id, null, CancellationToken.None).ConfigureAwait(false);
var result = await accessManagement.GetWhitelistedIpAddressAsync(id, null, CancellationToken.None);

// Assert
result.ShouldNotBeNull();
Expand Down
10 changes: 5 additions & 5 deletions Source/StrongGrid.UnitTests/Resources/AlertsTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ public async Task Create()
var alerts = new Alerts(client);

// Act
var result = await alerts.CreateAsync(type, emailTo, frequency, percentage, null, CancellationToken.None).ConfigureAwait(false);
var result = await alerts.CreateAsync(type, emailTo, frequency, percentage, null, CancellationToken.None);

// Assert
mockHttp.VerifyNoOutstandingExpectation();
Expand All @@ -111,7 +111,7 @@ public async Task Get()
var alerts = new Alerts(client);

// Act
var result = await alerts.GetAsync(alertId, null, CancellationToken.None).ConfigureAwait(false);
var result = await alerts.GetAsync(alertId, null, CancellationToken.None);

// Assert
mockHttp.VerifyNoOutstandingExpectation();
Expand All @@ -130,7 +130,7 @@ public async Task GetAll()
var alerts = new Alerts(client);

// Act
var result = await alerts.GetAllAsync(null, CancellationToken.None).ConfigureAwait(false);
var result = await alerts.GetAllAsync(null, CancellationToken.None);

// Assert
mockHttp.VerifyNoOutstandingExpectation();
Expand All @@ -152,7 +152,7 @@ public async Task Delete()
var alerts = new Alerts(client);

// Act
await alerts.DeleteAsync(alertId, null, CancellationToken.None).ConfigureAwait(false);
await alerts.DeleteAsync(alertId, null, CancellationToken.None);

// Assert
mockHttp.VerifyNoOutstandingExpectation();
Expand All @@ -173,7 +173,7 @@ public async Task Update()
var alerts = new Alerts(client);

// Act
var result = await alerts.UpdateAsync(alertId, null, emailTo, null, null, null, CancellationToken.None).ConfigureAwait(false);
var result = await alerts.UpdateAsync(alertId, null, emailTo, null, null, null, CancellationToken.None);

// Assert
mockHttp.VerifyNoOutstandingExpectation();
Expand Down
18 changes: 9 additions & 9 deletions Source/StrongGrid.UnitTests/Resources/ApiKeysTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ public async Task CreateAsync()
var apiKeys = new ApiKeys(client);

// Act
var result = await apiKeys.CreateAsync(name, scopes, null, CancellationToken.None).ConfigureAwait(false);
var result = await apiKeys.CreateAsync(name, scopes, null, CancellationToken.None);

// Assert
mockHttp.VerifyNoOutstandingExpectation();
Expand All @@ -94,7 +94,7 @@ public async Task GetAsync()
var apiKeys = new ApiKeys(client);

// Act
var result = await apiKeys.GetAsync(keyId, null, CancellationToken.None).ConfigureAwait(false);
var result = await apiKeys.GetAsync(keyId, null, CancellationToken.None);

// Assert
mockHttp.VerifyNoOutstandingExpectation();
Expand All @@ -113,7 +113,7 @@ public async Task GetAllAsync()
var apiKeys = new ApiKeys(client);

// Act
var result = await apiKeys.GetAllAsync(cancellationToken: CancellationToken.None).ConfigureAwait(false);
var result = await apiKeys.GetAllAsync(cancellationToken: CancellationToken.None);

// Assert
mockHttp.VerifyNoOutstandingExpectation();
Expand All @@ -135,7 +135,7 @@ public async Task DeleteAsync()
var apiKeys = new ApiKeys(client);

// Act
await apiKeys.DeleteAsync(keyId, null, CancellationToken.None).ConfigureAwait(false);
await apiKeys.DeleteAsync(keyId, null, CancellationToken.None);

// Assert
mockHttp.VerifyNoOutstandingExpectation();
Expand All @@ -157,7 +157,7 @@ public async Task UpdateAsync_with_scopes()
var apiKeys = new ApiKeys(client);

// Act
var result = await apiKeys.UpdateAsync(keyId, name, scopes, null, CancellationToken.None).ConfigureAwait(false);
var result = await apiKeys.UpdateAsync(keyId, name, scopes, null, CancellationToken.None);

// Assert
mockHttp.VerifyNoOutstandingExpectation();
Expand All @@ -180,7 +180,7 @@ public async Task UpdateAsync_without_scopes()
var apiKeys = new ApiKeys(client);

// Act
var result = await apiKeys.UpdateAsync(keyId, name, scopes, null, CancellationToken.None).ConfigureAwait(false);
var result = await apiKeys.UpdateAsync(keyId, name, scopes, null, CancellationToken.None);

// Assert
mockHttp.VerifyNoOutstandingExpectation();
Expand All @@ -201,7 +201,7 @@ public async Task CreateWithBillingPermissionsAsync()
var apiKeys = new ApiKeys(client);

// Act
var result = await apiKeys.CreateWithBillingPermissionsAsync(name, null, CancellationToken.None).ConfigureAwait(false);
var result = await apiKeys.CreateWithBillingPermissionsAsync(name, null, CancellationToken.None);

// Assert
mockHttp.VerifyNoOutstandingExpectation();
Expand Down Expand Up @@ -230,7 +230,7 @@ public async Task CreateWithAllPermissionsAsync()
var apiKeys = new ApiKeys(client);

// Act
var result = await apiKeys.CreateWithAllPermissionsAsync(name, null, CancellationToken.None).ConfigureAwait(false);
var result = await apiKeys.CreateWithAllPermissionsAsync(name, null, CancellationToken.None);

// Assert
mockHttp.VerifyNoOutstandingExpectation();
Expand Down Expand Up @@ -259,7 +259,7 @@ public async Task CreateWithReadOnlyPermissionsAsync()
var apiKeys = new ApiKeys(client);

// Act
var result = await apiKeys.CreateWithReadOnlyPermissionsAsync(name, null, CancellationToken.None).ConfigureAwait(false);
var result = await apiKeys.CreateWithReadOnlyPermissionsAsync(name, null, CancellationToken.None);

// Assert
mockHttp.VerifyNoOutstandingExpectation();
Expand Down
20 changes: 10 additions & 10 deletions Source/StrongGrid.UnitTests/Resources/BatchesTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public async Task GenerateBatchIdAsync()
var batches = new Batches(client);

// Act
var batchId = await batches.GenerateBatchIdAsync().ConfigureAwait(false);
var batchId = await batches.GenerateBatchIdAsync();

// Assert
mockHttp.VerifyNoOutstandingExpectation();
Expand All @@ -76,7 +76,7 @@ public async Task ValidateBatchIdAsync_true()
var batches = new Batches(client);

// Act
var result = await batches.ValidateBatchIdAsync(batchId).ConfigureAwait(false);
var result = await batches.ValidateBatchIdAsync(batchId);

// Assert
mockHttp.VerifyNoOutstandingExpectation();
Expand Down Expand Up @@ -106,7 +106,7 @@ public async Task ValidateBatchIdAsync_false()
var batches = new Batches(client);

// Act
var result = await batches.ValidateBatchIdAsync(batchId).ConfigureAwait(false);
var result = await batches.ValidateBatchIdAsync(batchId);

// Assert
mockHttp.VerifyNoOutstandingExpectation();
Expand Down Expand Up @@ -136,7 +136,7 @@ public async Task ValidateBatchIdAsync_problem()
var batches = new Batches(client);

// Act
var result = await Should.ThrowAsync<Exception>(batches.ValidateBatchIdAsync(batchId)).ConfigureAwait(false);
var result = await Should.ThrowAsync<Exception>(batches.ValidateBatchIdAsync(batchId));

// Assert
mockHttp.VerifyNoOutstandingExpectation();
Expand All @@ -158,7 +158,7 @@ public async Task CancelAsync()
var batches = new Batches(client);

// Act
await batches.Cancel(batchId).ConfigureAwait(false);
await batches.Cancel(batchId);

// Assert
mockHttp.VerifyNoOutstandingExpectation();
Expand All @@ -178,7 +178,7 @@ public async Task PauseAsync()
var batches = new Batches(client);

// Act
await batches.Pause(batchId).ConfigureAwait(false);
await batches.Pause(batchId);

// Assert
mockHttp.VerifyNoOutstandingExpectation();
Expand All @@ -196,7 +196,7 @@ public async Task GetAllAsync()
var batches = new Batches(client);

// Act
var result = await batches.GetAllAsync().ConfigureAwait(false);
var result = await batches.GetAllAsync();

// Assert
mockHttp.VerifyNoOutstandingExpectation();
Expand All @@ -218,7 +218,7 @@ public async Task GetAsync()
var batches = new Batches(client);

// Act
var result = await batches.GetAsync(batchId).ConfigureAwait(false);
var result = await batches.GetAsync(batchId);

// Assert
mockHttp.VerifyNoOutstandingExpectation();
Expand All @@ -239,7 +239,7 @@ public async Task GetAsync_doesnt_exist()
var batches = new Batches(client);

// Act
var result = await batches.GetAsync(batchId).ConfigureAwait(false);
var result = await batches.GetAsync(batchId);

// Assert
mockHttp.VerifyNoOutstandingExpectation();
Expand All @@ -260,7 +260,7 @@ public async Task ResumeAsync()
var batches = new Batches(client);

// Act
await batches.Resume(batchId).ConfigureAwait(false);
await batches.Resume(batchId);

// Assert
mockHttp.VerifyNoOutstandingExpectation();
Expand Down
10 changes: 5 additions & 5 deletions Source/StrongGrid.UnitTests/Resources/BlocksTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ public async Task GetAllAsync()
var blocks = new Blocks(client);

// Act
var result = await blocks.GetAllAsync().ConfigureAwait(false);
var result = await blocks.GetAllAsync();

// Assert
mockHttp.VerifyNoOutstandingExpectation();
Expand All @@ -83,7 +83,7 @@ public async Task DeleteAllAsync()
var blocks = new Blocks(client);

// Act
await blocks.DeleteAllAsync().ConfigureAwait(false);
await blocks.DeleteAllAsync();

// Assert
mockHttp.VerifyNoOutstandingExpectation();
Expand All @@ -103,7 +103,7 @@ public async Task DeleteMultipleAsync()
var blocks = new Blocks(client);

// Act
await blocks.DeleteMultipleAsync(emailAddresses).ConfigureAwait(false);
await blocks.DeleteMultipleAsync(emailAddresses);

// Assert
mockHttp.VerifyNoOutstandingExpectation();
Expand All @@ -123,7 +123,7 @@ public async Task DeleteAsync()
var blocks = new Blocks(client);

// Act
await blocks.DeleteAsync(emailAddress).ConfigureAwait(false);
await blocks.DeleteAsync(emailAddress);

// Assert
mockHttp.VerifyNoOutstandingExpectation();
Expand All @@ -143,7 +143,7 @@ public async Task GetAsync()
var blocks = new Blocks(client);

// Act
var result = await blocks.GetAsync(emailAddress, null, CancellationToken.None).ConfigureAwait(false);
var result = await blocks.GetAsync(emailAddress, null, CancellationToken.None);

// Assert
mockHttp.VerifyNoOutstandingExpectation();
Expand Down
Loading

0 comments on commit 07850ea

Please sign in to comment.