Merge remote-tracking branch 'upstream/master' into add-user-permissions

This commit is contained in:
Ryan Gribble
2016-06-08 22:29:39 +10:00
30 changed files with 227 additions and 82 deletions
@@ -15,7 +15,7 @@ namespace Octokit.Tests.Integration
readonly string _testUser = "test-user";
readonly string _distinguishedNameUser = "uid=test-user,ou=users,dc=company,dc=com";
readonly EnterpriseTeamContext _context;
readonly TeamContext _context;
readonly string _distinguishedNameTeam = "cn=test-team,ou=groups,dc=company,dc=com";
public ObservableEnterpriseLdapClientTests()
@@ -101,6 +101,6 @@ public class ObservableRespositoryDeployKeysClientTests : IDisposable
public void Dispose()
{
Helper.DeleteRepo(_repository);
Helper.DeleteRepo(Helper.GetAuthenticatedClient().Connection, _repository);
}
}
@@ -82,7 +82,7 @@ namespace Octokit.Tests.Integration.Clients
}
// Remove user if it was already renamed
EnterpriseHelper.DeleteUser(renamedUsername);
EnterpriseHelper.DeleteUser(_github.Connection, renamedUsername);
}
[GitHubEnterpriseTest]