update models with updated permission enum

.editorconfig

@@ -0,0 +1,3 @@
+root = true
+[*.cs]
+end_of_line = lf

Octokit.Reactive/Clients/IObservableTeamsClient.cs

@@ -124,15 +124,34 @@ public interface IObservableTeamsClient
         /// <returns>Newly created <see cref="Team"/></returns>
         IObservable<Team> Create(string org, NewTeam team);
 
+        /// <summary>
+        /// Updates a team
+        /// To edit a team, the authenticated user must either be an organization owner or a team maintainer
+        /// </summary>
+        /// <returns>updated <see cref="Team" /> for the current org</returns>
+        IObservable<Team> Update(string org, string teamSlug, UpdateTeam team);
+
         /// <summary>
         /// Returns updated <see cref="Team" /> for the current org.
+        /// This endpoint route is deprecated and will be removed from the Teams API.
+        /// We recommend migrating your existing code to use the new Update a team endpoint
         /// </summary>
         /// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
         /// <returns>Updated <see cref="Team"/></returns>
         IObservable<Team> Update(int id, UpdateTeam team);
 
+        /// <summary>
+        /// To delete a team, the authenticated user must be an organization owner or team maintainer.
+        /// If you are an organization owner, deleting a parent team will delete all of its child teams as well.
+        /// </summary>
+        /// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
+        /// <returns></returns>
+        IObservable<Unit> Delete(string org, string teamSlug);
+
         /// <summary>
         /// Delete a team - must have owner permissions to this
+        /// This endpoint route is deprecated and will be removed from the Teams API.
+        /// We recommend migrating your existing code to use the new Delete a team endpoint.
         /// </summary>
         /// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
         /// <returns></returns>

Octokit.Reactive/Clients/ObservableTeamsClient.cs

@@ -193,8 +193,24 @@ public IObservable<Team> Create(string org, NewTeam team)
             return _client.Create(org, team).ToObservable();
         }
 
+        /// <summary>
+        /// Updates a team
+        /// To edit a team, the authenticated user must either be an organization owner or a team maintainer
+        /// </summary>
+        /// <returns>updated <see cref="Team" /> for the current org</returns>
+        public IObservable<Team> Update(string org, string teamSlug, UpdateTeam team)
+        {
+            Ensure.ArgumentNotNull(org, nameof(org));
+            Ensure.ArgumentNotNull(teamSlug, nameof(teamSlug));
+            Ensure.ArgumentNotNull(team, nameof(team));
+
+            return _client.Update(org, teamSlug, team).ToObservable();
+        }
+
         /// <summary>
         /// Returns updated <see cref="Team" /> for the current org.
+        /// This endpoint route is deprecated and will be removed from the Teams API.
+        /// We recommend migrating your existing code to use the new Update a team endpoint
         /// </summary>
         /// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
         /// <returns>Updated <see cref="Team"/></returns>
@@ -206,7 +222,23 @@ public IObservable<Team> Update(int id, UpdateTeam team)
         }
 
         /// <summary>
-        /// Delete a team - must have owner permissions to this
+        /// To delete a team, the authenticated user must be an organization owner or team maintainer.
+        /// If you are an organization owner, deleting a parent team will delete all of its child teams as well.
+        /// </summary>
+        /// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
+        /// <returns></returns>
+        public IObservable<Unit> Delete(string org, string teamSlug)
+        {
+            Ensure.ArgumentNotNull(org, nameof(org));
+            Ensure.ArgumentNotNull(teamSlug, nameof(teamSlug));
+
+            return _client.Delete(org, teamSlug).ToObservable();
+        }
+
+        /// <summary>
+        /// Delete a team - must have owner permissions to do this
+        /// This endpoint route is deprecated and will be removed from the Teams API.
+        /// We recommend migrating your existing code to use the new Delete a team endpoint.
         /// </summary>
         /// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
         /// <returns></returns>

Octokit.Tests.Integration/Clients/TeamsClientTests.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Linq;
-using System.Net;
 using System.Threading.Tasks;
 using Octokit;
 using Octokit.Tests.Integration;
@@ -33,10 +32,12 @@ public async Task CreatesTeam()
                 Assert.Equal(teamName, team.Name);
                 Assert.Equal(teamDescription, team.Description);
                 Assert.Equal(TeamPrivacy.Closed, team.Privacy);
+                // Permission defaults to pull when no permission is specified when creating a team
+                Assert.Equal(TeamRespositoryPermission.Pull, team.Permission);
                 Assert.Equal(1, team.MembersCount);
                 Assert.Equal(1, team.ReposCount);
 
-                await github.Organization.Team.Delete(team.Id);
+                await github.Organization.Team.Delete(Helper.Organization, team.Slug);
             }
         }
     }
@@ -445,10 +446,49 @@ public async Task UpdatesTeam()
             {
                 var teamName = Helper.MakeNameWithTimestamp("updated-team");
                 var teamDescription = Helper.MakeNameWithTimestamp("updated description");
+
+                var update = new UpdateTeam(teamName)
+                {
+                    Description = teamDescription,
+                    Privacy = TeamPrivacy.Closed,
+                    Permission = TeamPermission.Push,
+                    ParentTeamId = parentTeamContext.TeamId
+                };
+
+                var team = await _github.Organization.Team.Update(Helper.Organization, teamContext.Team.Slug, update);
+
+                Assert.Equal(teamName, team.Name);
+                Assert.Equal(teamDescription, team.Description);
+                Assert.Equal(TeamPrivacy.Closed, team.Privacy);
+                Assert.Equal(TeamRespositoryPermission.Push, team.Permission);
+                Assert.Equal(parentTeamContext.TeamId, team.Parent.Id);
+            }
+        }
+    }
+
+    public class TheUpdateLegacyMethod
+    {
+        private readonly IGitHubClient _github;
+
+        public TheUpdateLegacyMethod()
+        {
+            _github = Helper.GetAuthenticatedClient();
+        }
+
+        [OrganizationTest]
+        public async Task UpdatesTeamLegacy()
+        {
+            using (var parentTeamContext = await _github.CreateTeamContext(Helper.Organization, new NewTeam(Helper.MakeNameWithTimestamp("parent-team"))))
+            using (var teamContext = await _github.CreateTeamContext(Helper.Organization, new NewTeam(Helper.MakeNameWithTimestamp("team-fixture"))))
+            {
+                var teamName = Helper.MakeNameWithTimestamp("updated-team");
+                var teamDescription = Helper.MakeNameWithTimestamp("updated description");
+
                 var update = new UpdateTeam(teamName)
                 {
                     Description = teamDescription,
                     Privacy = TeamPrivacy.Closed,
+                    Permission = TeamPermission.Push,
                     ParentTeamId = parentTeamContext.TeamId
                 };
 
@@ -457,6 +497,7 @@ public async Task UpdatesTeam()
                 Assert.Equal(teamName, team.Name);
                 Assert.Equal(teamDescription, team.Description);
                 Assert.Equal(TeamPrivacy.Closed, team.Privacy);
+                Assert.Equal(TeamRespositoryPermission.Push, team.Permission);
                 Assert.Equal(parentTeamContext.TeamId, team.Parent.Id);
             }
         }

Octokit.Tests.Integration/Helper.cs

@@ -190,15 +190,15 @@ public static void DeleteRepo(IConnection connection, string owner, string name)
         public static void DeleteTeam(IConnection connection, Team team)
         {
             if (team != null)
-                DeleteTeam(connection, team.Id);
+                DeleteTeam(connection, team.Slug);
         }
 
-        public static void DeleteTeam(IConnection connection, int teamId)
+        public static void DeleteTeam(IConnection connection, string slug)
         {
             try
             {
                 var client = new GitHubClient(connection);
-                client.Organization.Team.Delete(teamId).Wait(TimeSpan.FromSeconds(15));
+                client.Organization.Team.Delete(Organization, slug).Wait(TimeSpan.FromSeconds(15));
             }
             catch { }
         }

Octokit.Tests.Integration/Helpers/TeamContext.cs

@@ -1,8 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Octokit.Tests.Integration.Helpers
 {

Octokit.Tests.Integration/Reactive/ObservableTeamsClientTests.cs

@@ -386,12 +386,50 @@ public async Task UpdatesTeam()
                     ParentTeamId = parentTeamContext.TeamId
                 };
 
+                var team = await _github.Organization.Team.Update(Helper.Organization, teamContext.Team.Slug, update);
+
+                Assert.Equal(teamName, team.Name);
+                Assert.Equal(teamDescription, team.Description);
+                Assert.Equal(TeamPrivacy.Closed, team.Privacy);
+                Assert.Equal(parentTeamContext.TeamId, team.Parent.Id);
+
+                _github.Organization.Team.Delete(Helper.Organization, team.Slug);
+            }
+        }
+    }
+
+    public class TheUpdateLegacyMethod
+    {
+        private readonly IObservableGitHubClient _github;
+
+        public TheUpdateLegacyMethod()
+        {
+            _github = new ObservableGitHubClient(Helper.GetAuthenticatedClient());
+        }
+
+        [OrganizationTest]
+        public async Task UpdatesTeamLegacy()
+        {
+            using (var parentTeamContext = await _github.CreateTeamContext(Helper.Organization, new NewTeam(Helper.MakeNameWithTimestamp("parent-team"))))
+            using (var teamContext = await _github.CreateTeamContext(Helper.Organization, new NewTeam(Helper.MakeNameWithTimestamp("team-fixture"))))
+            {
+                var teamName = Helper.MakeNameWithTimestamp("updated-team");
+                var teamDescription = Helper.MakeNameWithTimestamp("updated description");
+                var update = new UpdateTeam(teamName)
+                {
+                    Description = teamDescription,
+                    Privacy = TeamPrivacy.Closed,
+                    ParentTeamId = parentTeamContext.TeamId
+                };
+
                 var team = await _github.Organization.Team.Update(teamContext.TeamId, update);
 
                 Assert.Equal(teamName, team.Name);
                 Assert.Equal(teamDescription, team.Description);
                 Assert.Equal(TeamPrivacy.Closed, team.Privacy);
                 Assert.Equal(parentTeamContext.TeamId, team.Parent.Id);
+
+                _github.Organization.Team.Delete(teamContext.TeamId);
             }
         }
     }

Octokit.Tests/Clients/TeamsClientTests.cs

@@ -169,6 +169,36 @@ public void RequestsTheCorrectUrl()
                 var client = new TeamsClient(connection);
                 var team = new UpdateTeam("Octokittens");
 
+                var org = "org";
+                var slug = "slug";
+                client.Update(org, slug , team);
+
+                connection.Received().Patch<Team>(
+                    Arg.Is<Uri>(u => u.ToString() == "orgs/org/teams/slug"),
+                    team);
+            }
+
+            [Fact]
+            public async Task EnsuresNonNullArguments()
+            {
+                var connection = Substitute.For<IApiConnection>();
+                var client = new TeamsClient(connection);
+
+                await Assert.ThrowsAsync<ArgumentNullException>(() => client.Update(null, "b", new UpdateTeam("update-team")));
+                await Assert.ThrowsAsync<ArgumentNullException>(() => client.Update("a", null, new UpdateTeam("update-team")));
+                await Assert.ThrowsAsync<ArgumentNullException>(() => client.Update("a", "b", null));
+            }
+        }
+
+        public class TheUpdateTeamLegacyMethod
+        {
+            [Fact]
+            public void RequestsTheCorrectUrl()
+            {
+                var connection = Substitute.For<IApiConnection>();
+                var client = new TeamsClient(connection);
+                var team = new UpdateTeam("Octokittens");
+
                 client.Update(1, team);
 
                 connection.Received().Patch<Team>(
@@ -187,6 +217,34 @@ public async Task EnsuresNonNullArguments()
         }
 
         public class TheDeleteTeamMethod
+        {
+            [Fact]
+            public void RequestsTheCorrectUrl()
+            {
+                var connection = Substitute.For<IApiConnection>();
+                var client = new TeamsClient(connection);
+
+                var org = "org";
+                var slug = "slug";
+
+                client.Delete(org, slug);
+
+                connection.Received().Delete(
+                    Arg.Is<Uri>(u => u.ToString() == "orgs/org/teams/slug"));
+            }
+
+            [Fact]
+            public async Task EnsuresNonNullArguments()
+            {
+                var connection = Substitute.For<IApiConnection>();
+                var client = new TeamsClient(connection);
+
+                await Assert.ThrowsAsync<ArgumentNullException>(() => client.Delete("a", null));
+                await Assert.ThrowsAsync<ArgumentNullException>(() => client.Delete(null, "a"));
+            }
+        }
+
+        public class TheDeleteTeamLegacuMethod
         {
             [Fact]
             public void RequestsTheCorrectUrl()

Octokit.Tests/SimpleJsonSerializerTests.cs

@@ -472,12 +472,12 @@ public void ShouldDeserializeParentTeamWithNullPermission()
                 var result = new SimpleJsonSerializer().Deserialize<Team>(teamJson);
 
                 // original value works as expected
-                Assert.Equal(PermissionLevel.Admin, result.Permission.Value);
+                Assert.Equal(TeamRespositoryPermission.Admin, result.Permission.Value);
                 Assert.Equal("admin", result.Permission.StringValue);
 
                 // parent permission is marked as null and cannot be parsed
                 Assert.Equal("null", result.Parent.Permission.StringValue);
-                PermissionLevel value;
+                TeamRespositoryPermission value;
                 Assert.False(result.Parent.Permission.TryParse(out value));
             }
         }

Octokit/Clients/ITeamsClient.cs

@@ -125,15 +125,34 @@ public interface ITeamsClient
         /// <returns>Newly created <see cref="Team"/></returns>
         Task<Team> Create(string org, NewTeam team);
 
+        /// <summary>
+        /// Updates a team
+        /// To edit a team, the authenticated user must either be an organization owner or a team maintainer
+        /// </summary>
+        /// <returns>updated <see cref="Team" /> for the current org</returns>
+        Task<Team> Update(string org, string teamSlug, UpdateTeam team);
+
         /// <summary>
         /// Returns updated <see cref="Team" /> for the current org.
+        /// This endpoint route is deprecated and will be removed from the Teams API.
+        /// We recommend migrating your existing code to use the new Update a team endpoint
         /// </summary>
         /// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
         /// <returns>Updated <see cref="Team"/></returns>
         Task<Team> Update(int id, UpdateTeam team);
 
         /// <summary>
-        /// Delte a team - must have owner permissions to this
+        /// To delete a team, the authenticated user must be an organization owner or team maintainer.
+        /// If you are an organization owner, deleting a parent team will delete all of its child teams as well.
+        /// </summary>
+        /// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
+        /// <returns></returns>
+        Task Delete(string org, string teamSlug);
+
+        /// <summary>
+        /// Delete a team - must have owner permissions to do this
+        /// This endpoint route is deprecated and will be removed from the Teams API.
+        /// We recommend migrating your existing code to use the new Delete a team endpoint.
         /// </summary>
         /// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
         /// <returns></returns>