Merge remote-tracking branch 'octokit/master' into disposable-reposit…

…ories

Conflicts:
	Octokit.Tests.Integration/Clients/DeploymentStatusClientTests.cs
	Octokit.Tests.Integration/Clients/DeploymentsClientTests.cs
	Octokit.Tests.Integration/Clients/PullRequestsClientTests.cs

Octokit.Tests.Integration/Clients/DeploymentStatusClientTests.cs

@@ -9,7 +9,6 @@ public class DeploymentStatusClientTests : IDisposable
 {
     private readonly IDeploymentsClient _deploymentsClient;
     private readonly RepositoryContext _context;
-    private readonly Commit _commit;
     private readonly Deployment _deployment;
 
     public DeploymentStatusClientTests()
@@ -38,16 +37,17 @@ public DeploymentStatusClientTests()
 
         var treeResult = github.GitDatabase.Tree.Create(_context.RepositoryOwner, _context.RepositoryName, newTree).Result;
         var newCommit = new NewCommit("test-commit", treeResult.Sha);
-        _commit = github.GitDatabase.Commit.Create(_context.RepositoryOwner, _context.RepositoryName, newCommit).Result;
+
+        var commit = github.GitDatabase.Commit.Create(_context.RepositoryOwner, _context.RepositoryName, newCommit).Result;
 
-        var newDeployment = new NewDeployment { Ref = _commit.Sha, AutoMerge = false };
-        _deployment = _deploymentsClient.Create(_context.RepositoryOwner, _context.RepositoryName, newDeployment).Result;
+        var newDeployment = new NewDeployment(commit.Sha) { AutoMerge = false };
+         _deployment = _deploymentsClient.Create(_context.RepositoryOwner, _context.RepositoryName, newDeployment).Result;
     }
 
     [IntegrationTest]
     public async Task CanCreateDeploymentStatus()
     {
-        var newStatus = new NewDeploymentStatus { State = DeploymentState.Success };
+        var newStatus = new NewDeploymentStatus(DeploymentState.Success);
 
         var status = await _deploymentsClient.Status.Create(_context.RepositoryOwner, _context.RepositoryName, _deployment.Id, newStatus);
 
@@ -58,7 +58,7 @@ public async Task CanCreateDeploymentStatus()
     [IntegrationTest]
     public async Task CanReadDeploymentStatuses()
     {
-        var newStatus = new NewDeploymentStatus { State = DeploymentState.Success };
+        var newStatus = new NewDeploymentStatus(DeploymentState.Success);
         await _deploymentsClient.Status.Create(_context.RepositoryOwner, _context.RepositoryName, _deployment.Id, newStatus);
 
         var statuses = await _deploymentsClient.Status.GetAll(_context.RepositoryOwner, _context.RepositoryName, _deployment.Id);

Octokit.Tests.Integration/Clients/DeploymentsClientTests.cs

@@ -43,7 +43,7 @@ public DeploymentsClientTests()
     [IntegrationTest]
     public async Task CanCreateDeployment()
     {
-        var newDeployment = new NewDeployment { Ref = _commit.Sha, AutoMerge = false };
+        var newDeployment = new NewDeployment(_commit.Sha) { AutoMerge = false };
 
         var deployment = await _deploymentsClient.Create(_context.RepositoryOwner, _context.RepositoryName, newDeployment);
 
@@ -53,7 +53,7 @@ public async Task CanCreateDeployment()
     [IntegrationTest]
     public async Task CanGetDeployments()
     {
-        var newDeployment = new NewDeployment { Ref = _commit.Sha, AutoMerge = false };
+        var newDeployment = new NewDeployment(_commit.Sha) { AutoMerge = false };
         await _deploymentsClient.Create(_context.RepositoryOwner, _context.RepositoryName, newDeployment);
 
         var deployments = await _deploymentsClient.GetAll(_context.RepositoryOwner, _context.RepositoryName);

Octokit.Tests.Integration/Clients/PullRequestsClientTests.cs

@@ -193,7 +193,7 @@ public async Task CanBeMerged()
         var newPullRequest = new NewPullRequest("a pull request", branchName, "master");
         var pullRequest = await _fixture.Create(Helper.UserName, _context.RepositoryName, newPullRequest);
 
-        var merge = new MergePullRequest { Message = "thing the thing" };
+        var merge = new MergePullRequest { CommitMessage = "thing the thing" };
         var result = await _fixture.Merge(Helper.UserName, _context.RepositoryName, pullRequest.Number, merge);
 
         Assert.True(result.Merged);
@@ -220,7 +220,7 @@ public async Task CanBeMergedWithShaSpecified()
         var newPullRequest = new NewPullRequest("a pull request", branchName, "master");
         var pullRequest = await _fixture.Create(Helper.UserName, _context.RepositoryName, newPullRequest);
 
-        var merge = new MergePullRequest { Message = "thing the thing", Sha = pullRequest.Head.Sha };
+        var merge = new MergePullRequest { CommitMessage = "thing the thing", Sha = pullRequest.Head.Sha };
         var result = await _fixture.Merge(Helper.UserName, _context.RepositoryName, pullRequest.Number, merge);
 
         Assert.True(result.Merged);
@@ -249,7 +249,7 @@ public async Task UpdatesMaster()
         var newPullRequest = new NewPullRequest("a pull request", branchName, "master");
         var pullRequest = await _fixture.Create(Helper.UserName, _context.RepositoryName, newPullRequest);
 
-        var merge = new MergePullRequest { Message = "thing the thing" };
+        var merge = new MergePullRequest { CommitMessage = "thing the thing" };
         var result = await _fixture.Merge(Helper.UserName, _context.RepositoryName, pullRequest.Number, merge);
 
         var master = await _github.GitDatabase.Reference.Get(Helper.UserName, _context.RepositoryName, "heads/master");

Octokit.Tests.Integration/Clients/TeamsClientTests.cs

@@ -72,7 +72,8 @@ public async Task FailsWhenAuthenticatedWithBadCredentials()
         {
             var github = Helper.GetBadCredentialsClient();
 
-            var e = await Assert.ThrowsAsync<AuthorizationException>(() => github.Organization.Team.IsMember(team.Id, Helper.UserName));
+            var e = await Assert.ThrowsAsync<AuthorizationException>(
+                () => github.Organization.Team.GetMembership(team.Id, Helper.UserName));
             Assert.Equal(HttpStatusCode.Unauthorized, e.StatusCode);
         }
 

Octokit.Tests/Clients/DeploymentStatusClientTests.cs

@@ -1,11 +1,8 @@
-using NSubstitute;
+using System;
+using System.Threading.Tasks;
+using NSubstitute;
 using Octokit;
-using Octokit.Tests.Helpers;
-using System;
-using System.Collections.Generic;
 using Xunit;
-using Xunit.Extensions;
-using System.Threading.Tasks;
 
 public class DeploymentStatusClientTests
 {
@@ -57,7 +54,7 @@ public void RequestsCorrectUrl()
 
     public class TheCreateMethod
     {
-        readonly NewDeploymentStatus newDeploymentStatus = new NewDeploymentStatus();
+        readonly NewDeploymentStatus newDeploymentStatus = new NewDeploymentStatus(DeploymentState.Success);
 
         [Fact]
         public async Task EnsuresNonNullArguments()

Octokit.Tests/Clients/DeploymentsClientTests.cs

@@ -1,11 +1,8 @@
-using System.Threading.Tasks;
+using System;
+using System.Threading.Tasks;
 using NSubstitute;
 using Octokit;
-using Octokit.Tests.Helpers;
-using System;
-using System.Collections.Generic;
 using Xunit;
-using Xunit.Extensions;
 
 public class DeploymentsClientTests
 {
@@ -57,7 +54,7 @@ public void RequestsCorrectUrl()
 
     public class TheCreateMethod
     {
-        readonly NewDeployment newDeployment = new NewDeployment { Ref = "aRef" };
+        readonly NewDeployment newDeployment = new NewDeployment("aRef");
 
         [Fact]
         public async Task EnsuresNonNullArguments()

Octokit.Tests/Clients/PullRequestsClientTests.cs

@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using NSubstitute;
-using Octokit.Tests.Helpers;
 using Xunit;
 
 namespace Octokit.Tests.Clients
@@ -140,7 +139,7 @@ public class TheMergeMethod
             [Fact]
             public void PutsToCorrectUrl()
             {
-                var mergePullRequest = new MergePullRequest { Message = "fake commit message" };
+                var mergePullRequest = new MergePullRequest { CommitMessage = "fake commit message" };
                 var connection = Substitute.For<IApiConnection>();
                 var client = new PullRequestsClient(connection);
 
@@ -157,9 +156,9 @@ public async Task EnsuresArgumentsNotNull()
                 var client = new PullRequestsClient(connection);
 
                 await Assert.ThrowsAsync<ArgumentNullException>(() =>
-                    client.Merge(null, "name", 42, new MergePullRequest { Message = "message" }));
+                    client.Merge(null, "name", 42, new MergePullRequest { CommitMessage = "message" }));
                 await Assert.ThrowsAsync<ArgumentNullException>(() =>
-                    client.Merge("owner", null, 42, new MergePullRequest { Message = "message" }));
+                    client.Merge("owner", null, 42, new MergePullRequest { CommitMessage = "message" }));
                 await Assert.ThrowsAsync<ArgumentNullException>(() =>
                     client.Merge("owner", "name", 42, null));
             }

Octokit.Tests/Reactive/ObservableDeploymentStatusClientTests.cs

@@ -7,7 +7,6 @@
 using System.Threading.Tasks;
 using Xunit;
 
-
 namespace Octokit.Tests.Reactive
 {
     public class ObservableDeploymentStatusClientTests
@@ -62,7 +61,7 @@ public void GetsFromCorrectUrl()
 
         public class TheCreateMethod
         {
-            IGitHubClient _githubClient = Substitute.For<IGitHubClient>();
+            readonly IGitHubClient _githubClient = Substitute.For<IGitHubClient>();
             ObservableDeploymentStatusClient _client;
 
             public void SetupWithoutNonReactiveClient()
@@ -81,35 +80,35 @@ public void SetupWithNonReactiveClient()
             public async Task EnsuresNonNullArguments()
             {
                 SetupWithNonReactiveClient();
-                Assert.Throws<ArgumentNullException>(() => _client.Create(null, "repo", 1, new NewDeploymentStatus()));
-                Assert.Throws<ArgumentNullException>(() => _client.Create("owner", null, 1, new NewDeploymentStatus()));
+                Assert.Throws<ArgumentNullException>(() => _client.Create(null, "repo", 1, new NewDeploymentStatus(DeploymentState.Success)));
+                Assert.Throws<ArgumentNullException>(() => _client.Create("owner", null, 1, new NewDeploymentStatus(DeploymentState.Success)));
                 Assert.Throws<ArgumentNullException>(() => _client.Create("owner", "repo", 1, null));
             }
 
             [Fact]
             public async Task EnsuresNonEmptyArguments()
             {
                 SetupWithNonReactiveClient();
-                Assert.Throws<ArgumentException>(() => _client.Create("", "repo", 1, new NewDeploymentStatus()));
-                Assert.Throws<ArgumentException>(() => _client.Create("owner", "", 1, new NewDeploymentStatus()));
+                Assert.Throws<ArgumentException>(() => _client.Create("", "repo", 1, new NewDeploymentStatus(DeploymentState.Success)));
+                Assert.Throws<ArgumentException>(() => _client.Create("owner", "", 1, new NewDeploymentStatus(DeploymentState.Success)));
             }
 
             [Fact]
             public async Task EnsureNonWhitespaceArguments()
             {
                 SetupWithNonReactiveClient();
                 await AssertEx.ThrowsWhenGivenWhitespaceArgument(
-                    async whitespace => await _client.Create(whitespace, "repo", 1, new NewDeploymentStatus()));
+                    async whitespace => await _client.Create(whitespace, "repo", 1, new NewDeploymentStatus(DeploymentState.Success)));
                 await AssertEx.ThrowsWhenGivenWhitespaceArgument(
-                    async whitespace => await _client.Create("owner", whitespace, 1, new NewDeploymentStatus()));
+                    async whitespace => await _client.Create("owner", whitespace, 1, new NewDeploymentStatus(DeploymentState.Success)));
             }
 
             [Fact]
             public void CallsIntoDeploymentStatusClient()
             {
                 SetupWithoutNonReactiveClient();
 
-                var newStatus = new NewDeploymentStatus();
+                var newStatus = new NewDeploymentStatus(DeploymentState.Success);
                 _client.Create("owner", "repo", 1, newStatus);
                 _githubClient.Repository.Deployment.Status.Received(1)
                     .Create(Arg.Is("owner"),

Octokit.Tests/Reactive/ObservableDeploymentsClientTests.cs

@@ -1,12 +1,11 @@
-using NSubstitute;
-using Octokit.Reactive.Clients;
-using Octokit.Tests.Helpers;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Reactive.Linq;
 using System.Threading.Tasks;
+using NSubstitute;
+using Octokit.Reactive.Clients;
+using Octokit.Tests.Helpers;
 using Xunit;
-using System.Linq;
 
 namespace Octokit.Tests.Reactive
 {
@@ -86,8 +85,8 @@ public void EnsuresNonNullArguments()
             {
                 SetupWithNonReactiveClient();
 
-                Assert.Throws<ArgumentNullException>(() => _client.Create(null, "repo", new NewDeployment()));
-                Assert.Throws<ArgumentNullException>(() => _client.Create("owner", null, new NewDeployment()));
+                Assert.Throws<ArgumentNullException>(() => _client.Create(null, "repo", new NewDeployment("ref")));
+                Assert.Throws<ArgumentNullException>(() => _client.Create("owner", null, new NewDeployment("ref")));
                 Assert.Throws<ArgumentNullException>(() => _client.Create("owner", "repo", null));
             }
 
@@ -96,8 +95,8 @@ public void EnsuresNonEmptyArguments()
             {
                 SetupWithNonReactiveClient();
 
-                Assert.Throws<ArgumentException>(() => _client.Create("", "repo", new NewDeployment()));
-                Assert.Throws<ArgumentException>(() => _client.Create("owner", "", new NewDeployment()));
+                Assert.Throws<ArgumentException>(() => _client.Create("", "repo", new NewDeployment("ref")));
+                Assert.Throws<ArgumentException>(() => _client.Create("owner", "", new NewDeployment("ref")));
             }
 
             [Fact]
@@ -106,17 +105,17 @@ public async Task EnsuresNonWhitespaceArguments()
                 SetupWithNonReactiveClient();
 
                 await AssertEx.ThrowsWhenGivenWhitespaceArgument(
-                    async whitespace => await _client.Create(whitespace, "repo", new NewDeployment()));
+                    async whitespace => await _client.Create(whitespace, "repo", new NewDeployment("ref")));
                 await AssertEx.ThrowsWhenGivenWhitespaceArgument(
-                    async whitespace => await _client.Create("owner", whitespace, new NewDeployment()));
+                    async whitespace => await _client.Create("owner", whitespace, new NewDeployment("ref")));
             }
 
             [Fact]
             public void CallsCreateOnRegularDeploymentsClient()
             {
                 SetupWithoutNonReactiveClient();
 
-                var newDeployment = new NewDeployment();
+                var newDeployment = new NewDeployment("ref");
                 _client.Create("owner", "repo", newDeployment);
                 _githubClient.Repository.Deployment.Received(1).Create(Arg.Is("owner"),
                                                             Arg.Is("repo"),

Octokit.Tests/Reactive/ObservablePullRequestsClientTests.cs

@@ -225,7 +225,7 @@ public class TheMergeMethod
             [Fact]
             public void MergesPullRequest()
             {
-                var mergePullRequest = new MergePullRequest { Message = "fake commit message" };
+                var mergePullRequest = new MergePullRequest { CommitMessage = "fake commit message" };
                 var gitHubClient = Substitute.For<IGitHubClient>();
                 var client = new ObservablePullRequestsClient(gitHubClient);
 
@@ -241,9 +241,9 @@ public async Task EnsuresArgumentsNotNull()
                 var client = new PullRequestsClient(connection);
 
                 await Assert.ThrowsAsync<ArgumentNullException>(() =>
-                    client.Merge(null, "name", 42, new MergePullRequest { Message = "message" }));
+                    client.Merge(null, "name", 42, new MergePullRequest { CommitMessage = "message" }));
                 await Assert.ThrowsAsync<ArgumentNullException>(() =>
-                    client.Merge("owner", null, 42, new MergePullRequest { Message = "message" }));
+                    client.Merge("owner", null, 42, new MergePullRequest { CommitMessage = "message" }));
                 await Assert.ThrowsAsync<ArgumentNullException>(() =>
                     client.Merge("owner", "name", 42, null));
             }

Octokit/Clients/MergingClient.cs

@@ -10,6 +10,10 @@ namespace Octokit
     /// </remarks>
     public class MergingClient : ApiClient, IMergingClient
     {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="MergingClient"/> class.
+        /// </summary>
+        /// <param name="apiConnection">The client's connection</param>
         public MergingClient(IApiConnection apiConnection) : base(apiConnection)
         {
         }

Octokit/Models/Request/BaseSearchRequest.cs

@@ -11,13 +11,20 @@ namespace Octokit
     [SuppressMessage("Microsoft.Design", "CA1012:AbstractTypesShouldNotHaveConstructors")]
     public abstract class BaseSearchRequest
     {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="BaseSearchRequest"/> class.
+        /// </summary>
         protected BaseSearchRequest()
         {
             Page = 1;
             PerPage = 100;
             Order = SortDirection.Descending;
         }
 
+        /// <summary>
+        /// Initializes a new instance of the <see cref="BaseSearchRequest"/> class.
+        /// </summary>
+        /// <param name="term">The term.</param>
         protected BaseSearchRequest(string term) : this()
         {
             Ensure.ArgumentNotNullOrEmptyString(term, "term");
@@ -37,6 +44,12 @@ public abstract string Sort
             get;
         }
 
+        /// <summary>
+        /// Gets the sort order as a properly formatted lowercased query string parameter.
+        /// </summary>
+        /// <value>
+        /// The sort order.
+        /// </value>
         private string SortOrder
         {
             get

Octokit/Models/Request/BodyWrapper.cs

@@ -1,12 +1,25 @@
 namespace Octokit
 {
+    /// <summary>
+    /// Wraps a string for the body of a request.
+    /// </summary>
     public class BodyWrapper
     {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="BodyWrapper"/> class.
+        /// </summary>
+        /// <param name="body">The body.</param>
         public BodyWrapper(string body)
         {
             Body = body;
         }
 
+        /// <summary>
+        /// Gets the body.
+        /// </summary>
+        /// <value>
+        /// The body.
+        /// </value>
         public string Body { get; private set; } 
     }
 }

Octokit/Models/Request/CommitRequest.cs

@@ -4,6 +4,9 @@
 
 namespace Octokit
 {
+    /// <summary>
+    /// Encapsulates the parameters for a request to retrieve commits.
+    /// </summary>
     [DebuggerDisplay("{DebuggerDisplay,nq}")]
     public class CommitRequest : RequestParameters
     {