diff --git a/Octokit.Tests/Helpers/UriExtensionsTests.cs b/Octokit.Tests/Helpers/UriExtensionsTests.cs index cf799589..2ab07abb 100644 --- a/Octokit.Tests/Helpers/UriExtensionsTests.cs +++ b/Octokit.Tests/Helpers/UriExtensionsTests.cs @@ -36,20 +36,6 @@ namespace Octokit.Tests.Helpers Assert.Equal(new Uri("issues?foo=fooval&bar=barval", UriKind.Relative), uriWithParameters); } - [Fact(Skip="I don't believe this test is valid")] - public void OverwritesExistingParameters() - { - var uri = new Uri("https://example.com?crap=crapola"); - - var uriWithParameters = uri.ApplyParameters(new Dictionary - { - {"foo", "fooval"}, - {"bar", "barval"} - }); - - Assert.Equal(new Uri("https://example.com?foo=fooval&bar=barval"), uriWithParameters); - } - [Fact] public void DoesNotChangeUrlWhenParametersEmpty() { @@ -77,6 +63,18 @@ namespace Octokit.Tests.Helpers Assert.True(actual.Query.Contains("page=2")); } + [Fact] + public void DoesNotChangePassedInDictionary() + { + var uri = new Uri("https://api.github.com/repositories/1/milestones?state=closed&sort=due_date&direction=asc&page=2"); + + var parameters = new Dictionary { { "state", "open" }, { "sort", "other" } }; + + uri.ApplyParameters(parameters); + + Assert.Equal(2, parameters.Count); + } + [Fact] public void EnsuresArgumentNotNull() { diff --git a/Octokit/Helpers/UriExtensions.cs b/Octokit/Helpers/UriExtensions.cs index 53acbc82..d3d3c102 100644 --- a/Octokit/Helpers/UriExtensions.cs +++ b/Octokit/Helpers/UriExtensions.cs @@ -12,6 +12,10 @@ namespace Octokit if (parameters == null || !parameters.Any()) return uri; + // to prevent values being persisted across requests + // use a temporary dictionary which combines new and existing parameters + IDictionary p = new Dictionary(parameters); + string queryString; if (uri.IsAbsoluteUri) { @@ -34,13 +38,13 @@ namespace Octokit foreach (var existing in existingParameters) { - if (!parameters.ContainsKey(existing.Key)) + if (!p.ContainsKey(existing.Key)) { - parameters.Add(existing); + p.Add(existing); } } - string query = String.Join("&", parameters.Select(kvp => kvp.Key + "=" + kvp.Value)); + string query = String.Join("&", p.Select(kvp => kvp.Key + "=" + kvp.Value)); if (uri.IsAbsoluteUri) { var uriBuilder = new UriBuilder(uri)