Merge branch 'release/0.82.0'

Source/StrongGrid.IntegrationTests/Tests/Mail.cs

@@ -65,7 +65,9 @@ public async Task RunAsync(IBaseClient client, TextWriter log, CancellationToken
 					Enabled = true,
 					HtmlContent = "<p>This email was sent with the help of the <b><a href=\"https://www.nuget.org/packages/StrongGrid/\">StrongGrid</a></b> library</p>",
 					TextContent = "This email was sent with the help of the StrongGrid library"
-				}
+				},
+				BypassSpamManagement = true,
+				BypassListManagement = false
 			};
 			var trackingSettings = new TrackingSettings
 			{

Source/StrongGrid.IntegrationTests/TestsRunner.cs

@@ -65,7 +65,7 @@ public async Task<int> RunAsync()
 			};
 
 			// Ensure the Console is tall enough and centered on the screen
-			Console.WindowHeight = Math.Min(60, Console.LargestWindowHeight);
+			if (OperatingSystem.IsWindows()) Console.WindowHeight = Math.Min(60, Console.LargestWindowHeight);
 			Utils.CenterConsole();
 
 			// These are the integration tests that we will execute

Source/StrongGrid/Utilities/MailSettingsConverter.cs

@@ -62,41 +62,20 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
 
 			var mailSettings = (MailSettings)value;
 
-			writer.WritePropertyName("bypass_list_management");
-			writer.WriteStartObject();
-			writer.WritePropertyName("enable");
-			serializer.Serialize(writer, mailSettings.BypassListManagement);
-			writer.WriteEndObject();
-
-			writer.WritePropertyName("bypass_spam_management");
-			writer.WriteStartObject();
-			writer.WritePropertyName("enable");
-			serializer.Serialize(writer, mailSettings.BypassSpamManagement);
-			writer.WriteEndObject();
-
-			writer.WritePropertyName("bypass_bounce_management");
-			writer.WriteStartObject();
-			writer.WritePropertyName("enable");
-			serializer.Serialize(writer, mailSettings.BypassBounceManagement);
-			writer.WriteEndObject();
-
-			writer.WritePropertyName("bypass_unsubscribe_management");
-			writer.WriteStartObject();
-			writer.WritePropertyName("enable");
-			serializer.Serialize(writer, mailSettings.BypassUnsubscribeManagement);
-			writer.WriteEndObject();
+			// bypass_xxx_management should be omited when the value is 'false'.
+			// See https://github.com/Jericho/StrongGrid/issues/395 for details.
+			if (mailSettings.BypassListManagement) WriteEnabledProperty(writer, "bypass_list_management", true, serializer);
+			if (mailSettings.BypassSpamManagement) WriteEnabledProperty(writer, "bypass_spam_management", true, serializer);
+			if (mailSettings.BypassBounceManagement) WriteEnabledProperty(writer, "bypass_bounce_management", true, serializer);
+			if (mailSettings.BypassUnsubscribeManagement) WriteEnabledProperty(writer, "bypass_unsubscribe_management", true, serializer);
 
 			if (mailSettings.Footer != null)
 			{
 				writer.WritePropertyName("footer");
 				serializer.Serialize(writer, mailSettings.Footer);
 			}
 
-			writer.WritePropertyName("sandbox_mode");
-			writer.WriteStartObject();
-			writer.WritePropertyName("enable");
-			serializer.Serialize(writer, mailSettings.SandboxModeEnabled);
-			writer.WriteEndObject();
+			WriteEnabledProperty(writer, "sandbox_mode", mailSettings.SandboxModeEnabled, serializer);
 
 			// End of JSON serialization
 			writer.WriteEndObject();
@@ -116,5 +95,14 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 		{
 			throw new NotSupportedException("The MailSettingsConverter can only be used to write JSON");
 		}
+
+		private static void WriteEnabledProperty(JsonWriter writer, string propertyName, bool value, JsonSerializer serializer)
+		{
+			writer.WritePropertyName(propertyName);
+			writer.WriteStartObject();
+			writer.WritePropertyName("enable");
+			serializer.Serialize(writer, value);
+			writer.WriteEndObject();
+		}
 	}
 }

build.cake

@@ -1,7 +1,7 @@
 // Install tools.
 #tool dotnet:?package=GitVersion.Tool&version=5.6.6
 #tool nuget:?package=GitReleaseManager&version=0.11.0
-#tool nuget:?package=OpenCover&version=4.7.922
+#tool nuget:?package=OpenCover&version=4.7.1189
 #tool nuget:?package=ReportGenerator&version=4.8.8
 #tool nuget:?package=coveralls.io&version=1.4.2
 #tool nuget:?package=xunit.runner.console&version=2.4.1
@@ -126,7 +126,7 @@ Setup(context =>
 	// Integration tests are intended to be used for debugging purposes and not intended to be executed in CI environment.
 	// Also, the runner for these tests contains windows-specific code (such as resizing window, moving window to center of screen, etc.)
 	// which can cause problems when attempting to run unit tests on an Ubuntu image on AppVeyor.
-	if (IsRunningOnUnix())
+	if (!isLocalBuild)
 	{
 		Information("");
 		Information("Removing integration tests");
@@ -136,7 +136,7 @@ Setup(context =>
 
 Teardown(context =>
 {
-	if (IsRunningOnUnix())
+	if (!isLocalBuild)
 	{
 		Information("Restoring integration tests");
 		GitCheckout(".", new FilePath[] { solutionFile });