zoriya/octokit.net
1
0
Fork 0
mirror of https://github.com/zoriya/octokit.net.git synced 2025-12-06 07:16:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Bug]Fix pagination when ApiOptions.StartPage is explicitly set.

Browse Source
This commit is contained in:
Pavel Kindruk
2023-09-22 17:09:37 +03:00
committed by GitHub
parent dcc31b8e0c
commit 57a29e90d0
2 changed files with 66 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
Octokit.Tests/Helpers/UriExtensionsTests.cs
View File

@@ -161,6 +161,64 @@ namespace Octokit.Tests.Helpers
Uri uri = null;
Assert.Throws<ArgumentNullException>(() => uri.ApplyParameters(new Dictionary<string, string>()));
}
[Fact]
public void AppendsStartPageIfNone()
{
var uri = new Uri("https://api.github.com/repositories/1/labels");
var parameters = new Dictionary<string, string>();
Pagination.Setup(parameters, new ApiOptions { StartPage = 3, PageSize = 7 });
var actual = uri.ApplyParameters(parameters);
Assert.Equal(
new Uri("https://api.github.com/repositories/1/labels?per_page=7&page=3"),
actual);
}
[Fact]
public void AppendsStartPageIfNoneForRelativeUri()
{
var uri = new Uri("/repositories/1/labels", UriKind.Relative);
var parameters = new Dictionary<string, string>();
Pagination.Setup(parameters, new ApiOptions { StartPage = 3, PageSize = 7 });
var actual = uri.ApplyParameters(parameters);
Assert.Equal(
new Uri("/repositories/1/labels?per_page=7&page=3", UriKind.Relative),
actual);
}
[Fact]
public void DoesNotChangePageNumberInNextPageUriWithStartPage()
{
const string nextPageUriString = "https://api.github.com/repositories/1/labels?per_page=5&page=2";
var nextPageUri = new Uri(nextPageUriString);
var parameters = new Dictionary<string, string>();
Pagination.Setup(parameters, new ApiOptions { StartPage = 1, PageSize = 5 });
var actual = nextPageUri.ApplyParameters(parameters);
Assert.Equal(new Uri(nextPageUriString), actual);
}
[Fact]
public void DoesNotChangePageNumberInNextPageUriWithStartPageForRelativeUri()
{
const string nextPageUriString = "/repositories/1/labels?per_page=5&page=2";
var nextPageUri = new Uri(nextPageUriString, UriKind.Relative);
var parameters = new Dictionary<string, string>();
Pagination.Setup(parameters, new ApiOptions { StartPage = 1, PageSize = 5 });
var actual = nextPageUri.ApplyParameters(parameters);
Assert.Equal(new Uri(nextPageUriString, UriKind.Relative), actual);
}
}
}
}

9
Octokit/Helpers/UriExtensions.cs
View File

@@ -76,7 +76,14 @@ namespace Octokit
foreach (var existing in existingParameters)
{
if (!p.ContainsKey(existing.Key))
if (existing.Key == "page")
{
// See https://github.com/octokit/octokit.net/issues/1955
// See https://github.com/octokit/octokit.net/issues/2602
// Desired behavior: don't replace page number in nextPageUri
p[existing.Key] = existing.Value;
}
else if (!p.ContainsKey(existing.Key))
{
p.Add(existing);
}