Merge pull request #656 from octokit/support-for-paid-account-tests

support for paid account test scenarios

CONTRIBUTING.md

@@ -105,6 +105,7 @@ owned by that account. Then set the following environment variables:
 `OCTOKIT_GITHUBUSERNAME` (set this to the test account's username)
 `OCTOKIT_GITHUBPASSWORD` (set this to the test account's password)
 `OCTOKIT_GITHUBORGANIZATION` (set this to the test account's organization)
+`OCTOKIT_PRIVATEREPOSITORIES` (set this to `TRUE` to indicate account has access to private repositories)
 
 Once these are set, the integration tests will be executed both when 
 running the FullBuild MSBuild target, and when running the 

Octokit.Tests.Integration/Clients/RepositoriesClientTests.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using Octokit;
@@ -8,7 +9,7 @@ using Octokit.Tests.Helpers;
 
 public class RepositoriesClientTests
 {
-    public class TheCreateMethodForUser : IDisposable
+    public class TheCreateMethodForUser
     {
         [IntegrationTest]
         public async Task CreatesANewPublicRepository()
@@ -43,30 +44,42 @@ public class RepositoriesClientTests
             }
         }
 
-        [IntegrationTest]
+        [PaidAccountTest]
         public async Task CreatesANewPrivateRepository()
         {
             var github = new GitHubClient(new ProductHeaderValue("OctokitTests"))
             {
                 Credentials = Helper.Credentials
             };
+
+            var userDetails = await github.User.Current();
+            if (userDetails.Plan.PrivateRepos == 0)
+            {
+                throw new Exception("Test cannot complete, account is on free plan");
+            }
+
             var repoName = Helper.MakeNameWithTimestamp("private-repo");
 
-            var createdRepository = await github.Repository.Create(new NewRepository
-            {
-                Name = repoName,
-                Private = true
-            });
+            Repository createdRepository = null;
 
             try
             {
+                createdRepository = await github.Repository.Create(new NewRepository
+                {
+                    Name = repoName,
+                    Private = true
+                });
+
                 Assert.True(createdRepository.Private);
                 var repository = await github.Repository.Get(Helper.UserName, repoName);
                 Assert.True(repository.Private);
             }
             finally
             {
-                Helper.DeleteRepo(createdRepository);
+                if (createdRepository != null)
+                {
+                    Helper.DeleteRepo(createdRepository);
+                }
             }
         }
 
@@ -288,7 +301,7 @@ public class RepositoriesClientTests
             }
         }
 
-        [IntegrationTest(Skip = "see https://github.com/octokit/octokit.net/issues/533 for the resolution to this failing tests")]
+        [PaidAccountTest]
         public async Task ThrowsPrivateRepositoryQuotaExceededExceptionWhenOverQuota()
         {
             var github = new GitHubClient(new ProductHeaderValue("OctokitTests"))
@@ -296,46 +309,36 @@ public class RepositoriesClientTests
                 Credentials = Helper.Credentials
             };
 
-            for (int i = 0; i < 5; i++)
+            var userDetails = await github.User.Current();
+            var freePrivateSlots = userDetails.Plan.PrivateRepos - userDetails.OwnedPrivateRepos;
+
+            if (userDetails.Plan.PrivateRepos == 0)
             {
-                var repoName = Helper.MakeNameWithTimestamp("private-repo" + i);
-                var repository = new NewRepository { Name = repoName, Private = true };
-                await github.Repository.Create(repository);
+                throw new Exception("Test cannot complete, account is on free plan");
             }
 
-            var thrown = await AssertEx.Throws<PrivateRepositoryQuotaExceededException>(
-                async () => await github.Repository.Create(new NewRepository { Name = "x-private", Private = true }));
-            Assert.NotNull(thrown);
-        }
+            var createRepoTasks = 
+                Enumerable.Range(0, (int)freePrivateSlots)
+                .Select(x =>
+                {
+                    var repoName = Helper.MakeNameWithTimestamp("private-repo-" + x);
+                    var repository = new NewRepository { Name = repoName, Private = true };
+                    return github.Repository.Create(repository);
+                });
 
-        public void Dispose()
-        {
-            var github = new GitHubClient(new ProductHeaderValue("OctokitTests"))
-            {
-                Credentials = Helper.Credentials
-            };
+            var createdRepositories = await Task.WhenAll(createRepoTasks);
 
             try
             {
-                // clean all the repositories for the current user
-                var repositories = github.Repository.GetAllForCurrent().Result;
-
-                foreach (var repository in repositories.Where(x => x.Owner.Login == Helper.Credentials.Login))
-                {
-                    try
-                    {
-                        // only cleanup repositories the current user owns
-                        github.Repository.Delete(repository.Owner.Login, repository.Name).Wait();
-                    }
-                    catch (Exception)
-                    {
-
-                    }
-                }
+                await Assert.ThrowsAsync<PrivateRepositoryQuotaExceededException>(
+                    () => github.Repository.Create(new NewRepository { Name = "x-private", Private = true }));
             }
-            catch (Exception ex)
+            finally
             {
-                Console.WriteLine("An unexpected exception occurred while retrieving repositories for the current user: " + ex);
+                var deleteRepos = createdRepositories
+                    .Select(repo => github.Repository.Delete(repo.Owner.Login, repo.Name));
+
+                Task.WhenAll(deleteRepos).Wait();
             }
         }
     }
@@ -430,10 +433,17 @@ public class RepositoriesClientTests
             Assert.Equal("http://aUrl.to/nowhere", _repository.Homepage);
         }
 
-        [IntegrationTest]
+        [PaidAccountTest]
         public async Task UpdatesPrivate()
         {
             var github = CreateGitHubClient();
+
+            var userDetails = await github.User.Current();
+            if (userDetails.Plan.PrivateRepos == 0)
+            {
+                throw new Exception("Test cannot complete, account is on free plan");
+            }
+
             var repoName = Helper.MakeNameWithTimestamp("public-repo");
             _repository = await github.Repository.Create(new NewRepository { Name = repoName, AutoInit = true });
             var update = new RepositoryUpdate { Name = repoName, Private = true };

Octokit.Tests.Integration/Helper.cs

@@ -40,6 +40,14 @@ namespace Octokit.Tests.Integration
 
         public static Credentials Credentials { get { return _credentialsThunk.Value; }}
 
+        public static bool IsPaidAccount
+        {
+            get
+            {
+                return !String.IsNullOrWhiteSpace(Environment.GetEnvironmentVariable("OCTOKIT_PRIVATEREPOSITORIES"));
+            }
+        }
+
         public static void DeleteRepo(Repository repository)
         {
             if (repository != null)

Octokit.Tests.Integration/Helpers/IntegrationTestAttribute.cs

@@ -1,9 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
+using System.Collections.Generic;
 using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
 using Xunit;
 using Xunit.Abstractions;
 using Xunit.Sdk;
@@ -14,18 +10,12 @@ namespace Octokit.Tests.Integration
     {
         public IEnumerable<IXunitTestCase> Discover(ITestMethod testMethod, IAttributeInfo factAttribute)
         {
-            if (Helper.Credentials == null)
-            {
-                return Enumerable.Empty<IXunitTestCase>();
-            }
-            else
-            {
-                return new [] { new XunitTestCase(testMethod) };
-            }
+            return Helper.Credentials == null
+                ? Enumerable.Empty<IXunitTestCase>()
+                : new [] { new XunitTestCase(testMethod) };
         }
     }
 
-
     [XunitTestCaseDiscoverer("Octokit.Tests.Integration.IntegrationTestDiscoverer", "Octokit.Tests.Integration")]
     public class IntegrationTestAttribute : FactAttribute
     {

Octokit.Tests.Integration/Helpers/PaidAccountTestAttribute.cs

@@ -0,0 +1,27 @@
+using System.Collections.Generic;
+using System.Linq;
+using Xunit;
+using Xunit.Abstractions;
+using Xunit.Sdk;
+
+namespace Octokit.Tests.Integration
+{
+    public class PaidAccountTestDiscoverer : IXunitTestCaseDiscoverer
+    {
+        public IEnumerable<IXunitTestCase> Discover(ITestMethod testMethod, IAttributeInfo factAttribute)
+        {
+            if (Helper.Credentials == null)
+                return Enumerable.Empty<IXunitTestCase>();
+
+            if (!Helper.IsPaidAccount)
+                return Enumerable.Empty<IXunitTestCase>();
+
+            return new[] { new XunitTestCase(testMethod) };
+        }
+    }
+
+    [XunitTestCaseDiscoverer("Octokit.Tests.Integration.PaidAccountTestDiscoverer", "Octokit.Tests.Integration")]
+    public class PaidAccountTestAttribute : FactAttribute
+    {
+    }
+}

Octokit.Tests.Integration/Octokit.Tests.Integration.csproj

@@ -91,6 +91,7 @@
     <Compile Include="Clients\UserEmailsClientTests.cs" />
     <Compile Include="Clients\FollowersClientTests.cs" />
     <Compile Include="Clients\UserKeysClientTests.cs" />
+    <Compile Include="Helpers\PaidAccountTestAttribute.cs" />
     <Compile Include="Helpers\RepositorySetupHelper.cs" />
     <Compile Include="HttpClientAdapterTests.cs" />
     <Compile Include="Clients\TeamsClientTests.cs" />

Octokit/Clients/RepositoriesClient.cs

@@ -94,6 +94,15 @@ namespace Octokit
                         newRepository.Name,
                         baseAddress, e);
                 }
+
+                if (String.Equals(
+                    "please upgrade your plan to create a new private repository.",
+                    errorMessage,
+                    StringComparison.OrdinalIgnoreCase))
+                {
+                    throw new PrivateRepositoryQuotaExceededException(e);
+                }
+
                 if (String.Equals(
                     "name can't be private. You are over your quota.",
                     errorMessage,

Octokit/Helpers/ApiErrorExtensions.cs

@@ -7,7 +7,7 @@ namespace Octokit
         public static string FirstErrorMessageSafe(this ApiError apiError)
         {
             if (apiError == null) return null;
-            if (apiError.Errors == null) return null;
+            if (apiError.Errors == null) return apiError.Message;
             var firstError = apiError.Errors.FirstOrDefault();
             if (firstError == null) return null;
             return firstError.Message;