diff --git a/Octokit.Reactive/Clients/IObservableOrganizationMembersClient.cs b/Octokit.Reactive/Clients/IObservableOrganizationMembersClient.cs index 4d020170..a775e5f0 100644 --- a/Octokit.Reactive/Clients/IObservableOrganizationMembersClient.cs +++ b/Octokit.Reactive/Clients/IObservableOrganizationMembersClient.cs @@ -273,7 +273,7 @@ namespace Octokit.Reactive /// The login for the user /// IObservable Conceal(string org, string user); - + /// /// Get a user's membership with an organization. /// diff --git a/Octokit.Reactive/Clients/IObservableRepoCollaboratorsClient.cs b/Octokit.Reactive/Clients/IObservableRepoCollaboratorsClient.cs index 6618e159..be9e5a36 100644 --- a/Octokit.Reactive/Clients/IObservableRepoCollaboratorsClient.cs +++ b/Octokit.Reactive/Clients/IObservableRepoCollaboratorsClient.cs @@ -54,7 +54,7 @@ namespace Octokit.Reactive /// Options for changing the API response /// Thrown when a general API error occurs. IObservable GetAll(long repositoryId, ApiOptions options); - + /// /// Gets all the collaborators on a repository. /// @@ -77,7 +77,7 @@ namespace Octokit.Reactive /// Used to request and filter a list of repository collaborators /// Thrown when a general API error occurs. IObservable GetAll(long repositoryId, RepositoryCollaboratorListRequest request); - + /// /// Gets all the collaborators on a repository. /// @@ -90,7 +90,7 @@ namespace Octokit.Reactive /// Options for changing the API response /// Thrown when a general API error occurs. IObservable GetAll(string owner, string name, RepositoryCollaboratorListRequest request, ApiOptions options); - + /// /// Gets all the collaborators on a repository. /// diff --git a/Octokit.Reactive/Clients/ObservableRepoCollaboratorsClient.cs b/Octokit.Reactive/Clients/ObservableRepoCollaboratorsClient.cs index c81c4f89..e19666a4 100644 --- a/Octokit.Reactive/Clients/ObservableRepoCollaboratorsClient.cs +++ b/Octokit.Reactive/Clients/ObservableRepoCollaboratorsClient.cs @@ -89,7 +89,7 @@ namespace Octokit.Reactive public IObservable GetAll(long repositoryId, ApiOptions options) { Ensure.ArgumentNotNull(options, nameof(options)); - + return GetAll(repositoryId, new RepositoryCollaboratorListRequest(), options); } @@ -108,7 +108,7 @@ namespace Octokit.Reactive Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner)); Ensure.ArgumentNotNullOrEmptyString(name, nameof(name)); Ensure.ArgumentNotNull(request, nameof(request)); - + return GetAll(owner, name, request, ApiOptions.None); } @@ -124,7 +124,7 @@ namespace Octokit.Reactive public IObservable GetAll(long repositoryId, RepositoryCollaboratorListRequest request) { Ensure.ArgumentNotNull(request, nameof(request)); - + return GetAll(repositoryId, request, ApiOptions.None); } diff --git a/Octokit.Reactive/Octokit.Reactive.csproj b/Octokit.Reactive/Octokit.Reactive.csproj index 2ae406d3..a3f7eec1 100644 --- a/Octokit.Reactive/Octokit.Reactive.csproj +++ b/Octokit.Reactive/Octokit.Reactive.csproj @@ -15,6 +15,7 @@ https://github.com/octokit/octokit.net https://github.com/octokit/octokit.net https://f.cloud.github.com/assets/19977/1510987/64af2b26-4a9d-11e3-89fc-96a185171c75.png + octokit.png MIT GitHub API Octokit linqpad-samples dotnetcore Copyright GitHub 2017 @@ -41,6 +42,10 @@ + + + + diff --git a/Octokit.Reactive/images/octokit.png b/Octokit.Reactive/images/octokit.png new file mode 100644 index 00000000..2efc9cfc Binary files /dev/null and b/Octokit.Reactive/images/octokit.png differ diff --git a/Octokit.Tests.Integration/Clients/OrganizationMembersClientTests.cs b/Octokit.Tests.Integration/Clients/OrganizationMembersClientTests.cs index a93aa377..a86793f3 100644 --- a/Octokit.Tests.Integration/Clients/OrganizationMembersClientTests.cs +++ b/Octokit.Tests.Integration/Clients/OrganizationMembersClientTests.cs @@ -136,14 +136,14 @@ namespace Octokit.Tests.Integration.Clients using (var teamContext = await _gitHub.CreateTeamContext(Helper.Organization, new NewTeam(Helper.MakeNameWithTimestamp("team")))) { teamContext.InviteMember("alfhenrik-test-2"); - + var organizationMemberhip = await _gitHub.Organization.Member.GetOrganizationMembership(Helper.Organization, "alfhenrik-test-2"); Assert.Equal(MembershipState.Pending, organizationMemberhip.State); Assert.Equal(MembershipRole.Member, organizationMemberhip.Role); } } } - + public class TheAddOrUpdateOrganizationMembershipMethod { readonly IGitHubClient _gitHub; @@ -165,7 +165,7 @@ namespace Octokit.Tests.Integration.Clients [OrganizationTest] public async Task ReturnsUsersPendingAdminOrganizationMembership() { - var organizationMembership = await _gitHub.Organization.Member.AddOrUpdateOrganizationMembership(Helper.Organization, "alfhenrik-test-2", new OrganizationMembershipUpdate { Role = MembershipRole.Admin}); + var organizationMembership = await _gitHub.Organization.Member.AddOrUpdateOrganizationMembership(Helper.Organization, "alfhenrik-test-2", new OrganizationMembershipUpdate { Role = MembershipRole.Admin }); Assert.Equal(MembershipState.Pending, organizationMembership.State); Assert.Equal(MembershipRole.Admin, organizationMembership.Role); await _gitHub.Organization.Member.RemoveOrganizationMembership(Helper.Organization, "alfhenrik-test-2"); @@ -175,12 +175,12 @@ namespace Octokit.Tests.Integration.Clients public class TheRemoveOrganizationMembershipMethod { readonly IGitHubClient _gitHub; - + public TheRemoveOrganizationMembershipMethod() { _gitHub = Helper.GetAuthenticatedClient(); } - + [OrganizationTest] public async Task RemovesOrganizationMembership() { diff --git a/Octokit.Tests.Integration/Reactive/ObservableOrganizationMembersClientTests.cs b/Octokit.Tests.Integration/Reactive/ObservableOrganizationMembersClientTests.cs index 71ec8400..6095584b 100644 --- a/Octokit.Tests.Integration/Reactive/ObservableOrganizationMembersClientTests.cs +++ b/Octokit.Tests.Integration/Reactive/ObservableOrganizationMembersClientTests.cs @@ -26,7 +26,7 @@ namespace Octokit.Tests.Integration.Reactive using (var teamContext = await _gitHub.CreateTeamContext(Helper.Organization, new NewTeam(Helper.MakeNameWithTimestamp("team")))) { teamContext.InviteMember("alfhenrik-test-2"); - + var organizationMemberhip = await _client.GetOrganizationMembership(Helper.Organization, "alfhenrik-test-2"); Assert.Equal(MembershipState.Pending, organizationMemberhip.State); Assert.Equal(MembershipRole.Member, organizationMemberhip.Role); @@ -34,7 +34,7 @@ namespace Octokit.Tests.Integration.Reactive } } } - + public class TheAddOrUpdateOrganizationMembershipMethod { readonly ObservableOrganizationMembersClient _client; @@ -56,7 +56,7 @@ namespace Octokit.Tests.Integration.Reactive [OrganizationTest] public async Task ReturnsUsersPendingAdminOrganizationMembership() { - var organizationMembership = await _client.AddOrUpdateOrganizationMembership(Helper.Organization, "alfhenrik-test-2", new OrganizationMembershipUpdate { Role = MembershipRole.Admin}); + var organizationMembership = await _client.AddOrUpdateOrganizationMembership(Helper.Organization, "alfhenrik-test-2", new OrganizationMembershipUpdate { Role = MembershipRole.Admin }); Assert.Equal(MembershipState.Pending, organizationMembership.State); Assert.Equal(MembershipRole.Admin, organizationMembership.Role); await _client.RemoveOrganizationMembership(Helper.Organization, "alfhenrik-test-2"); @@ -66,12 +66,12 @@ namespace Octokit.Tests.Integration.Reactive public class TheRemoveOrganizationMembershipMethod { readonly ObservableOrganizationMembersClient _client; - + public TheRemoveOrganizationMembershipMethod() { _client = new ObservableOrganizationMembersClient(Helper.GetAuthenticatedClient()); } - + [OrganizationTest] public async Task RemovesOrganizationMembership() { diff --git a/Octokit.Tests/Clients/OrganizationMembersClientTests.cs b/Octokit.Tests/Clients/OrganizationMembersClientTests.cs index 76a73101..d519c106 100644 --- a/Octokit.Tests/Clients/OrganizationMembersClientTests.cs +++ b/Octokit.Tests/Clients/OrganizationMembersClientTests.cs @@ -526,10 +526,10 @@ namespace Octokit.Tests.Clients public void PostsToTheCorrectUrl() { var orgMembershipUpdate = new OrganizationMembershipUpdate(); - + var connection = Substitute.For(); var client = new OrganizationMembersClient(connection); - + client.AddOrUpdateOrganizationMembership("org", "username", orgMembershipUpdate); connection.Received().Put(Arg.Is(u => u.ToString() == "orgs/org/memberships/username"), Arg.Any()); diff --git a/Octokit.Tests/Clients/RepoCollaboratorsClientTests.cs b/Octokit.Tests/Clients/RepoCollaboratorsClientTests.cs index 52ddb25b..a4e7a5c1 100644 --- a/Octokit.Tests/Clients/RepoCollaboratorsClientTests.cs +++ b/Octokit.Tests/Clients/RepoCollaboratorsClientTests.cs @@ -92,7 +92,7 @@ namespace Octokit.Tests.Clients Arg.Is>(d => d["affiliation"] == "all"), "application/vnd.github.hellcat-preview+json", Args.ApiOptions); - + request = new RepositoryCollaboratorListRequest { Affiliation = CollaboratorAffiliation.Direct @@ -105,7 +105,7 @@ namespace Octokit.Tests.Clients Arg.Is>(d => d["affiliation"] == "direct"), "application/vnd.github.hellcat-preview+json", Args.ApiOptions); - + request = new RepositoryCollaboratorListRequest { Affiliation = CollaboratorAffiliation.Outside @@ -150,7 +150,7 @@ namespace Octokit.Tests.Clients var client = new RepoCollaboratorsClient(connection); var request = new RepositoryCollaboratorListRequest(); - + client.GetAll(1, request); connection.Received() @@ -173,7 +173,7 @@ namespace Octokit.Tests.Clients Arg.Is>(d => d["affiliation"] == "direct"), "application/vnd.github.hellcat-preview+json", Args.ApiOptions); - + request = new RepositoryCollaboratorListRequest { Affiliation = CollaboratorAffiliation.Outside diff --git a/Octokit.Tests/Reactive/ObservableOrganizationMembersClientTests.cs b/Octokit.Tests/Reactive/ObservableOrganizationMembersClientTests.cs index 87fdaf9e..f64c1e87 100644 --- a/Octokit.Tests/Reactive/ObservableOrganizationMembersClientTests.cs +++ b/Octokit.Tests/Reactive/ObservableOrganizationMembersClientTests.cs @@ -339,7 +339,7 @@ namespace Octokit.Tests.Reactive public void PostsToTheCorrectUrl() { var orgMembershipUpdate = new OrganizationMembershipUpdate(); - + var gitHubClient = Substitute.For(); var client = new ObservableOrganizationMembersClient(gitHubClient); diff --git a/Octokit/Clients/IOrganizationMembersClient.cs b/Octokit/Clients/IOrganizationMembersClient.cs index 97b3e8da..cb33f5ae 100644 --- a/Octokit/Clients/IOrganizationMembersClient.cs +++ b/Octokit/Clients/IOrganizationMembersClient.cs @@ -279,7 +279,7 @@ namespace Octokit /// The login for the user /// Task Conceal(string org, string user); - + /// /// Get a user's membership with an organization. /// diff --git a/Octokit/Clients/IRepoCollaboratorsClient.cs b/Octokit/Clients/IRepoCollaboratorsClient.cs index b8f62f31..d117d414 100644 --- a/Octokit/Clients/IRepoCollaboratorsClient.cs +++ b/Octokit/Clients/IRepoCollaboratorsClient.cs @@ -54,7 +54,7 @@ namespace Octokit /// Options for changing the API response /// Thrown when a general API error occurs. Task> GetAll(long repositoryId, ApiOptions options); - + /// /// Gets all the collaborators on a repository. /// @@ -77,7 +77,7 @@ namespace Octokit /// Used to request and filter a list of repository collaborators /// Thrown when a general API error occurs. Task> GetAll(long repositoryId, RepositoryCollaboratorListRequest request); - + /// /// Gets all the collaborators on a repository. /// @@ -90,7 +90,7 @@ namespace Octokit /// Options for changing the API response /// Thrown when a general API error occurs. Task> GetAll(string owner, string name, RepositoryCollaboratorListRequest request, ApiOptions options); - + /// /// Gets all the collaborators on a repository. /// diff --git a/Octokit/Clients/OrganizationMembersClient.cs b/Octokit/Clients/OrganizationMembersClient.cs index 2f6e4cc1..8f13526e 100644 --- a/Octokit/Clients/OrganizationMembersClient.cs +++ b/Octokit/Clients/OrganizationMembersClient.cs @@ -36,7 +36,7 @@ namespace Octokit [Parameter(Value = "member")] Member } - + public enum MembershipRole { [Parameter(Value = "admin")] diff --git a/Octokit/Clients/RepoCollaboratorsClient.cs b/Octokit/Clients/RepoCollaboratorsClient.cs index de9850d1..6b1e1e84 100644 --- a/Octokit/Clients/RepoCollaboratorsClient.cs +++ b/Octokit/Clients/RepoCollaboratorsClient.cs @@ -81,7 +81,7 @@ namespace Octokit public Task> GetAll(long repositoryId, ApiOptions options) { Ensure.ArgumentNotNull(options, nameof(options)); - + return GetAll(repositoryId, new RepositoryCollaboratorListRequest(), options); } @@ -100,7 +100,7 @@ namespace Octokit Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner)); Ensure.ArgumentNotNullOrEmptyString(name, nameof(name)); Ensure.ArgumentNotNull(request, nameof(request)); - + return GetAll(owner, name, request, ApiOptions.None); } @@ -116,7 +116,7 @@ namespace Octokit public Task> GetAll(long repositoryId, RepositoryCollaboratorListRequest request) { Ensure.ArgumentNotNull(request, nameof(request)); - + return GetAll(repositoryId, request, ApiOptions.None); } diff --git a/Octokit/Models/Request/OrganizationMembershipUpdate.cs b/Octokit/Models/Request/OrganizationMembershipUpdate.cs index 37bf9430..fdd73b21 100644 --- a/Octokit/Models/Request/OrganizationMembershipUpdate.cs +++ b/Octokit/Models/Request/OrganizationMembershipUpdate.cs @@ -9,7 +9,7 @@ namespace Octokit { Role = MembershipRole.Member; } - + /// /// The role to give the user in the organization. The default is . /// diff --git a/Octokit/Models/Request/RepositoryCollaboratorListRequest.cs b/Octokit/Models/Request/RepositoryCollaboratorListRequest.cs index c5fe0682..6f5a8a4f 100644 --- a/Octokit/Models/Request/RepositoryCollaboratorListRequest.cs +++ b/Octokit/Models/Request/RepositoryCollaboratorListRequest.cs @@ -17,7 +17,7 @@ namespace Octokit { Affiliation = CollaboratorAffiliation.All; // Default in accordance with the documentation } - + /// /// Gets or sets the collaborator affiliation property. /// diff --git a/Octokit/Models/Response/EventInfo.cs b/Octokit/Models/Response/EventInfo.cs index 899b9b3a..4512ef61 100644 --- a/Octokit/Models/Response/EventInfo.cs +++ b/Octokit/Models/Response/EventInfo.cs @@ -185,7 +185,7 @@ namespace Octokit /// [Parameter(Value = "head_ref_restored")] HeadRefRestored, - + /// /// The pull request’s branch was force pushed to. /// @@ -303,7 +303,7 @@ namespace Octokit /// [Parameter(Value = "comment_deleted")] CommentDeleted, - + /// /// An issue was transferred. /// diff --git a/Octokit/Models/Response/OrganizationMembership.cs b/Octokit/Models/Response/OrganizationMembership.cs index 48e86352..3ecc185e 100644 --- a/Octokit/Models/Response/OrganizationMembership.cs +++ b/Octokit/Models/Response/OrganizationMembership.cs @@ -7,7 +7,7 @@ namespace Octokit { public OrganizationMembership() { - + } public OrganizationMembership(string url, StringEnum state, StringEnum role, string organizationUrl, Organization organization, User user) @@ -19,7 +19,7 @@ namespace Octokit Organization = organization; User = user; } - + public string Url { get; protected set; } public StringEnum State { get; protected set; } public StringEnum Role { get; protected set; } diff --git a/Octokit/Octokit.csproj b/Octokit/Octokit.csproj index c0bfc52b..ecab0718 100644 --- a/Octokit/Octokit.csproj +++ b/Octokit/Octokit.csproj @@ -15,6 +15,7 @@ https://github.com/octokit/octokit.net https://github.com/octokit/octokit.net https://f.cloud.github.com/assets/19977/1510987/64af2b26-4a9d-11e3-89fc-96a185171c75.png + octokit.png MIT GitHub API Octokit linqpad-samples dotnetcore Copyright GitHub 2017 @@ -47,6 +48,10 @@ + + + + diff --git a/Octokit/images/octokit.png b/Octokit/images/octokit.png new file mode 100644 index 00000000..2efc9cfc Binary files /dev/null and b/Octokit/images/octokit.png differ