From 3859ff3627176f9555a447cf5809e69b83f8a5e6 Mon Sep 17 00:00:00 2001 From: Brendan Forster Date: Sun, 31 May 2015 20:57:05 +0930 Subject: [PATCH] the test, it passes --- .../Clients/RepositoriesClientTests.cs | 15 ++++++++++++++- Octokit.Tests/Http/ConnectionTests.cs | 2 +- Octokit.Tests/Http/JsonHttpPipelineTests.cs | 2 +- Octokit/Http/JsonHttpPipeline.cs | 3 +-- 4 files changed, 17 insertions(+), 5 deletions(-) diff --git a/Octokit.Tests.Integration/Clients/RepositoriesClientTests.cs b/Octokit.Tests.Integration/Clients/RepositoriesClientTests.cs index 12fc90db..7efd1e57 100644 --- a/Octokit.Tests.Integration/Clients/RepositoriesClientTests.cs +++ b/Octokit.Tests.Integration/Clients/RepositoriesClientTests.cs @@ -3,7 +3,6 @@ using System.Globalization; using System.Linq; using System.Threading.Tasks; using Octokit; -using Octokit.Tests.Helpers; using Octokit.Tests.Integration; using Xunit; @@ -538,6 +537,20 @@ public class RepositoriesClientTests Assert.Equal("https://github.com/Haacked/libgit2sharp.git", repository.CloneUrl); Assert.True(repository.Fork); } + + [IntegrationTest] + public async Task ReturnsRedirectedRepository() + { + var github = Helper.GetAuthenticatedClient(); + + var repository = await github.Repository.Get("robconery", "massive"); + + Assert.Equal("https://github.com/FransBouma/Massive.git", repository.CloneUrl); + Assert.False(repository.Private); + Assert.False(repository.Fork); + Assert.Equal(AccountType.User, repository.Owner.Type); + } + } diff --git a/Octokit.Tests/Http/ConnectionTests.cs b/Octokit.Tests/Http/ConnectionTests.cs index d0bfd7ca..02f1601e 100644 --- a/Octokit.Tests/Http/ConnectionTests.cs +++ b/Octokit.Tests/Http/ConnectionTests.cs @@ -439,7 +439,7 @@ namespace Octokit.Tests.Http httpClient.Received().Send(Arg.Is(req => req.BaseAddress == _exampleUri && req.Body == body && - req.Headers["Accept"] == "application/vnd.github.v3+json; charset=utf-8" && + req.Headers["Accept"] == "application/vnd.github.quicksilver-preview+json; charset=utf-8, application/vnd.github.v3+json; charset=utf-8" && req.ContentType == "application/arbitrary" && req.Method == HttpMethod.Post && req.Endpoint == new Uri("https://other.host.com/path?query=val")), Args.CancellationToken); diff --git a/Octokit.Tests/Http/JsonHttpPipelineTests.cs b/Octokit.Tests/Http/JsonHttpPipelineTests.cs index be4b19ea..88a67be0 100644 --- a/Octokit.Tests/Http/JsonHttpPipelineTests.cs +++ b/Octokit.Tests/Http/JsonHttpPipelineTests.cs @@ -30,7 +30,7 @@ namespace Octokit.Tests.Http jsonPipeline.SerializeRequest(request); Assert.Contains("Accept", request.Headers.Keys); - Assert.Equal("application/vnd.github.v3+json; charset=utf-8", request.Headers["Accept"]); + Assert.Equal("application/vnd.github.quicksilver-preview+json; charset=utf-8, application/vnd.github.v3+json; charset=utf-8", request.Headers["Accept"]); } [Fact] diff --git a/Octokit/Http/JsonHttpPipeline.cs b/Octokit/Http/JsonHttpPipeline.cs index a79876d3..d22f0efb 100644 --- a/Octokit/Http/JsonHttpPipeline.cs +++ b/Octokit/Http/JsonHttpPipeline.cs @@ -11,7 +11,7 @@ namespace Octokit.Internal /// public class JsonHttpPipeline { - private const string v3ApiVersion = "application/vnd.github.v3+json; charset=utf-8"; + private const string v3ApiVersion = "application/vnd.github.quicksilver-preview+json; charset=utf-8, application/vnd.github.v3+json; charset=utf-8"; readonly IJsonSerializer _serializer; @@ -32,7 +32,6 @@ namespace Octokit.Internal if (!request.Headers.ContainsKey("Accept")) { - request.Headers["Accept"] = v3ApiVersion; }