Merge branch 'finbourne-dev' into dev

Author: alexeyzimarev

src/RestSharp/Parameters/UrlSegmentParameter.cs

@@ -13,6 +13,7 @@
 // limitations under the License.
 
 using System.Text.RegularExpressions;
+using RestSharp.Extensions;
 
 namespace RestSharp;
 
@@ -26,10 +27,11 @@ public partial record UrlSegmentParameter : NamedParameter {
     /// <param name="name">Parameter name</param>
     /// <param name="value">Parameter value</param>
     /// <param name="encode">Optional: encode the value, default is true</param>
-    public UrlSegmentParameter(string name, string value, bool encode = true)
+    /// <param name="replaceEncodedSlash">Optional: whether to replace all %2f and %2F in the parameter value with '/', default is true</param>
+    public UrlSegmentParameter(string name, string value, bool encode = true, bool replaceEncodedSlash = true)
         : base(
             name,
-            RegexPattern.Replace(Ensure.NotEmptyString(value, nameof(value)), "/"),
+            value.IsEmpty() ? value : replaceEncodedSlash ? RegexPattern.Replace(value, "/") : value,
             ParameterType.UrlSegment,
             encode
         ) { }

test/RestSharp.Tests/Headers/DefaultHeaderTests.cs

@@ -0,0 +1,23 @@
+namespace RestSharp.Tests.Headers;
+
+public class DefaultHeaderTests {
+    const string BaseUrl = "http://localhost:8888/";
+    
+    [Fact]
+    public void AddDefaultHeadersUsingDictionary() {
+        var headers = new Dictionary<string, string> {
+            { KnownHeaders.ContentType, ContentType.Json },
+            { KnownHeaders.Accept, ContentType.Json },
+            { KnownHeaders.ContentEncoding, "gzip, deflate" }
+        };
+
+        var expected = headers.Select(x => new HeaderParameter(x.Key, x.Value));
+
+        using var client = new RestClient(BaseUrl);
+        client.AddDefaultHeaders(headers);
+
+        var actual = client.DefaultParameters.Select(x => x as HeaderParameter);
+        expected.Should().BeSubsetOf(actual);
+    }
+
+}

test/RestSharp.Tests/AddRangeTests.cs renamed to test/RestSharp.Tests/Headers/HeaderRangeTests.cs

@@ -1,6 +1,6 @@
-namespace RestSharp.Tests;
+namespace RestSharp.Tests.Parameters;
 
-public class AddRangeTests {
+public class HeaderRangeTests {
     [Fact]
     public async Task ShouldParseOutLongRangeSpecifier() {
         using var restClient = new RestClient("http://localhost");

test/RestSharp.Tests/HostHeaderTests.cs renamed to test/RestSharp.Tests/Headers/HostHeaderTests.cs

@@ -1,4 +1,4 @@
-namespace RestSharp.Tests;
+namespace RestSharp.Tests.Parameters;
 
 public partial class ObjectParameterTests {
     sealed record ArrayData<TEnumerable>([property: RequestProperty(ArrayQueryType = RequestArrayQueryType.ArrayParameters)] TEnumerable Array) where TEnumerable : notnull;

test/RestSharp.Tests/RequestHeaderTests.cs renamed to test/RestSharp.Tests/Headers/RequestHeaderTests.cs

@@ -1,4 +1,4 @@
-namespace RestSharp.Tests;
+namespace RestSharp.Tests.Parameters;
 
 public partial class ObjectParameterTests {
     sealed record CsvData<TEnumerable>([property: RequestProperty(ArrayQueryType = RequestArrayQueryType.CommaSeparated)] TEnumerable Csv) where TEnumerable : notnull;

test/RestSharp.Tests/ObjectParameterTests.ArrayData.cs renamed to test/RestSharp.Tests/Parameters/ObjectParameterTests.ArrayData.cs

@@ -1,4 +1,4 @@
-namespace RestSharp.Tests;
+namespace RestSharp.Tests.Parameters;
 
 public partial class ObjectParameterTests {
     sealed record FormattedData<TDateTime>([property: RequestProperty(Format = "hh:mm tt")] TDateTime FormattedParameter) where TDateTime : notnull;

test/RestSharp.Tests/ObjectParameterTests.CsvData.cs renamed to test/RestSharp.Tests/Parameters/ObjectParameterTests.CsvData.cs

@@ -1,4 +1,4 @@
-namespace RestSharp.Tests;
+namespace RestSharp.Tests.Parameters;
 
 public partial class ObjectParameterTests {
     sealed record NamedData([property: RequestProperty(Name = "CustomName")] object NamedParameter);

test/RestSharp.Tests/ObjectParameterTests.FormattedData.cs renamed to test/RestSharp.Tests/Parameters/ObjectParameterTests.FormattedData.cs

@@ -1,7 +1,7 @@
 using System.Collections;
 using System.Globalization;
 
-namespace RestSharp.Tests;
+namespace RestSharp.Tests.Parameters;
 
 public partial class ObjectParameterTests {
     public ObjectParameterTests() => Thread.CurrentThread.CurrentCulture = CultureInfo.InvariantCulture;