Skip to content

don't add trailing slash if assembled is null #198

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Feb 8, 2012
Merged

don't add trailing slash if assembled is null #198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5358345
don't add trailing slash if assembled is null
friism Dec 30, 2011
ce38a1d
add unit test to test with empty request
friism Jan 25, 2012
0f3aba6
add unit test to test empty request and bare hostname
friism Jan 25, 2012
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
24 changes: 24 additions & 0 deletions RestSharp.Tests/UrlBuilderTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,5 +110,29 @@ public void POST_with_resource_containing_tokens()
Assert.Equal(expected, output);
}

[Fact]
public void GET_with_empty_request()
{
var request = new RestRequest();
var client = new RestClient("http://example.com/resource");

var expected = new Uri("http://example.com/resource");
var output = client.BuildUri(request);

Assert.Equal(expected, output);
}

[Fact]
public void GET_with_empty_request_and_bare_hostname()
{
var request = new RestRequest();
var client = new RestClient("http://example.com");

var expected = new Uri("http://example.com/");
var output = client.BuildUri(request);

Assert.Equal(expected, output);
}

}
}
13 changes: 11 additions & 2 deletions RestSharp/RestClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,8 +304,17 @@ public Uri BuildUri(IRestRequest request)
assembled = assembled.Substring(1);
}

if(!string.IsNullOrEmpty(BaseUrl))
assembled = string.Format("{0}/{1}", BaseUrl, assembled);
if (!string.IsNullOrEmpty(BaseUrl))
{
if (string.IsNullOrEmpty(assembled))
{
assembled = BaseUrl;
}
else
{
assembled = string.Format("{0}/{1}", BaseUrl, assembled);
}
}

if (request.Method != Method.POST && request.Method != Method.PUT && request.Method != Method.PATCH)
{
Expand Down