From 7688d6154f7d585318aacab68fd648d522d89946 Mon Sep 17 00:00:00 2001 From: Prayank Mathur Date: Thu, 10 Mar 2016 21:23:35 +0530 Subject: [PATCH 01/15] Fixed Issue 1082 in code. Still need to fix the unit as well as integration tests. --- Octokit/Models/Request/IssueRequest.cs | 19 +++++++++++++++++-- Octokit/Models/Request/IssueUpdate.cs | 4 ++-- Octokit/Models/Request/MilestoneUpdate.cs | 2 +- Octokit/Models/Request/NewMilestone.cs | 4 ++-- Octokit/Models/Request/PullRequestUpdate.cs | 4 ++-- Octokit/Models/Request/SearchIssuesRequest.cs | 2 +- 6 files changed, 25 insertions(+), 10 deletions(-) diff --git a/Octokit/Models/Request/IssueRequest.cs b/Octokit/Models/Request/IssueRequest.cs index 3d9d4d99..116b24f3 100644 --- a/Octokit/Models/Request/IssueRequest.cs +++ b/Octokit/Models/Request/IssueRequest.cs @@ -126,12 +126,12 @@ namespace Octokit public enum ItemState { /// - /// Isuses that are open (default). + /// Issues that are open (default). /// Open, /// - /// Isuses that are closed. + /// Issues that are closed. /// Closed, @@ -140,6 +140,21 @@ namespace Octokit /// All } + /// + /// Filter for the search API + /// + public enum ItemStateFilter + { + /// + /// Issues that are open + /// + Open, + + /// + /// Issues that are closed + /// + Closed + } /// /// The available properties to sort issues by. diff --git a/Octokit/Models/Request/IssueUpdate.cs b/Octokit/Models/Request/IssueUpdate.cs index fd25f985..89d18621 100644 --- a/Octokit/Models/Request/IssueUpdate.cs +++ b/Octokit/Models/Request/IssueUpdate.cs @@ -52,7 +52,7 @@ namespace Octokit /// /// Whether the issue is open or closed. /// - public ItemState? State { get; set; } + public ItemStateFilter? State { get; set; } internal string DebuggerDisplay { @@ -93,4 +93,4 @@ namespace Octokit } } } -} +} \ No newline at end of file diff --git a/Octokit/Models/Request/MilestoneUpdate.cs b/Octokit/Models/Request/MilestoneUpdate.cs index 80fac3b1..36002d59 100644 --- a/Octokit/Models/Request/MilestoneUpdate.cs +++ b/Octokit/Models/Request/MilestoneUpdate.cs @@ -18,7 +18,7 @@ namespace Octokit /// /// Whether the milestone is open or closed. The default is . /// - public ItemState? State { get; set; } + public ItemStateFilter? State { get; set; } /// /// Optional description for the milestone. diff --git a/Octokit/Models/Request/NewMilestone.cs b/Octokit/Models/Request/NewMilestone.cs index 4817fa3a..34128a3c 100644 --- a/Octokit/Models/Request/NewMilestone.cs +++ b/Octokit/Models/Request/NewMilestone.cs @@ -19,7 +19,7 @@ namespace Octokit Ensure.ArgumentNotNull(title, "title"); Title = title; - State = ItemState.Open; + State = ItemStateFilter.Open; } /// @@ -30,7 +30,7 @@ namespace Octokit /// /// Whether the milestone is open or closed. The default is . /// - public ItemState State { get; set; } + public ItemStateFilter State { get; set; } /// /// Optional description for the milestone. diff --git a/Octokit/Models/Request/PullRequestUpdate.cs b/Octokit/Models/Request/PullRequestUpdate.cs index 32400553..e28b6cc9 100644 --- a/Octokit/Models/Request/PullRequestUpdate.cs +++ b/Octokit/Models/Request/PullRequestUpdate.cs @@ -16,9 +16,9 @@ namespace Octokit public string Title { get; set; } /// - /// Whether the pull request is open or closed. The default is . + /// Whether the pull request is open or closed. The default is . /// - public ItemState? State { get; set; } + public ItemStateFilter? State { get; set; } /// /// The body for the pull request. Supports GFM. diff --git a/Octokit/Models/Request/SearchIssuesRequest.cs b/Octokit/Models/Request/SearchIssuesRequest.cs index 77057c2f..f5f589d1 100644 --- a/Octokit/Models/Request/SearchIssuesRequest.cs +++ b/Octokit/Models/Request/SearchIssuesRequest.cs @@ -132,7 +132,7 @@ namespace Octokit /// /// https://help.github.com/articles/searching-issues#state /// - public ItemState? State { get; set; } + public ItemStateFilter? State { get; set; } private IEnumerable _labels; /// From 2dc6826c4526cc3529284f8e074168b175e32c7a Mon Sep 17 00:00:00 2001 From: Prayank Mathur Date: Thu, 10 Mar 2016 21:41:52 +0530 Subject: [PATCH 02/15] Added the new enum ItemStateFilter to response/issue.cs --- Octokit/Models/Response/Issue.cs | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/Octokit/Models/Response/Issue.cs b/Octokit/Models/Response/Issue.cs index e961fe7c..edb5cf54 100644 --- a/Octokit/Models/Response/Issue.cs +++ b/Octokit/Models/Response/Issue.cs @@ -10,7 +10,7 @@ namespace Octokit { public Issue() { } - public Issue(Uri url, Uri htmlUrl, Uri commentsUrl, Uri eventsUrl, int number, ItemState state, string title, string body, User user, IReadOnlyList public ItemStateFilter FilteredState {get; protected set;} - /// /// Title of the issue /// @@ -155,7 +154,7 @@ namespace Octokit Assignee = assignee, Body = Body, Milestone = milestoneId, - State = State, + State = FilteredState, Title = Title }; From d03e37bf4f98e33d424d1ce5560a1f61215220eb Mon Sep 17 00:00:00 2001 From: Prayank Mathur Date: Thu, 10 Mar 2016 22:45:03 +0530 Subject: [PATCH 04/15] Issue 1082 fixed adding enum ItemStateFilter --- Octokit.Tests.Integration/Clients/IssuesClientTests.cs | 10 +++++----- .../Clients/IssuesEventsClientTests.cs | 10 +++++----- .../Clients/MilestonesClientTests.cs | 10 +++++----- .../Clients/PullRequestsClientTests.cs | 4 ++-- Octokit.Tests.Integration/Clients/SearchClientTests.cs | 3 +-- Octokit.Tests.Integration/RedirectTests.cs | 2 +- Octokit.Tests/Clients/SearchClientTests.cs | 4 ++-- 7 files changed, 21 insertions(+), 22 deletions(-) diff --git a/Octokit.Tests.Integration/Clients/IssuesClientTests.cs b/Octokit.Tests.Integration/Clients/IssuesClientTests.cs index 73284093..adb7814c 100644 --- a/Octokit.Tests.Integration/Clients/IssuesClientTests.cs +++ b/Octokit.Tests.Integration/Clients/IssuesClientTests.cs @@ -55,7 +55,7 @@ public class IssuesClientTests : IDisposable finally { var closed = _issuesClient.Update(_context.RepositoryOwner, _context.RepositoryName, issue.Number, - new IssueUpdate { State = ItemState.Closed }) + new IssueUpdate { State = ItemStateFilter.Closed }) .Result; Assert.NotNull(closed); } @@ -75,7 +75,7 @@ public class IssuesClientTests : IDisposable await _issuesClient.Create(_context.RepositoryOwner, _context.RepositoryName, newIssue3); var closed = await _issuesClient.Create(_context.RepositoryOwner, _context.RepositoryName, newIssue4); await _issuesClient.Update(_context.RepositoryOwner, _context.RepositoryName, closed.Number, - new IssueUpdate { State = ItemState.Closed }); + new IssueUpdate { State = ItemStateFilter.Closed }); var issues = await _issuesClient.GetAllForRepository(_context.RepositoryOwner, _context.RepositoryName); @@ -99,7 +99,7 @@ public class IssuesClientTests : IDisposable await _issuesClient.Create(_context.RepositoryOwner, _context.RepositoryName, newIssue3); var closed = await _issuesClient.Create(_context.RepositoryOwner, _context.RepositoryName, newIssue4); await _issuesClient.Update(_context.RepositoryOwner, _context.RepositoryName, closed.Number, - new IssueUpdate { State = ItemState.Closed }); + new IssueUpdate { State = ItemStateFilter.Closed }); var issues = await _issuesClient.GetAllForRepository(_context.RepositoryOwner, _context.RepositoryName, new RepositoryIssueRequest { SortDirection = SortDirection.Ascending }); @@ -119,7 +119,7 @@ public class IssuesClientTests : IDisposable await _issuesClient.Create(_context.RepositoryOwner, _context.RepositoryName, newIssue2); var closed = await _issuesClient.Create(_context.RepositoryOwner, _context.RepositoryName, newIssue2); await _issuesClient.Update(_context.RepositoryOwner, _context.RepositoryName, closed.Number, - new IssueUpdate { State = ItemState.Closed }); + new IssueUpdate { State = ItemStateFilter.Closed }); var issues = await _issuesClient.GetAllForRepository(_context.RepositoryOwner, _context.RepositoryName, new RepositoryIssueRequest { State = ItemState.Closed }); @@ -156,7 +156,7 @@ public class IssuesClientTests : IDisposable var issue3 = await _issuesClient.Create(_context.RepositoryOwner, _context.RepositoryName, newIssue3); var issue4 = await _issuesClient.Create(_context.RepositoryOwner, _context.RepositoryName, newIssue4); await _issuesClient.Update(_context.RepositoryOwner, _context.RepositoryName, issue4.Number, - new IssueUpdate { State = ItemState.Closed }); + new IssueUpdate { State = ItemStateFilter.Closed }); var retrieved = await _issuesClient.GetAllForRepository(_context.RepositoryOwner, _context.RepositoryName, new RepositoryIssueRequest { State = ItemState.All }); diff --git a/Octokit.Tests.Integration/Clients/IssuesEventsClientTests.cs b/Octokit.Tests.Integration/Clients/IssuesEventsClientTests.cs index 61f9c919..de362c0b 100644 --- a/Octokit.Tests.Integration/Clients/IssuesEventsClientTests.cs +++ b/Octokit.Tests.Integration/Clients/IssuesEventsClientTests.cs @@ -33,7 +33,7 @@ public class IssuesEventsClientTests : IDisposable var issueEventInfo = await _issuesEventsClient.GetAllForIssue(_context.RepositoryOwner, _context.RepositoryName, issue.Number); Assert.Empty(issueEventInfo); - var closed = _issuesClient.Update(_context.RepositoryOwner, _context.RepositoryName, issue.Number, new IssueUpdate { State = ItemState.Closed }) + var closed = _issuesClient.Update(_context.RepositoryOwner, _context.RepositoryName, issue.Number, new IssueUpdate { State = ItemStateFilter.Closed }) .Result; Assert.NotNull(closed); issueEventInfo = await _issuesEventsClient.GetAllForIssue(_context.RepositoryOwner, _context.RepositoryName, issue.Number); @@ -55,15 +55,15 @@ public class IssuesEventsClientTests : IDisposable Thread.Sleep(1000); // close and open issue1 - var closed1 = _issuesClient.Update(_context.RepositoryOwner, _context.RepositoryName, issue1.Number, new IssueUpdate { State = ItemState.Closed }) + var closed1 = _issuesClient.Update(_context.RepositoryOwner, _context.RepositoryName, issue1.Number, new IssueUpdate { State = ItemStateFilter.Closed }) .Result; Assert.NotNull(closed1); - var reopened1 = _issuesClient.Update(_context.RepositoryOwner, _context.RepositoryName, issue1.Number, new IssueUpdate { State = ItemState.Open }) + var reopened1 = _issuesClient.Update(_context.RepositoryOwner, _context.RepositoryName, issue1.Number, new IssueUpdate { State = ItemStateFilter.Open }) .Result; Assert.NotNull(reopened1); // close issue2 - var closed2 = _issuesClient.Update(_context.RepositoryOwner, _context.RepositoryName, issue2.Number, new IssueUpdate { State = ItemState.Closed }) + var closed2 = _issuesClient.Update(_context.RepositoryOwner, _context.RepositoryName, issue2.Number, new IssueUpdate { State = ItemStateFilter.Closed }) .Result; Assert.NotNull(closed2); @@ -78,7 +78,7 @@ public class IssuesEventsClientTests : IDisposable { var newIssue = new NewIssue("a test issue") { Body = "A new unassigned issue" }; var issue = await _issuesClient.Create(_context.RepositoryOwner, _context.RepositoryName, newIssue); - var closed = _issuesClient.Update(_context.RepositoryOwner, _context.RepositoryName, issue.Number, new IssueUpdate { State = ItemState.Closed }) + var closed = _issuesClient.Update(_context.RepositoryOwner, _context.RepositoryName, issue.Number, new IssueUpdate { State = ItemStateFilter.Closed }) .Result; Assert.NotNull(closed); var issueEvents = await _issuesEventsClient.GetAllForRepository(_context.RepositoryOwner, _context.RepositoryName); diff --git a/Octokit.Tests.Integration/Clients/MilestonesClientTests.cs b/Octokit.Tests.Integration/Clients/MilestonesClientTests.cs index f5a58f4a..9a241243 100644 --- a/Octokit.Tests.Integration/Clients/MilestonesClientTests.cs +++ b/Octokit.Tests.Integration/Clients/MilestonesClientTests.cs @@ -46,7 +46,7 @@ public class MilestonesClientTests : IDisposable { var milestone1 = new NewMilestone("milestone 1") { DueOn = DateTime.Now }; var milestone2 = new NewMilestone("milestone 2") { DueOn = DateTime.Now.AddDays(1) }; - var milestone3 = new NewMilestone("milestone 3") { DueOn = DateTime.Now.AddDays(3), State = ItemState.Closed }; + var milestone3 = new NewMilestone("milestone 3") { DueOn = DateTime.Now.AddDays(3), State = ItemStateFilter.Closed }; await _milestonesClient.Create(_context.RepositoryOwner, _context.RepositoryName, milestone1); await _milestonesClient.Create(_context.RepositoryOwner, _context.RepositoryName, milestone2); await _milestonesClient.Create(_context.RepositoryOwner, _context.RepositoryName, milestone3); @@ -62,7 +62,7 @@ public class MilestonesClientTests : IDisposable { var milestone1 = new NewMilestone("milestone 1") { DueOn = DateTime.Now }; var milestone2 = new NewMilestone("milestone 2") { DueOn = DateTime.Now.AddDays(1) }; - var milestone3 = new NewMilestone("milestone 3") { DueOn = DateTime.Now.AddDays(3), State = ItemState.Closed }; + var milestone3 = new NewMilestone("milestone 3") { DueOn = DateTime.Now.AddDays(3), State = ItemStateFilter.Closed }; await _milestonesClient.Create(_context.RepositoryOwner, _context.RepositoryName, milestone1); await _milestonesClient.Create(_context.RepositoryOwner, _context.RepositoryName, milestone2); await _milestonesClient.Create(_context.RepositoryOwner, _context.RepositoryName, milestone3); @@ -79,7 +79,7 @@ public class MilestonesClientTests : IDisposable { var milestone1 = new NewMilestone("milestone 1") { DueOn = DateTime.Now }; var milestone2 = new NewMilestone("milestone 2") { DueOn = DateTime.Now.AddDays(1) }; - var milestone3 = new NewMilestone("milestone 3") { DueOn = DateTime.Now.AddDays(3), State = ItemState.Closed }; + var milestone3 = new NewMilestone("milestone 3") { DueOn = DateTime.Now.AddDays(3), State = ItemStateFilter.Closed }; await _milestonesClient.Create(_context.RepositoryOwner, _context.RepositoryName, milestone1); await _milestonesClient.Create(_context.RepositoryOwner, _context.RepositoryName, milestone2); await _milestonesClient.Create(_context.RepositoryOwner, _context.RepositoryName, milestone3); @@ -98,9 +98,9 @@ public class MilestonesClientTests : IDisposable var issue1 = await _github.Issue.Create(_context.RepositoryOwner, _context.RepositoryName, newIssue); var issue2 = await _github.Issue.Create(_context.RepositoryOwner, _context.RepositoryName, newIssue); await _github.Issue.Update(_context.RepositoryOwner, _context.RepositoryName, issue1.Number, - new IssueUpdate { State = ItemState.Closed }); + new IssueUpdate { State = ItemStateFilter.Closed }); await _github.Issue.Update(_context.RepositoryOwner, _context.RepositoryName, issue2.Number, - new IssueUpdate { State = ItemState.Closed }); + new IssueUpdate { State = ItemStateFilter.Closed }); var retrieved = await _github.Issue.GetAllForRepository(_context.RepositoryOwner, _context.RepositoryName, new RepositoryIssueRequest { State = ItemState.Closed }); diff --git a/Octokit.Tests.Integration/Clients/PullRequestsClientTests.cs b/Octokit.Tests.Integration/Clients/PullRequestsClientTests.cs index 63af12a5..8543469f 100644 --- a/Octokit.Tests.Integration/Clients/PullRequestsClientTests.cs +++ b/Octokit.Tests.Integration/Clients/PullRequestsClientTests.cs @@ -104,7 +104,7 @@ public class PullRequestsClientTests : IDisposable var newPullRequest = new NewPullRequest("a pull request", branchName, "master"); var pullRequest = await _fixture.Create(Helper.UserName, _context.RepositoryName, newPullRequest); - var updatePullRequest = new PullRequestUpdate { State = ItemState.Closed }; + var updatePullRequest = new PullRequestUpdate { State = ItemStateFilter.Closed }; var result = await _fixture.Update(Helper.UserName, _context.RepositoryName, pullRequest.Number, updatePullRequest); Assert.Equal(ItemState.Closed, result.State); @@ -120,7 +120,7 @@ public class PullRequestsClientTests : IDisposable var newPullRequest = new NewPullRequest("a pull request", branchName, "master"); var pullRequest = await _fixture.Create(Helper.UserName, _context.RepositoryName, newPullRequest); - var updatePullRequest = new PullRequestUpdate { State = ItemState.Closed }; + var updatePullRequest = new PullRequestUpdate { State = ItemStateFilter.Closed }; await _fixture.Update(Helper.UserName, _context.RepositoryName, pullRequest.Number, updatePullRequest); var closedPullRequests = new PullRequestRequest { State = ItemState.Closed }; diff --git a/Octokit.Tests.Integration/Clients/SearchClientTests.cs b/Octokit.Tests.Integration/Clients/SearchClientTests.cs index 78da8769..cae762dd 100644 --- a/Octokit.Tests.Integration/Clients/SearchClientTests.cs +++ b/Octokit.Tests.Integration/Clients/SearchClientTests.cs @@ -79,7 +79,7 @@ public class SearchClientTests { var request = new SearchIssuesRequest("phone"); request.Repos.Add("caliburn-micro", "caliburn.micro"); - request.State = ItemState.Open; + request.State = ItemStateFilter.Open; var issues = await _gitHubClient.Search.SearchIssues(request); @@ -91,7 +91,6 @@ public class SearchClientTests { var request = new SearchIssuesRequest("phone"); request.Repos.Add("caliburn-micro", "caliburn.micro"); - request.State = ItemState.All; var issues = await _gitHubClient.Search.SearchIssues(request); diff --git a/Octokit.Tests.Integration/RedirectTests.cs b/Octokit.Tests.Integration/RedirectTests.cs index b61416c2..a620c453 100644 --- a/Octokit.Tests.Integration/RedirectTests.cs +++ b/Octokit.Tests.Integration/RedirectTests.cs @@ -38,7 +38,7 @@ namespace Octokit.Tests.Integration Assert.NotNull(resolvedIssue); var update = resolvedIssue.ToUpdate(); - update.State = ItemState.Closed; + update.State = ItemStateFilter.Closed; await client.Issue.Update(owner, oldRepoName, issue.Number, update); } } diff --git a/Octokit.Tests/Clients/SearchClientTests.cs b/Octokit.Tests/Clients/SearchClientTests.cs index 4d5125d5..ba79d5ea 100644 --- a/Octokit.Tests/Clients/SearchClientTests.cs +++ b/Octokit.Tests/Clients/SearchClientTests.cs @@ -902,7 +902,7 @@ namespace Octokit.Tests.Clients var connection = Substitute.For(); var client = new SearchClient(connection); var request = new SearchIssuesRequest("something"); - request.State = ItemState.Open; + request.State = ItemStateFilter.Open; client.SearchIssues(request); @@ -917,7 +917,7 @@ namespace Octokit.Tests.Clients var connection = Substitute.For(); var client = new SearchClient(connection); var request = new SearchIssuesRequest("something"); - request.State = ItemState.Closed; + request.State = ItemStateFilter.Closed; client.SearchIssues(request); From 0f5d7c4182ca1af26b4a39f6a49c8dd25cf0202d Mon Sep 17 00:00:00 2001 From: Prayank Mathur Date: Fri, 11 Mar 2016 00:23:54 +0530 Subject: [PATCH 05/15] Fixed issue 1082 adding enum ItemStateFilter --- Octokit.Tests.Integration/Clients/IssuesClientTests.cs | 4 ++-- Octokit.Tests.Integration/Clients/MilestonesClientTests.cs | 2 +- Octokit.Tests/Models/IssueRequestTests.cs | 2 +- Octokit/Models/Request/IssueRequest.cs | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Octokit.Tests.Integration/Clients/IssuesClientTests.cs b/Octokit.Tests.Integration/Clients/IssuesClientTests.cs index adb7814c..733f7192 100644 --- a/Octokit.Tests.Integration/Clients/IssuesClientTests.cs +++ b/Octokit.Tests.Integration/Clients/IssuesClientTests.cs @@ -122,7 +122,7 @@ public class IssuesClientTests : IDisposable new IssueUpdate { State = ItemStateFilter.Closed }); var issues = await _issuesClient.GetAllForRepository(_context.RepositoryOwner, _context.RepositoryName, - new RepositoryIssueRequest { State = ItemState.Closed }); + new RepositoryIssueRequest { State = ItemStateFilter.Closed }); Assert.Equal(1, issues.Count); Assert.Equal("A closed issue", issues[0].Title); @@ -159,7 +159,7 @@ public class IssuesClientTests : IDisposable new IssueUpdate { State = ItemStateFilter.Closed }); var retrieved = await _issuesClient.GetAllForRepository(_context.RepositoryOwner, _context.RepositoryName, - new RepositoryIssueRequest { State = ItemState.All }); + new RepositoryIssueRequest { }); Assert.True(retrieved.Count >= 4); Assert.True(retrieved.Any(i => i.Number == issue1.Number)); diff --git a/Octokit.Tests.Integration/Clients/MilestonesClientTests.cs b/Octokit.Tests.Integration/Clients/MilestonesClientTests.cs index 9a241243..bd2eaf37 100644 --- a/Octokit.Tests.Integration/Clients/MilestonesClientTests.cs +++ b/Octokit.Tests.Integration/Clients/MilestonesClientTests.cs @@ -103,7 +103,7 @@ public class MilestonesClientTests : IDisposable new IssueUpdate { State = ItemStateFilter.Closed }); var retrieved = await _github.Issue.GetAllForRepository(_context.RepositoryOwner, _context.RepositoryName, - new RepositoryIssueRequest { State = ItemState.Closed }); + new RepositoryIssueRequest { State = ItemStateFilter.Closed }); Assert.True(retrieved.Count >= 2); Assert.True(retrieved.Any(i => i.Number == issue1.Number)); diff --git a/Octokit.Tests/Models/IssueRequestTests.cs b/Octokit.Tests/Models/IssueRequestTests.cs index 46b40357..cafee4c7 100644 --- a/Octokit.Tests/Models/IssueRequestTests.cs +++ b/Octokit.Tests/Models/IssueRequestTests.cs @@ -13,7 +13,7 @@ public class IssueRequestTests var request = new IssueRequest { Filter = IssueFilter.All, - State = ItemState.Closed, + State = ItemStateFilter.Closed, SortProperty = IssueSort.Comments, SortDirection = SortDirection.Ascending, Since = DateTimeOffset.ParseExact("Wed 23 Jan 2013 8:30 AM -08:00", diff --git a/Octokit/Models/Request/IssueRequest.cs b/Octokit/Models/Request/IssueRequest.cs index 116b24f3..d0a9c6cc 100644 --- a/Octokit/Models/Request/IssueRequest.cs +++ b/Octokit/Models/Request/IssueRequest.cs @@ -18,7 +18,7 @@ namespace Octokit public IssueRequest() { Filter = IssueFilter.Assigned; - State = ItemState.Open; + State = ItemStateFilter.Open; Labels = new Collection(); SortProperty = IssueSort.Created; SortDirection = SortDirection.Descending; @@ -38,7 +38,7 @@ namespace Octokit /// /// The state. /// - public ItemState State { get; set; } + public ItemStateFilter State { get; set; } /// /// Gets the labels to filter by. Add labels to the collection to only request issues with those labels. From 9fd1c025f4a6abd3022552e732ac44eb41de9e92 Mon Sep 17 00:00:00 2001 From: Prayank Mathur Date: Mon, 14 Mar 2016 10:12:28 +0530 Subject: [PATCH 06/15] 1140 --- Octokit/Models/Request/IssueRequest.cs | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/Octokit/Models/Request/IssueRequest.cs b/Octokit/Models/Request/IssueRequest.cs index d0a9c6cc..8eb8369c 100644 --- a/Octokit/Models/Request/IssueRequest.cs +++ b/Octokit/Models/Request/IssueRequest.cs @@ -121,9 +121,9 @@ namespace Octokit } /// - /// The range of states that an issue can be in. + /// Search API Filter /// - public enum ItemState + public enum ItemStateFilter { /// /// Issues that are open (default). @@ -141,9 +141,9 @@ namespace Octokit All } /// - /// Filter for the search API + /// Range of States /// - public enum ItemStateFilter + public enum ItemState { /// /// Issues that are open @@ -153,7 +153,13 @@ namespace Octokit /// /// Issues that are closed /// - Closed + Closed, + + /// + /// All the issues. The option is Obsolete + /// + [Obsolete] + All } /// From 546d7d5cf3793e01e564cd04a91ff673eada6b67 Mon Sep 17 00:00:00 2001 From: Prayank Mathur Date: Mon, 14 Mar 2016 10:17:22 +0530 Subject: [PATCH 07/15] 1140 --- Octokit/Models/Request/IssueRequest.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Octokit/Models/Request/IssueRequest.cs b/Octokit/Models/Request/IssueRequest.cs index 8eb8369c..e5d312aa 100644 --- a/Octokit/Models/Request/IssueRequest.cs +++ b/Octokit/Models/Request/IssueRequest.cs @@ -158,7 +158,7 @@ namespace Octokit /// /// All the issues. The option is Obsolete /// - [Obsolete] + [Obsolete("The method is Obsolete. Dont specify the state in case of all queries")] All } From 397b1f1c821759f10ddaf552c3fe5feb5dde7ac9 Mon Sep 17 00:00:00 2001 From: Prayank Mathur Date: Mon, 14 Mar 2016 23:22:18 +0530 Subject: [PATCH 08/15] Updated the enum ItemState with deprecating the ItemState.All and making the necessary changes --- .../Clients/IssuesClientTests.cs | 10 +++++----- .../Clients/IssuesEventsClientTests.cs | 10 +++++----- .../Clients/MilestonesClientTests.cs | 12 ++++++------ .../Clients/PullRequestsClientTests.cs | 10 +++++----- .../Clients/SearchClientTests.cs | 2 +- .../Reactive/ObservableMilestonesClientTests.cs | 2 +- Octokit.Tests.Integration/RedirectTests.cs | 2 +- Octokit.Tests/Clients/SearchClientTests.cs | 4 ++-- Octokit.Tests/Models/MilestoneRequestTests.cs | 2 +- Octokit.Tests/Models/PullRequestRequestTests.cs | 2 +- Octokit/Models/Request/IssueRequest.cs | 2 +- Octokit/Models/Request/IssueUpdate.cs | 2 +- Octokit/Models/Request/MilestoneRequest.cs | 4 ++-- Octokit/Models/Request/MilestoneUpdate.cs | 2 +- Octokit/Models/Request/NewMilestone.cs | 4 ++-- Octokit/Models/Request/PullRequestRequest.cs | 6 +++--- Octokit/Models/Request/PullRequestUpdate.cs | 4 ++-- Octokit/Models/Request/SearchIssuesRequest.cs | 2 +- Octokit/Models/Response/Issue.cs | 2 +- 19 files changed, 42 insertions(+), 42 deletions(-) diff --git a/Octokit.Tests.Integration/Clients/IssuesClientTests.cs b/Octokit.Tests.Integration/Clients/IssuesClientTests.cs index 733f7192..a75bdcf8 100644 --- a/Octokit.Tests.Integration/Clients/IssuesClientTests.cs +++ b/Octokit.Tests.Integration/Clients/IssuesClientTests.cs @@ -55,7 +55,7 @@ public class IssuesClientTests : IDisposable finally { var closed = _issuesClient.Update(_context.RepositoryOwner, _context.RepositoryName, issue.Number, - new IssueUpdate { State = ItemStateFilter.Closed }) + new IssueUpdate { State = ItemState.Closed }) .Result; Assert.NotNull(closed); } @@ -75,7 +75,7 @@ public class IssuesClientTests : IDisposable await _issuesClient.Create(_context.RepositoryOwner, _context.RepositoryName, newIssue3); var closed = await _issuesClient.Create(_context.RepositoryOwner, _context.RepositoryName, newIssue4); await _issuesClient.Update(_context.RepositoryOwner, _context.RepositoryName, closed.Number, - new IssueUpdate { State = ItemStateFilter.Closed }); + new IssueUpdate { State = ItemState.Closed }); var issues = await _issuesClient.GetAllForRepository(_context.RepositoryOwner, _context.RepositoryName); @@ -99,7 +99,7 @@ public class IssuesClientTests : IDisposable await _issuesClient.Create(_context.RepositoryOwner, _context.RepositoryName, newIssue3); var closed = await _issuesClient.Create(_context.RepositoryOwner, _context.RepositoryName, newIssue4); await _issuesClient.Update(_context.RepositoryOwner, _context.RepositoryName, closed.Number, - new IssueUpdate { State = ItemStateFilter.Closed }); + new IssueUpdate { State = ItemState.Closed }); var issues = await _issuesClient.GetAllForRepository(_context.RepositoryOwner, _context.RepositoryName, new RepositoryIssueRequest { SortDirection = SortDirection.Ascending }); @@ -119,7 +119,7 @@ public class IssuesClientTests : IDisposable await _issuesClient.Create(_context.RepositoryOwner, _context.RepositoryName, newIssue2); var closed = await _issuesClient.Create(_context.RepositoryOwner, _context.RepositoryName, newIssue2); await _issuesClient.Update(_context.RepositoryOwner, _context.RepositoryName, closed.Number, - new IssueUpdate { State = ItemStateFilter.Closed }); + new IssueUpdate { State = ItemState.Closed }); var issues = await _issuesClient.GetAllForRepository(_context.RepositoryOwner, _context.RepositoryName, new RepositoryIssueRequest { State = ItemStateFilter.Closed }); @@ -156,7 +156,7 @@ public class IssuesClientTests : IDisposable var issue3 = await _issuesClient.Create(_context.RepositoryOwner, _context.RepositoryName, newIssue3); var issue4 = await _issuesClient.Create(_context.RepositoryOwner, _context.RepositoryName, newIssue4); await _issuesClient.Update(_context.RepositoryOwner, _context.RepositoryName, issue4.Number, - new IssueUpdate { State = ItemStateFilter.Closed }); + new IssueUpdate { State = ItemState.Closed }); var retrieved = await _issuesClient.GetAllForRepository(_context.RepositoryOwner, _context.RepositoryName, new RepositoryIssueRequest { }); diff --git a/Octokit.Tests.Integration/Clients/IssuesEventsClientTests.cs b/Octokit.Tests.Integration/Clients/IssuesEventsClientTests.cs index de362c0b..61f9c919 100644 --- a/Octokit.Tests.Integration/Clients/IssuesEventsClientTests.cs +++ b/Octokit.Tests.Integration/Clients/IssuesEventsClientTests.cs @@ -33,7 +33,7 @@ public class IssuesEventsClientTests : IDisposable var issueEventInfo = await _issuesEventsClient.GetAllForIssue(_context.RepositoryOwner, _context.RepositoryName, issue.Number); Assert.Empty(issueEventInfo); - var closed = _issuesClient.Update(_context.RepositoryOwner, _context.RepositoryName, issue.Number, new IssueUpdate { State = ItemStateFilter.Closed }) + var closed = _issuesClient.Update(_context.RepositoryOwner, _context.RepositoryName, issue.Number, new IssueUpdate { State = ItemState.Closed }) .Result; Assert.NotNull(closed); issueEventInfo = await _issuesEventsClient.GetAllForIssue(_context.RepositoryOwner, _context.RepositoryName, issue.Number); @@ -55,15 +55,15 @@ public class IssuesEventsClientTests : IDisposable Thread.Sleep(1000); // close and open issue1 - var closed1 = _issuesClient.Update(_context.RepositoryOwner, _context.RepositoryName, issue1.Number, new IssueUpdate { State = ItemStateFilter.Closed }) + var closed1 = _issuesClient.Update(_context.RepositoryOwner, _context.RepositoryName, issue1.Number, new IssueUpdate { State = ItemState.Closed }) .Result; Assert.NotNull(closed1); - var reopened1 = _issuesClient.Update(_context.RepositoryOwner, _context.RepositoryName, issue1.Number, new IssueUpdate { State = ItemStateFilter.Open }) + var reopened1 = _issuesClient.Update(_context.RepositoryOwner, _context.RepositoryName, issue1.Number, new IssueUpdate { State = ItemState.Open }) .Result; Assert.NotNull(reopened1); // close issue2 - var closed2 = _issuesClient.Update(_context.RepositoryOwner, _context.RepositoryName, issue2.Number, new IssueUpdate { State = ItemStateFilter.Closed }) + var closed2 = _issuesClient.Update(_context.RepositoryOwner, _context.RepositoryName, issue2.Number, new IssueUpdate { State = ItemState.Closed }) .Result; Assert.NotNull(closed2); @@ -78,7 +78,7 @@ public class IssuesEventsClientTests : IDisposable { var newIssue = new NewIssue("a test issue") { Body = "A new unassigned issue" }; var issue = await _issuesClient.Create(_context.RepositoryOwner, _context.RepositoryName, newIssue); - var closed = _issuesClient.Update(_context.RepositoryOwner, _context.RepositoryName, issue.Number, new IssueUpdate { State = ItemStateFilter.Closed }) + var closed = _issuesClient.Update(_context.RepositoryOwner, _context.RepositoryName, issue.Number, new IssueUpdate { State = ItemState.Closed }) .Result; Assert.NotNull(closed); var issueEvents = await _issuesEventsClient.GetAllForRepository(_context.RepositoryOwner, _context.RepositoryName); diff --git a/Octokit.Tests.Integration/Clients/MilestonesClientTests.cs b/Octokit.Tests.Integration/Clients/MilestonesClientTests.cs index bd2eaf37..d3325025 100644 --- a/Octokit.Tests.Integration/Clients/MilestonesClientTests.cs +++ b/Octokit.Tests.Integration/Clients/MilestonesClientTests.cs @@ -46,7 +46,7 @@ public class MilestonesClientTests : IDisposable { var milestone1 = new NewMilestone("milestone 1") { DueOn = DateTime.Now }; var milestone2 = new NewMilestone("milestone 2") { DueOn = DateTime.Now.AddDays(1) }; - var milestone3 = new NewMilestone("milestone 3") { DueOn = DateTime.Now.AddDays(3), State = ItemStateFilter.Closed }; + var milestone3 = new NewMilestone("milestone 3") { DueOn = DateTime.Now.AddDays(3), State = ItemState.Closed }; await _milestonesClient.Create(_context.RepositoryOwner, _context.RepositoryName, milestone1); await _milestonesClient.Create(_context.RepositoryOwner, _context.RepositoryName, milestone2); await _milestonesClient.Create(_context.RepositoryOwner, _context.RepositoryName, milestone3); @@ -62,7 +62,7 @@ public class MilestonesClientTests : IDisposable { var milestone1 = new NewMilestone("milestone 1") { DueOn = DateTime.Now }; var milestone2 = new NewMilestone("milestone 2") { DueOn = DateTime.Now.AddDays(1) }; - var milestone3 = new NewMilestone("milestone 3") { DueOn = DateTime.Now.AddDays(3), State = ItemStateFilter.Closed }; + var milestone3 = new NewMilestone("milestone 3") { DueOn = DateTime.Now.AddDays(3), State = ItemState.Closed }; await _milestonesClient.Create(_context.RepositoryOwner, _context.RepositoryName, milestone1); await _milestonesClient.Create(_context.RepositoryOwner, _context.RepositoryName, milestone2); await _milestonesClient.Create(_context.RepositoryOwner, _context.RepositoryName, milestone3); @@ -79,13 +79,13 @@ public class MilestonesClientTests : IDisposable { var milestone1 = new NewMilestone("milestone 1") { DueOn = DateTime.Now }; var milestone2 = new NewMilestone("milestone 2") { DueOn = DateTime.Now.AddDays(1) }; - var milestone3 = new NewMilestone("milestone 3") { DueOn = DateTime.Now.AddDays(3), State = ItemStateFilter.Closed }; + var milestone3 = new NewMilestone("milestone 3") { DueOn = DateTime.Now.AddDays(3), State = ItemState.Closed }; await _milestonesClient.Create(_context.RepositoryOwner, _context.RepositoryName, milestone1); await _milestonesClient.Create(_context.RepositoryOwner, _context.RepositoryName, milestone2); await _milestonesClient.Create(_context.RepositoryOwner, _context.RepositoryName, milestone3); var milestones = await _milestonesClient.GetAllForRepository(_context.RepositoryOwner, _context.RepositoryName, - new MilestoneRequest { State = ItemState.Closed }); + new MilestoneRequest { State = ItemStateFilter.Closed }); Assert.Equal(1, milestones.Count); Assert.Equal("milestone 3", milestones[0].Title); @@ -98,9 +98,9 @@ public class MilestonesClientTests : IDisposable var issue1 = await _github.Issue.Create(_context.RepositoryOwner, _context.RepositoryName, newIssue); var issue2 = await _github.Issue.Create(_context.RepositoryOwner, _context.RepositoryName, newIssue); await _github.Issue.Update(_context.RepositoryOwner, _context.RepositoryName, issue1.Number, - new IssueUpdate { State = ItemStateFilter.Closed }); + new IssueUpdate { State = ItemState.Closed }); await _github.Issue.Update(_context.RepositoryOwner, _context.RepositoryName, issue2.Number, - new IssueUpdate { State = ItemStateFilter.Closed }); + new IssueUpdate { State = ItemState.Closed }); var retrieved = await _github.Issue.GetAllForRepository(_context.RepositoryOwner, _context.RepositoryName, new RepositoryIssueRequest { State = ItemStateFilter.Closed }); diff --git a/Octokit.Tests.Integration/Clients/PullRequestsClientTests.cs b/Octokit.Tests.Integration/Clients/PullRequestsClientTests.cs index 8543469f..c9e0a2eb 100644 --- a/Octokit.Tests.Integration/Clients/PullRequestsClientTests.cs +++ b/Octokit.Tests.Integration/Clients/PullRequestsClientTests.cs @@ -60,7 +60,7 @@ public class PullRequestsClientTests : IDisposable var newPullRequest = new NewPullRequest("a pull request", branchName, "master"); var result = await _fixture.Create(Helper.UserName, _context.RepositoryName, newPullRequest); - var openPullRequests = new PullRequestRequest { State = ItemState.Open }; + var openPullRequests = new PullRequestRequest { State = ItemStateFilter.Open }; var pullRequests = await _fixture.GetAllForRepository(Helper.UserName, _context.RepositoryName, openPullRequests); Assert.Equal(1, pullRequests.Count); @@ -75,7 +75,7 @@ public class PullRequestsClientTests : IDisposable var newPullRequest = new NewPullRequest("a pull request", branchName, "master"); await _fixture.Create(Helper.UserName, _context.RepositoryName, newPullRequest); - var openPullRequests = new PullRequestRequest { State = ItemState.Closed }; + var openPullRequests = new PullRequestRequest { State = ItemStateFilter.Closed }; var pullRequests = await _fixture.GetAllForRepository(Helper.UserName, _context.RepositoryName, openPullRequests); Assert.Empty(pullRequests); @@ -104,7 +104,7 @@ public class PullRequestsClientTests : IDisposable var newPullRequest = new NewPullRequest("a pull request", branchName, "master"); var pullRequest = await _fixture.Create(Helper.UserName, _context.RepositoryName, newPullRequest); - var updatePullRequest = new PullRequestUpdate { State = ItemStateFilter.Closed }; + var updatePullRequest = new PullRequestUpdate { State = ItemState.Closed }; var result = await _fixture.Update(Helper.UserName, _context.RepositoryName, pullRequest.Number, updatePullRequest); Assert.Equal(ItemState.Closed, result.State); @@ -120,10 +120,10 @@ public class PullRequestsClientTests : IDisposable var newPullRequest = new NewPullRequest("a pull request", branchName, "master"); var pullRequest = await _fixture.Create(Helper.UserName, _context.RepositoryName, newPullRequest); - var updatePullRequest = new PullRequestUpdate { State = ItemStateFilter.Closed }; + var updatePullRequest = new PullRequestUpdate { State = ItemState.Closed }; await _fixture.Update(Helper.UserName, _context.RepositoryName, pullRequest.Number, updatePullRequest); - var closedPullRequests = new PullRequestRequest { State = ItemState.Closed }; + var closedPullRequests = new PullRequestRequest { State = ItemStateFilter.Closed }; var pullRequests = await _fixture.GetAllForRepository(Helper.UserName, _context.RepositoryName, closedPullRequests); Assert.Equal(1, pullRequests.Count); diff --git a/Octokit.Tests.Integration/Clients/SearchClientTests.cs b/Octokit.Tests.Integration/Clients/SearchClientTests.cs index cae762dd..3292c390 100644 --- a/Octokit.Tests.Integration/Clients/SearchClientTests.cs +++ b/Octokit.Tests.Integration/Clients/SearchClientTests.cs @@ -79,7 +79,7 @@ public class SearchClientTests { var request = new SearchIssuesRequest("phone"); request.Repos.Add("caliburn-micro", "caliburn.micro"); - request.State = ItemStateFilter.Open; + request.State = ItemState.Open; var issues = await _gitHubClient.Search.SearchIssues(request); diff --git a/Octokit.Tests.Integration/Reactive/ObservableMilestonesClientTests.cs b/Octokit.Tests.Integration/Reactive/ObservableMilestonesClientTests.cs index 91e9acc9..e1560211 100644 --- a/Octokit.Tests.Integration/Reactive/ObservableMilestonesClientTests.cs +++ b/Octokit.Tests.Integration/Reactive/ObservableMilestonesClientTests.cs @@ -31,7 +31,7 @@ namespace Octokit.Tests.Integration var github = Helper.GetAuthenticatedClient(); var client = new ObservableMilestonesClient(github); - var milestones = await client.GetAllForRepository("libgit2", "libgit2sharp", new MilestoneRequest { State = ItemState.Closed }).ToList(); + var milestones = await client.GetAllForRepository("libgit2", "libgit2sharp", new MilestoneRequest { State = ItemStateFilter.Closed }).ToList(); Assert.NotEmpty(milestones); Assert.True(milestones.All(m => m.State == ItemState.Closed)); diff --git a/Octokit.Tests.Integration/RedirectTests.cs b/Octokit.Tests.Integration/RedirectTests.cs index a620c453..b61416c2 100644 --- a/Octokit.Tests.Integration/RedirectTests.cs +++ b/Octokit.Tests.Integration/RedirectTests.cs @@ -38,7 +38,7 @@ namespace Octokit.Tests.Integration Assert.NotNull(resolvedIssue); var update = resolvedIssue.ToUpdate(); - update.State = ItemStateFilter.Closed; + update.State = ItemState.Closed; await client.Issue.Update(owner, oldRepoName, issue.Number, update); } } diff --git a/Octokit.Tests/Clients/SearchClientTests.cs b/Octokit.Tests/Clients/SearchClientTests.cs index ba79d5ea..4d5125d5 100644 --- a/Octokit.Tests/Clients/SearchClientTests.cs +++ b/Octokit.Tests/Clients/SearchClientTests.cs @@ -902,7 +902,7 @@ namespace Octokit.Tests.Clients var connection = Substitute.For(); var client = new SearchClient(connection); var request = new SearchIssuesRequest("something"); - request.State = ItemStateFilter.Open; + request.State = ItemState.Open; client.SearchIssues(request); @@ -917,7 +917,7 @@ namespace Octokit.Tests.Clients var connection = Substitute.For(); var client = new SearchClient(connection); var request = new SearchIssuesRequest("something"); - request.State = ItemStateFilter.Closed; + request.State = ItemState.Closed; client.SearchIssues(request); diff --git a/Octokit.Tests/Models/MilestoneRequestTests.cs b/Octokit.Tests/Models/MilestoneRequestTests.cs index d489d6c9..6964e761 100644 --- a/Octokit.Tests/Models/MilestoneRequestTests.cs +++ b/Octokit.Tests/Models/MilestoneRequestTests.cs @@ -10,7 +10,7 @@ public class MilestoneRequestTests { var request = new MilestoneRequest { - State = ItemState.Closed, + State = ItemStateFilter.Closed, SortProperty = MilestoneSort.Completeness, SortDirection = SortDirection.Descending, }; diff --git a/Octokit.Tests/Models/PullRequestRequestTests.cs b/Octokit.Tests/Models/PullRequestRequestTests.cs index 51fb7714..1c1810e6 100644 --- a/Octokit.Tests/Models/PullRequestRequestTests.cs +++ b/Octokit.Tests/Models/PullRequestRequestTests.cs @@ -10,7 +10,7 @@ public class PullRequestRequestTests { var request = new PullRequestRequest { - State = ItemState.Closed, + State = ItemStateFilter.Closed, Head = "user:ref-name", Base = "fake_base_branch" }; diff --git a/Octokit/Models/Request/IssueRequest.cs b/Octokit/Models/Request/IssueRequest.cs index e5d312aa..977740b0 100644 --- a/Octokit/Models/Request/IssueRequest.cs +++ b/Octokit/Models/Request/IssueRequest.cs @@ -33,7 +33,7 @@ namespace Octokit public IssueFilter Filter { get; set; } /// - /// Gets or sets the for the issues to return. + /// Gets or sets the for the issues to return. /// /// /// The state. diff --git a/Octokit/Models/Request/IssueUpdate.cs b/Octokit/Models/Request/IssueUpdate.cs index 89d18621..8d6b44bc 100644 --- a/Octokit/Models/Request/IssueUpdate.cs +++ b/Octokit/Models/Request/IssueUpdate.cs @@ -52,7 +52,7 @@ namespace Octokit /// /// Whether the issue is open or closed. /// - public ItemStateFilter? State { get; set; } + public ItemState? State { get; set; } internal string DebuggerDisplay { diff --git a/Octokit/Models/Request/MilestoneRequest.cs b/Octokit/Models/Request/MilestoneRequest.cs index c39a014a..bc181509 100644 --- a/Octokit/Models/Request/MilestoneRequest.cs +++ b/Octokit/Models/Request/MilestoneRequest.cs @@ -13,12 +13,12 @@ namespace Octokit { public MilestoneRequest() { - State = ItemState.Open; + State = ItemStateFilter.Open; SortProperty = MilestoneSort.DueDate; SortDirection = SortDirection.Ascending; } - public ItemState State { get; set; } + public ItemStateFilter State { get; set; } [Parameter(Key = "sort")] public MilestoneSort SortProperty { get; set; } diff --git a/Octokit/Models/Request/MilestoneUpdate.cs b/Octokit/Models/Request/MilestoneUpdate.cs index 36002d59..80fac3b1 100644 --- a/Octokit/Models/Request/MilestoneUpdate.cs +++ b/Octokit/Models/Request/MilestoneUpdate.cs @@ -18,7 +18,7 @@ namespace Octokit /// /// Whether the milestone is open or closed. The default is . /// - public ItemStateFilter? State { get; set; } + public ItemState? State { get; set; } /// /// Optional description for the milestone. diff --git a/Octokit/Models/Request/NewMilestone.cs b/Octokit/Models/Request/NewMilestone.cs index 34128a3c..4817fa3a 100644 --- a/Octokit/Models/Request/NewMilestone.cs +++ b/Octokit/Models/Request/NewMilestone.cs @@ -19,7 +19,7 @@ namespace Octokit Ensure.ArgumentNotNull(title, "title"); Title = title; - State = ItemStateFilter.Open; + State = ItemState.Open; } /// @@ -30,7 +30,7 @@ namespace Octokit /// /// Whether the milestone is open or closed. The default is . /// - public ItemStateFilter State { get; set; } + public ItemState State { get; set; } /// /// Optional description for the milestone. diff --git a/Octokit/Models/Request/PullRequestRequest.cs b/Octokit/Models/Request/PullRequestRequest.cs index b5a28250..e8d2e2fb 100644 --- a/Octokit/Models/Request/PullRequestRequest.cs +++ b/Octokit/Models/Request/PullRequestRequest.cs @@ -13,15 +13,15 @@ namespace Octokit { public PullRequestRequest() { - State = ItemState.Open; + State = ItemStateFilter.Open; SortProperty = PullRequestSort.Created; SortDirection = SortDirection.Descending; } /// - /// "open" or "closed" to filter by state. Default is "open". + /// "open" , "closed" or "All" to filter by state. Default is "open". /// - public ItemState State { get; set; } + public ItemStateFilter State { get; set; } /// /// Filter pulls by head user and branch name in the format of "user:ref-name". diff --git a/Octokit/Models/Request/PullRequestUpdate.cs b/Octokit/Models/Request/PullRequestUpdate.cs index e28b6cc9..32400553 100644 --- a/Octokit/Models/Request/PullRequestUpdate.cs +++ b/Octokit/Models/Request/PullRequestUpdate.cs @@ -16,9 +16,9 @@ namespace Octokit public string Title { get; set; } /// - /// Whether the pull request is open or closed. The default is . + /// Whether the pull request is open or closed. The default is . /// - public ItemStateFilter? State { get; set; } + public ItemState? State { get; set; } /// /// The body for the pull request. Supports GFM. diff --git a/Octokit/Models/Request/SearchIssuesRequest.cs b/Octokit/Models/Request/SearchIssuesRequest.cs index f5f589d1..77057c2f 100644 --- a/Octokit/Models/Request/SearchIssuesRequest.cs +++ b/Octokit/Models/Request/SearchIssuesRequest.cs @@ -132,7 +132,7 @@ namespace Octokit /// /// https://help.github.com/articles/searching-issues#state /// - public ItemStateFilter? State { get; set; } + public ItemState? State { get; set; } private IEnumerable _labels; /// diff --git a/Octokit/Models/Response/Issue.cs b/Octokit/Models/Response/Issue.cs index 9905e8bd..55c5edd3 100644 --- a/Octokit/Models/Response/Issue.cs +++ b/Octokit/Models/Response/Issue.cs @@ -154,7 +154,7 @@ namespace Octokit Assignee = assignee, Body = Body, Milestone = milestoneId, - State = FilteredState, + State = State, Title = Title }; From 786b8e15cf144c1d8c621db9f02b54e51d07f7bb Mon Sep 17 00:00:00 2001 From: Prayank Mathur Date: Mon, 14 Mar 2016 23:35:25 +0530 Subject: [PATCH 09/15] Added enum ItemStateFilter to differentiate between search and list APIs --- Octokit/Models/Response/Issue.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Octokit/Models/Response/Issue.cs b/Octokit/Models/Response/Issue.cs index 55c5edd3..b4371411 100644 --- a/Octokit/Models/Response/Issue.cs +++ b/Octokit/Models/Response/Issue.cs @@ -161,4 +161,4 @@ namespace Octokit return issueUpdate; } } -} +} \ No newline at end of file From 57f3e0a2b2028a49e6a053476a41f7c88712f24b Mon Sep 17 00:00:00 2001 From: Prayank Mathur Date: Tue, 15 Mar 2016 03:33:25 +0530 Subject: [PATCH 10/15] tidying up --- Octokit/Models/Request/IssueRequest.cs | 11 ++++++----- Octokit/Models/Request/MilestoneRequest.cs | 3 +++ Octokit/Models/Request/PullRequestRequest.cs | 2 +- Octokit/Models/Response/Issue.cs | 10 ++-------- 4 files changed, 12 insertions(+), 14 deletions(-) diff --git a/Octokit/Models/Request/IssueRequest.cs b/Octokit/Models/Request/IssueRequest.cs index 977740b0..eeb56bb3 100644 --- a/Octokit/Models/Request/IssueRequest.cs +++ b/Octokit/Models/Request/IssueRequest.cs @@ -126,22 +126,23 @@ namespace Octokit public enum ItemStateFilter { /// - /// Issues that are open (default). + /// Items that are open. /// Open, /// - /// Issues that are closed. + /// Items that are closed. /// Closed, /// - /// All the issues. + /// All the items. /// All } + /// - /// Range of States + /// Items that are open OR closed /// public enum ItemState { @@ -158,7 +159,7 @@ namespace Octokit /// /// All the issues. The option is Obsolete /// - [Obsolete("The method is Obsolete. Dont specify the state in case of all queries")] + [Obsolete("The value is Obsolete and will be removed in a future release as it is not a valid option")] All } diff --git a/Octokit/Models/Request/MilestoneRequest.cs b/Octokit/Models/Request/MilestoneRequest.cs index bc181509..2dcdf7ac 100644 --- a/Octokit/Models/Request/MilestoneRequest.cs +++ b/Octokit/Models/Request/MilestoneRequest.cs @@ -18,6 +18,9 @@ namespace Octokit SortDirection = SortDirection.Ascending; } + /// + /// Which Milestones to get. The default is . + /// public ItemStateFilter State { get; set; } [Parameter(Key = "sort")] diff --git a/Octokit/Models/Request/PullRequestRequest.cs b/Octokit/Models/Request/PullRequestRequest.cs index e8d2e2fb..38465509 100644 --- a/Octokit/Models/Request/PullRequestRequest.cs +++ b/Octokit/Models/Request/PullRequestRequest.cs @@ -19,7 +19,7 @@ namespace Octokit } /// - /// "open" , "closed" or "All" to filter by state. Default is "open". + /// "open", "closed" or "all" to filter by state. Default is "open". /// public ItemStateFilter State { get; set; } diff --git a/Octokit/Models/Response/Issue.cs b/Octokit/Models/Response/Issue.cs index b4371411..f61d8a09 100644 --- a/Octokit/Models/Response/Issue.cs +++ b/Octokit/Models/Response/Issue.cs @@ -10,7 +10,7 @@ namespace Octokit { public Issue() { } - public Issue(Uri url, Uri htmlUrl, Uri commentsUrl, Uri eventsUrl, int number, ItemState state , ItemStateFilter filteredState, string title, string body, User user, IReadOnlyList