Merge pull request #437 from octokit/haacked/regression-fix

Fix regression in throwing proper 2FA exception

Octokit.Tests.Integration/Clients/IssuesClientTests.cs

@@ -242,12 +242,12 @@ public async Task FilteringByInvalidAccountThrowsError()
  {
  var owner = _repository.Owner.Login;
 
- AssertEx.Throws<ApiValidationException>(
- () => _issuesClient.GetForRepository(owner, _repository.Name,
+ await AssertEx.Throws<ApiValidationException>(
+ async () => await _issuesClient.GetForRepository(owner, _repository.Name,
  new RepositoryIssueRequest { Creator = "some-random-account" }));
 
- AssertEx.Throws<ApiValidationException>(
- () => _issuesClient.GetForRepository(owner, _repository.Name,
+ await AssertEx.Throws<ApiValidationException>(
+ async () => await _issuesClient.GetForRepository(owner, _repository.Name,
  new RepositoryIssueRequest { Assignee = "some-random-account" }));
  }
 

Octokit.Tests/Clients/AuthorizationsClientTests.cs

@@ -127,20 +127,18 @@ public void GetsOrCreatesAuthenticationAtCorrectUrlUsingTwoFactor()
  }
 
  [Fact]
- public void WrapsTwoFactorFailureWithTwoFactorException()
+ public async Task WrapsTwoFactorFailureWithTwoFactorException()
  {
  var data = new NewAuthorization();
  var client = Substitute.For<IApiConnection>();
  client.Put<Authorization>(Args.Uri, Args.Object, Args.String)
- .Returns(_ =>
- {
- throw new AuthorizationException(
- new ApiResponse<object> { StatusCode = HttpStatusCode.Unauthorized});
- });
+ .ThrowsAsync<Authorization>(
+ new AuthorizationException(
+ new ApiResponse<object> { StatusCode = HttpStatusCode.Unauthorized }));
  var authEndpoint = new AuthorizationsClient(client);
 
- Assert.Throws<TwoFactorChallengeFailedException>(() =>
- authEndpoint.GetOrCreateApplicationAuthentication("clientId", "secret", data, "authenticationCode"));
+ await AssertEx.Throws<TwoFactorChallengeFailedException>(async () =>
+ await authEndpoint.GetOrCreateApplicationAuthentication("clientId", "secret", data, "authenticationCode"));
  }
 
  [Fact]

Octokit.Tests/Clients/GistsClientTests.cs

@@ -163,8 +163,7 @@ public async Task EnsuresArgumentsNotNull()
  var connection = Substitute.For<IApiConnection>();
  var client = new GistsClient(connection);
 
- AssertEx.Throws<ArgumentNullException>(async () => await
- client.Delete(null));
+ Assert.Throws<ArgumentNullException>(() => client.Delete(null));
  }
  }
 
@@ -224,7 +223,7 @@ public async Task ThrowsExceptionForInvalidStatusCode()
 
  var client = new GistsClient(apiConnection);
 
- AssertEx.Throws<ApiException>(async () => await client.IsStarred("1"));
+ await AssertEx.Throws<ApiException>(async () => await client.IsStarred("1"));
  }
  }
 

Octokit.Tests/Helpers/NSubstituteExtensions.cs

@@ -0,0 +1,19 @@
+using System;
+using System.Threading.Tasks;
+using NSubstitute;
+using NSubstitute.Core;
+
+public static class NSubstituteExtensions
+{
+ public static ConfiguredCall ReturnsAsync<TTask, TTaskType>(
+ this TTask value, Func<CallInfo, TTaskType> returnThis,
+ params Func<CallInfo, TTaskType>[] returnThese) where TTask : Task<TTaskType>
+ {
+ return value.Returns(callInfo => Task.Factory.StartNew(() => returnThis(callInfo)));
+ }
+
+ public static ConfiguredCall ThrowsAsync<T>(this Task<T> value, Exception exception)
+ {
+ return value.ReturnsAsync<Task<T>, T>(callInfo => { throw exception; });
+ }
+}

Octokit.Tests/OctoKit.Tests-NetCore45.csproj

@@ -79,6 +79,7 @@
  <Compile Include="Exceptions\RateLimitExceededExceptionTests.cs" />
  <Compile Include="Exceptions\TwoFactorChallengeFailedException.cs" />
  <Compile Include="Exceptions\TwoFactorRequiredExceptionTests.cs" />
+ <Compile Include="Helpers\NSubstituteExtensions.cs" />
  <Compile Include="Helpers\UriExtensionsTests.cs" />
  <Compile Include="Http\ApiConnectionTests.cs" />
  <Compile Include="Clients\AuthorizationsClientTests.cs" />

Octokit.Tests/Octokit.Tests-Portable.csproj

@@ -79,6 +79,7 @@
  <Compile Include="Exceptions\RateLimitExceededExceptionTests.cs" />
  <Compile Include="Exceptions\TwoFactorChallengeFailedException.cs" />
  <Compile Include="Exceptions\TwoFactorRequiredExceptionTests.cs" />
+ <Compile Include="Helpers\NSubstituteExtensions.cs" />
  <Compile Include="Helpers\UriExtensionsTests.cs" />
  <Compile Include="Http\ApiConnectionTests.cs" />
  <Compile Include="Clients\AuthorizationsClientTests.cs" />

Octokit.Tests/Octokit.Tests.csproj

@@ -102,6 +102,7 @@
  <Compile Include="Exceptions\LoginAttemptsExceededExceptionTests.cs" />
  <Compile Include="Exceptions\RateLimitExceededExceptionTests.cs" />
  <Compile Include="Exceptions\TwoFactorRequiredExceptionTests.cs" />
+ <Compile Include="Helpers\NSubstituteExtensions.cs" />
  <Compile Include="Helpers\UriExtensionsTests.cs" />
  <Compile Include="Http\ApiConnectionTests.cs" />
  <Compile Include="Clients\AuthorizationsClientTests.cs" />

Octokit/Clients/AuthorizationsClient.cs

@@ -117,7 +117,7 @@ public Task<Authorization> GetOrCreateApplicationAuthentication(
  /// </exception>
  /// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
  /// <returns>The created <see cref="Authorization"/>.</returns>
- public Task<Authorization> GetOrCreateApplicationAuthentication(
+ public async Task<Authorization> GetOrCreateApplicationAuthentication(
  string clientId,
  string clientSecret,
  NewAuthorization newAuthorization,
@@ -139,7 +139,7 @@ public Task<Authorization> GetOrCreateApplicationAuthentication(
 
  try
  {
- return ApiConnection.Put<Authorization>(
+ return await ApiConnection.Put<Authorization>(
  endpoint,
  requestData,
  twoFactorAuthenticationCode);