From cb3a409d8729e7e9a9abec1259c030049ecb9203 Mon Sep 17 00:00:00 2001 From: Jiaming Chen Date: Sat, 10 Oct 2015 11:26:10 -0700 Subject: [PATCH] removed merged property for PR. also removed related tests for that property. --- .../Clients/PullRequestsClientTests.cs | 2 -- Octokit/Models/Response/PullRequest.cs | 8 +------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/Octokit.Tests.Integration/Clients/PullRequestsClientTests.cs b/Octokit.Tests.Integration/Clients/PullRequestsClientTests.cs index a5d17a88..8c271f0d 100644 --- a/Octokit.Tests.Integration/Clients/PullRequestsClientTests.cs +++ b/Octokit.Tests.Integration/Clients/PullRequestsClientTests.cs @@ -35,9 +35,7 @@ public class PullRequestsClientTests : IDisposable var newPullRequest = new NewPullRequest("a pull request", branchName, "master"); var result = await _fixture.Create(Helper.UserName, _context.RepositoryName, newPullRequest); - Assert.Equal("a pull request", result.Title); - Assert.False(result.Merged); } [IntegrationTest] diff --git a/Octokit/Models/Response/PullRequest.cs b/Octokit/Models/Response/PullRequest.cs index a858351f..e5b507a3 100644 --- a/Octokit/Models/Response/PullRequest.cs +++ b/Octokit/Models/Response/PullRequest.cs @@ -14,7 +14,7 @@ namespace Octokit Number = number; } - public PullRequest(Uri url, Uri htmlUrl, Uri diffUrl, Uri patchUrl, Uri issueUrl, Uri statusesUrl, int number, ItemState state, string title, string body, DateTimeOffset createdAt, DateTimeOffset updatedAt, DateTimeOffset? closedAt, DateTimeOffset? mergedAt, GitReference head, GitReference @base, User user, User assignee, string mergeCommitSha, bool merged, bool? mergeable, User mergedBy, int comments, int commits, int additions, int deletions, int changedFiles) + public PullRequest(Uri url, Uri htmlUrl, Uri diffUrl, Uri patchUrl, Uri issueUrl, Uri statusesUrl, int number, ItemState state, string title, string body, DateTimeOffset createdAt, DateTimeOffset updatedAt, DateTimeOffset? closedAt, DateTimeOffset? mergedAt, GitReference head, GitReference @base, User user, User assignee, string mergeCommitSha, bool? mergeable, User mergedBy, int comments, int commits, int additions, int deletions, int changedFiles) { Url = url; HtmlUrl = htmlUrl; @@ -35,7 +35,6 @@ namespace Octokit User = user; Assignee = assignee; MergeCommitSha = mergeCommitSha; - Merged = merged || MergedAt.HasValue; Mergeable = mergeable; MergedBy = mergedBy; Comments = comments; @@ -140,11 +139,6 @@ namespace Octokit /// public string MergeCommitSha { get; protected set; } - /// - /// Whether or not the pull request has been merged. - /// - public bool Merged { get; protected set; } - /// /// Whether or not the pull request can be merged. ///