Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/RestSharp/Request/RestRequestExtensions.Url.cs
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public static partial class RestRequestExtensions {
/// <param name="encode">Encode the value or not, default true</param>
/// <returns></returns>
public RestRequest AddUrlSegment(string name, string? value, bool encode = true)
=> request.AddParameter(new UrlSegmentParameter(name, value, encode));
=> request.AddOrUpdateParameter(new UrlSegmentParameter(name, value, encode));

/// <summary>
/// Adds a URL segment parameter to the request. The resource URL must have a placeholder for the parameter for it to work.
Expand Down
17 changes: 15 additions & 2 deletions test/RestSharp.Tests/Parameters/UrlSegmentTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -54,20 +54,33 @@ public void UrlSegmentParameter_WithValueWithEncodedSlash_WillReplaceEncodedSlas
var urlSegmentParameter = new UrlSegmentParameter("foo", inputValue);
urlSegmentParameter.Value.Should().BeEquivalentTo("bar/BAR");
}

[Theory]
[InlineData("bar%2fBAR")]
[InlineData("bar%2FBAR")]
public void UrlSegmentParameter_WithValueWithEncodedSlash_CanReplaceEncodedSlash(string inputValue) {
var urlSegmentParameter = new UrlSegmentParameter("foo", inputValue, replaceEncodedSlash: true);
urlSegmentParameter.Value.Should().BeEquivalentTo("bar/BAR");
}

[Theory]
[InlineData("bar%2fBAR")]
[InlineData("bar%2FBAR")]
public void UrlSegmentParameter_WithValueWithEncodedSlash_CanLeaveEncodedSlash(string inputValue) {
var urlSegmentParameter = new UrlSegmentParameter("foo", inputValue, replaceEncodedSlash: false);
urlSegmentParameter.Value.Should().BeEquivalentTo(inputValue);
}

[Fact]
public void AddSameUrlSegmentTwice_ShouldReplaceFirst() {
var client = new RestClient();
var request = new RestRequest("https://api.example.com/orgs/{segment}/something");
request.AddUrlSegment("segment", 1);
var url1 = client.BuildUri(request);
request.AddUrlSegment("segment", 2);
var url2 = client.BuildUri(request);

url1.AbsolutePath.Should().Be("/orgs/1/something");
url2.AbsolutePath.Should().Be("/orgs/2/something");
}
}
26 changes: 26 additions & 0 deletions test/RestSharp.Tests/UrlBuilderTests.Get.cs
Original file line number Diff line number Diff line change
Expand Up @@ -198,4 +198,30 @@ public void GET_wth_trailing_slash_and_query_parameters() {
var output = client.BuildUri(request);
Assert.Equal(expected, output);
}

[Fact]
public void Multiple_query_parameters_with_same_name() {
var request = new RestRequest($"/{Resource}/")
.AddQueryParameter("foo", "bar")
.AddQueryParameter("foo", "baz");
var expected = new Uri($"{Base}/{Resource}/?foo=bar&foo=baz");

using var client = new RestClient(Base);

var output = client.BuildUri(request);
Assert.Equal(expected, output);
}

[Fact]
public void Query_parameter_with_non_string_value() {
var request = new RestRequest($"/{Resource}/")
.AddQueryParameter("foo", 123)
.AddQueryParameter("bar", true);
var expected = new Uri($"{Base}/{Resource}/?foo=123&bar=True");

using var client = new RestClient(Base);

var output = client.BuildUri(request);
Assert.Equal(expected, output);
}
}
Loading